From 5306b401591887f832c0617cd2e0d7ab54ce3a79 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 14 Nov 2008 18:18:03 +0100
Subject: [PATCH] --- yaml --- r: 119012 b: refs/heads/master c:
 af4c68740e848019d8d14c52704ed8eacceddac6 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/kernel/entry.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2f2582f416f7..49381614b38f 100644
--- 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
index ed500ef799b7..5f0c4fba87c3 100644
--- 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