iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Mark Brown <broonie@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lkml.kernel.org/r/20200416182402.6206-1-broonie@kernel.org
This commit is contained in:
Mark Brown 2020-04-16 19:24:02 +01:00 committed by Borislav Petkov
parent 593309423c
commit 2ce0d7f976
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/Kconfig
View File

@ -91,6 +91,7 @@ config X86
select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_BUILTIN_BSWAP
select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_RWLOCKS
select ARCH_USE_QUEUED_SPINLOCKS select ARCH_USE_QUEUED_SPINLOCKS
select ARCH_USE_SYM_ANNOTATIONS
select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH
select ARCH_WANT_DEFAULT_BPF_JIT if X86_64 select ARCH_WANT_DEFAULT_BPF_JIT if X86_64
select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANTS_DYNAMIC_TASK_STRUCT

8
include/linux/linkage.h
View File

@ -105,7 +105,7 @@
/* === DEPRECATED annotations === */ /* === DEPRECATED annotations === */
#ifndef CONFIG_X86 #ifndef CONFIG_ARCH_USE_SYM_ANNOTATIONS
#ifndef GLOBAL #ifndef GLOBAL
/* deprecated, use SYM_DATA*, SYM_ENTRY, or similar */ /* deprecated, use SYM_DATA*, SYM_ENTRY, or similar */
#define GLOBAL(name) \ #define GLOBAL(name) \
@ -118,10 +118,10 @@
#define ENTRY(name) \ #define ENTRY(name) \
SYM_FUNC_START(name) SYM_FUNC_START(name)
#endif #endif
#endif /* CONFIG_X86 */ #endif /* CONFIG_ARCH_USE_SYM_ANNOTATIONS */
#endif /* LINKER_SCRIPT */ #endif /* LINKER_SCRIPT */
#ifndef CONFIG_X86 #ifndef CONFIG_ARCH_USE_SYM_ANNOTATIONS
#ifndef WEAK #ifndef WEAK
/* deprecated, use SYM_FUNC_START_WEAK* */ /* deprecated, use SYM_FUNC_START_WEAK* */
#define WEAK(name) \ #define WEAK(name) \
@ -143,7 +143,7 @@
#define ENDPROC(name) \ #define ENDPROC(name) \
SYM_FUNC_END(name) SYM_FUNC_END(name)
#endif #endif
#endif /* CONFIG_X86 */ #endif /* CONFIG_ARCH_USE_SYM_ANNOTATIONS */
/* === generic annotations === */ /* === generic annotations === */

3
lib/Kconfig
View File

@ -80,6 +80,9 @@ config ARCH_USE_CMPXCHG_LOCKREF
config ARCH_HAS_FAST_MULTIPLIER config ARCH_HAS_FAST_MULTIPLIER
bool bool
config ARCH_USE_SYM_ANNOTATIONS
bool
config INDIRECT_PIO config INDIRECT_PIO
bool "Access I/O in non-MMIO mode" bool "Access I/O in non-MMIO mode"
depends on ARM64 depends on ARM64