From 6c728a042879d84e79218793453aa29171523748 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Thu, 10 Dec 2009 12:07:02 +0100
Subject: [PATCH] --- yaml --- r: 176108 b: refs/heads/master c:
 bf2d809668907c69b554459764b36584e4d57e4a h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/microblaze/Kconfig              | 3 +++
 trunk/arch/microblaze/include/asm/system.h | 2 ++
 trunk/arch/microblaze/kernel/setup.c       | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cfd06370a128..4730b2f26cee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 519e9f417388ba055b7604db5f4f492f7c84f427
+refs/heads/master: bf2d809668907c69b554459764b36584e4d57e4a
diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig
index 8e1c4f7d3e6e..5ba4dcd56cad 100644
--- a/trunk/arch/microblaze/Kconfig
+++ b/trunk/arch/microblaze/Kconfig
@@ -60,6 +60,9 @@ config GENERIC_CSUM
 config STACKTRACE_SUPPORT
 	def_bool y
 
+config LOCKDEP_SUPPORT
+	def_bool y
+
 config PCI
 	def_bool n
 
diff --git a/trunk/arch/microblaze/include/asm/system.h b/trunk/arch/microblaze/include/asm/system.h
index b1ed61590660..157970688b2a 100644
--- a/trunk/arch/microblaze/include/asm/system.h
+++ b/trunk/arch/microblaze/include/asm/system.h
@@ -16,6 +16,8 @@
 #include <asm-generic/cmpxchg.h>
 #include <asm-generic/cmpxchg-local.h>
 
+#define __ARCH_WANT_INTERRUPTS_ON_CTXSW
+
 struct task_struct;
 struct thread_info;
 
diff --git a/trunk/arch/microblaze/kernel/setup.c b/trunk/arch/microblaze/kernel/setup.c
index 367ad330148e..acd70fe30a71 100644
--- a/trunk/arch/microblaze/kernel/setup.c
+++ b/trunk/arch/microblaze/kernel/setup.c
@@ -131,6 +131,8 @@ void __init machine_early_init(const char *cmdline, unsigned int ram,
 		strlcpy(cmd_line, cmdline, COMMAND_LINE_SIZE);
 #endif
 
+	lockdep_init();
+
 /* initialize device tree for usage in early_printk */
 	early_init_devtree((void *)_fdt_start);