---

yaml --- r: 310665 b: refs/heads/master c: 70c778f h: refs/heads/master i: 310663: a516a14 v: v3
git-mirror · Jun 12, 2012 · 823edad · 823edad
1 parent cffe597
commit 823edad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;