From 823edadde1993fd92f56db493412fbdab294fd7d Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Wed, 23 May 2012 13:43:52 +1000
Subject: [PATCH] --- yaml --- r: 310665 b: refs/heads/master c:
 70c778f7a1075cf688ef50ca52c464e7ea60b506 h: refs/heads/master i:   310663:
 a516a149a42667ee3ac8711a6fcf01ae3bc066e6 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/m68k/kernel/ptrace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c6cb66d18333..aadcc189fd5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b461d7631f17804257ab1734bd95c05ab655f8b
+refs/heads/master: 70c778f7a1075cf688ef50ca52c464e7ea60b506
diff --git a/trunk/arch/m68k/kernel/ptrace.c b/trunk/arch/m68k/kernel/ptrace.c
index 8b4a2222e658..1bc10e62b9af 100644
--- a/trunk/arch/m68k/kernel/ptrace.c
+++ b/trunk/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;