Skip to content

Commit 1b16c4b

Browse files
author
Russell King
committed
ARM: Fix !kuser helpers case
Fix yet another build failure caused by a weird set of configuration settings: LD init/built-in.o arch/arm/kernel/built-in.o: In function `__dabt_usr': /home/tom3q/kernel/arch/arm/kernel/entry-armv.S:377: undefined reference to `kuser_cmpxchg64_fixup' arch/arm/kernel/built-in.o: In function `__irq_usr': /home/tom3q/kernel/arch/arm/kernel/entry-armv.S:387: undefined reference to `kuser_cmpxchg64_fixup' caused by: CONFIG_KUSER_HELPERS=n CONFIG_CPU_32v6K=n CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG=n Reported-by: Tomasz Figa <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent 1d0bbf4 commit 1b16c4b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/arm/kernel/entry-armv.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,8 @@ ENDPROC(__pabt_svc)
357357
.endm
358358

359359
.macro kuser_cmpxchg_check
360-
#if !defined(CONFIG_CPU_32v6K) && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)
360+
#if !defined(CONFIG_CPU_32v6K) && defined(CONFIG_KUSER_HELPERS) && \
361+
!defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)
361362
#ifndef CONFIG_MMU
362363
#warning "NPTL on non MMU needs fixing"
363364
#else

0 commit comments

Comments
 (0)