Commit e356da60 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Arnd Bergmann
Browse files

x86/uapi: Stop leaking kconfig references to userspace 



UAPI headers are not supposed to leak references to kconfig symbols.
These won't be set when building userspace. Hide the kconfig reference
behind 'if defined(__KERNEL__)', so it will be stripped by
headers_install.sh. The result for userspace will be the same, but the
exceptions in headers_install.sh can also be removed.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 9b21aa9f

arch/x86/include/uapi/asm/auxvec.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#define AT_SYSINFO_EHDR		33



/* entries in ARCH_DLINFO: */

#if defined(CONFIG_IA32_EMULATION) || !defined(CONFIG_X86_64)

#if defined(__KERNEL__) && (defined(CONFIG_IA32_EMULATION) || !defined(CONFIG_X86_64))

# define AT_VECTOR_SIZE_ARCH 3

#else /* else it's non-compat x86-64 */

# define AT_VECTOR_SIZE_ARCH 2

scripts/headers_install.sh

+0 −2
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ configs=$(sed -e ' 
#

# The format is <file-name>:<CONFIG-option> in each line.

config_leak_ignores="

arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION

arch/x86/include/uapi/asm/auxvec.h:CONFIG_X86_64

"



for c in $configs