summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-05-23 13:43:52 +1000
committerGreg Ungerer <gerg@uclinux.org>2012-06-12 11:58:29 +1000
commit70c778f7a1075cf688ef50ca52c464e7ea60b506 (patch)
tree6595b4f0f27adba0a07e0deb9d903c1ecac0ebd6 /arch/m68k
parent1b461d7631f17804257ab1734bd95c05ab655f8b (diff)
downloadlinux-stable-70c778f7a1075cf688ef50ca52c464e7ea60b506.tar.gz
linux-stable-70c778f7a1075cf688ef50ca52c464e7ea60b506.tar.bz2
linux-stable-70c778f7a1075cf688ef50ca52c464e7ea60b506.zip
m68k: make syscall_trace_enter/leave exist for non-MMU classic m68k types
The assembler entry code calls directly to the syscall_trace_enter() and syscall_trace_leave() functions. But currently they are conditionaly compiled out for the non-MMU classic m68k CPU types (so 68328 for example), resulting in a link error: LD vmlinux arch/m68k/platform/68328/built-in.o: In function `do_trace': (.text+0x1c): undefined reference to `syscall_trace_enter' arch/m68k/platform/68328/built-in.o: In function `do_trace': (.text+0x4c): undefined reference to `syscall_trace_leave' Change the conditional check that includes these functions to be true for the !defined(CONFIG_MMU) case as well. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/kernel/ptrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c
index 8b4a2222e658..1bc10e62b9af 100644
--- a/arch/m68k/kernel/ptrace.c
+++ b/arch/m68k/kernel/ptrace.c
@@ -286,7 +286,7 @@ asmlinkage void syscall_trace(void)
}
}
-#ifdef CONFIG_COLDFIRE
+#if defined(CONFIG_COLDFIRE) || !defined(CONFIG_MMU)
asmlinkage int syscall_trace_enter(void)
{
int ret = 0;