---

yaml --- r: 119012 b: refs/heads/master c: af4c687 h: refs/heads/master v: v3
git-mirror · Nov 14, 2008 · 5306b40 · 5306b40
1 parent 6d4c72a
commit 5306b40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc835f7872adef35076e4a3b6632ef79bb4805be
+refs/heads/master: af4c68740e848019d8d14c52704ed8eacceddac6
diff --git a/trunk/arch/s390/kernel/entry.S b/trunk/arch/s390/kernel/entry.S
@@ -1116,6 +1116,8 @@ cleanup_io_leave_insn:
 .Ltrace_irq_on: .long	trace_hardirqs_on
 .Ltrace_irq_off:
 		.long	trace_hardirqs_off
+#endif
+#ifdef CONFIG_LOCKDEP
 .Llockdep_sys_exit:
 		.long	lockdep_sys_exit
 #endif