projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.87' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm
/
kernel
/
entry-armv.S
diff --git
a/arch/arm/kernel/entry-armv.S
b/arch/arm/kernel/entry-armv.S
index 925a62e236513082afe62885af4be9cad1565dff..1d3968c693e625fd5270aa26d893af59d13cb68a 100644
(file)
--- a/
arch/arm/kernel/entry-armv.S
+++ b/
arch/arm/kernel/entry-armv.S
@@
-358,7
+358,8
@@
ENDPROC(__pabt_svc)
.endm
.macro kuser_cmpxchg_check
.endm
.macro kuser_cmpxchg_check
-#if !defined(CONFIG_CPU_32v6K) && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)
+#if !defined(CONFIG_CPU_32v6K) && defined(CONFIG_KUSER_HELPERS) && \
+ !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)
#ifndef CONFIG_MMU
#warning "NPTL on non MMU needs fixing"
#else
#ifndef CONFIG_MMU
#warning "NPTL on non MMU needs fixing"
#else