]> git.baikalelectronics.ru Git - kernel.git/commit
arm64: fix building without CONFIG_UID16
authorArnd Bergmann <arnd@arndb.de>
Fri, 20 Nov 2015 11:12:21 +0000 (12:12 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 25 Nov 2015 15:49:13 +0000 (15:49 +0000)
commit57ffd7680f93c435fcd9862793c1f977fa2c4382
tree7ca98276aa14f75c634a121bcad4e049b7752bd0
parent92be6d30f4a334ee5f37eb13f04fe2e2efe4ebf0
arm64: fix building without CONFIG_UID16

As reported by Michal Simek, building an ARM64 kernel with CONFIG_UID16
disabled currently fails because the system call table still needs to
reference the individual function entry points that are provided by
kernel/sys_ni.c in this case, and the declarations are hidden inside
of #ifdef CONFIG_UID16:

arch/arm64/include/asm/unistd32.h:57:8: error: 'sys_lchown16' undeclared here (not in a function)
 __SYSCALL(__NR_lchown, sys_lchown16)

I believe this problem only exists on ARM64, because older architectures
tend to not need declarations when their system call table is built
in assembly code, while newer architectures tend to not need UID16
support. ARM64 only uses these system calls for compatibility with
32-bit ARM binaries.

This changes the CONFIG_UID16 check into CONFIG_HAVE_UID16, which is
set unconditionally on ARM64 with CONFIG_COMPAT, so we see the
declarations whenever we need them, but otherwise the behavior is
unchanged.

Fixes: 28ed72d1677b ("Kconfig: clean up the long arch list for the UID16 config option")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
include/linux/syscalls.h
include/linux/types.h