* [PATCH] include/linux/kernel.h: Make might_fault to be a nop for !MMU
@ 2013-11-29 7:42 Axel Lin
2013-12-01 22:15 ` Michael S. Tsirkin
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2013-11-29 7:42 UTC (permalink / raw)
To: Andrew Morton; +Cc: Michael S. Tsirkin, Peter Zijlstra, linux-kernel
No fault if !MUU, thus make might_fault to be 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@ingics.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
---
include/linux/kernel.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 2ac0277..8b0ad48 100644
--- a/include/linux/kernel.h
+++ b/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) { }
--
1.8.1.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] include/linux/kernel.h: Make might_fault to be a nop for !MMU
2013-11-29 7:42 [PATCH] include/linux/kernel.h: Make might_fault to be a nop for !MMU Axel Lin
@ 2013-12-01 22:15 ` Michael S. Tsirkin
0 siblings, 0 replies; 2+ messages in thread
From: Michael S. Tsirkin @ 2013-12-01 22:15 UTC (permalink / raw)
To: Axel Lin; +Cc: Andrew Morton, Peter Zijlstra, linux-kernel
On Fri, Nov 29, 2013 at 03:42:14PM +0800, Axel Lin wrote:
> No fault if !MUU, thus make might_fault to be 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@ingics.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
Makes sense. FWIW
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> include/linux/kernel.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/kernel.h b/include/linux/kernel.h
> index 2ac0277..8b0ad48 100644
> --- a/include/linux/kernel.h
> +++ b/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) { }
> --
> 1.8.1.2
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-01 22:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-29 7:42 [PATCH] include/linux/kernel.h: Make might_fault to be a nop for !MMU Axel Lin
2013-12-01 22:15 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox