Subject: + include-linux-kernelh-make-might_fault-to-be-a-nop-for-mmu.patch added to -mm tree
To: axel.lin@xxxxxxxxxx,mst@xxxxxxxxxx,peterz@xxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 02 Dec 2013 13:23:08 -0800
The patch titled
Subject: include/linux/kernel.h: make might_fault() a nop for !MMU
has been added to the -mm tree. Its filename is
include-linux-kernelh-make-might_fault-to-be-a-nop-for-mmu.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/include-linux-kernelh-make-might_fault-to-be-a-nop-for-mmu.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/include-linux-kernelh-make-might_fault-to-be-a-nop-for-mmu.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Axel Lin <axel.lin@xxxxxxxxxx>
Subject: include/linux/kernel.h: make might_fault() a nop for !MMU
The machine cannot fault if !MUU, so make might_fault() a nop for !MMU.
This fixes below build error if
!CONFIG_MMU && (CONFIG_PROVE_LOCKING=y || CONFIG_DEBUG_ATOMIC_SLEEP=y):
arch/arm/kernel/built-in.o: In function `arch_ptrace':
arch/arm/kernel/ptrace.c:852: undefined reference to `might_fault'
arch/arm/kernel/built-in.o: In function `restore_sigframe':
arch/arm/kernel/signal.c:173: undefined reference to `might_fault'
arch/arm/kernel/signal.c:174: undefined reference to `might_fault'
arch/arm/kernel/signal.c:175: undefined reference to `might_fault'
arch/arm/kernel/signal.c:176: undefined reference to `might_fault'
arch/arm/kernel/built-in.o:arch/arm/kernel/signal.c:177: more undefined references to `might_fault' follow
make: *** [vmlinux] Error 1
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
Cc: Michael S. Tsirkin <mst@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/kernel.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN include/linux/kernel.h~include-linux-kernelh-make-might_fault-to-be-a-nop-for-mmu include/linux/kernel.h
--- a/include/linux/kernel.h~include-linux-kernelh-make-might_fault-to-be-a-nop-for-mmu
+++ a/include/linux/kernel.h
@@ -193,7 +193,8 @@ extern int _cond_resched(void);
(__x < 0) ? -__x : __x; \
})
-#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)
+#if defined(CONFIG_MMU) && \
+ (defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP))
void might_fault(void);
#else
static inline void might_fault(void) { }
_
Patches currently in -mm which might be from axel.lin@xxxxxxxxxx are
fs-ramfs-file-nommuc-make-ramfs_nommu_get_unmapped_area-and-ramfs_nommu_mmap-static.patch
fs-ramfs-move-ramfs_aops-to-inodec.patch
linux-next.patch
include-linux-kernelh-make-might_fault-to-be-a-nop-for-mmu.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
