Commit 2ce0d7f9 authored by Mark Brown's avatar Mark Brown Committed by Borislav Petkov
Browse files

x86/asm: Provide a Kconfig symbol for disabling old assembly annotations 



As x86 was converted to use the modern SYM_ annotations for assembly,
ifdefs were added to remove the generic definitions of the old style
annotations on x86. Rather than collect a list of architectures in the
ifdefs as more architectures are converted over, provide a Kconfig
symbol for this and update x86 to use it.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lkml.kernel.org/r/20200416182402.6206-1-broonie@kernel.org
parent 59330942

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ config X86 
	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USE_QUEUED_SPINLOCKS

	select ARCH_USE_SYM_ANNOTATIONS

	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH

	select ARCH_WANT_DEFAULT_BPF_JIT	if X86_64

	select ARCH_WANTS_DYNAMIC_TASK_STRUCT

include/linux/linkage.h

+4 −4
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 


/* === DEPRECATED annotations === */



#ifndef CONFIG_X86

#ifndef CONFIG_ARCH_USE_SYM_ANNOTATIONS

#ifndef GLOBAL

/* deprecated, use SYM_DATA*, SYM_ENTRY, or similar */

#define GLOBAL(name) \
@@ -118,10 +118,10 @@ 
#define ENTRY(name) \

	SYM_FUNC_START(name)

#endif

#endif /* CONFIG_X86 */

#endif /* CONFIG_ARCH_USE_SYM_ANNOTATIONS */

#endif /* LINKER_SCRIPT */



#ifndef CONFIG_X86

#ifndef CONFIG_ARCH_USE_SYM_ANNOTATIONS

#ifndef WEAK

/* deprecated, use SYM_FUNC_START_WEAK* */

#define WEAK(name)	   \
@@ -143,7 +143,7 @@ 
#define ENDPROC(name) \

	SYM_FUNC_END(name)

#endif

#endif /* CONFIG_X86 */

#endif /* CONFIG_ARCH_USE_SYM_ANNOTATIONS */



/* === generic annotations === */

lib/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ config ARCH_USE_CMPXCHG_LOCKREF 
config ARCH_HAS_FAST_MULTIPLIER

	bool



config ARCH_USE_SYM_ANNOTATIONS

	bool



config INDIRECT_PIO

	bool "Access I/O in non-MMIO mode"

	depends on ARM64

CRA Git | Maintained and supported by SUSTech CRA and CCSE