From 90046d8282ea18e465286774bf5874dd772f2b48 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 19 Aug 2008 20:50:37 -0700
Subject: [PATCH] --- yaml --- r: 116442 b: refs/heads/master c:
 e955b5398b660a204854bdff059d050b44090879 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/handle.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 02300622e798..82ea20cb01b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efa2559f65167989f1893cb065e3126d4f13ba60
+refs/heads/master: e955b5398b660a204854bdff059d050b44090879
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
index 6d174390f3a0..24c83a3cee4d 100644
--- a/trunk/kernel/irq/handle.c
+++ b/trunk/kernel/irq/handle.c
@@ -18,13 +18,10 @@
 
 #include "internals.h"
 
-#ifdef CONFIG_TRACE_IRQFLAGS
-
 /*
  * lockdep: we want to handle all irq_desc locks as a single lock-class:
  */
 static struct lock_class_key irq_desc_lock_class;
-#endif
 
 /**
  * handle_bad_irq - handle spurious and unhandled irqs
@@ -75,9 +72,7 @@ static struct irq_desc irq_desc_init = {
 static void init_one_irq_desc(struct irq_desc *desc)
 {
 	memcpy(desc, &irq_desc_init, sizeof(struct irq_desc));
-#ifdef CONFIG_TRACE_IRQFLAGS
 	lockdep_set_class(&desc->lock, &irq_desc_lock_class);
-#endif
 }
 
 extern int after_bootmem;