From 9958070ae05445b1ca3d2fd192cc5bcf2d1d3002 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Wed, 17 Dec 2008 19:40:33 +0900
Subject: [PATCH] --- yaml --- r: 123261 b: refs/heads/master c:
 74c8a6130486bed224e960790f4aa72dd09c061e h: refs/heads/master i:   123259:
 64048f298ed8862ccbab4414c37e39d939b1ba8f v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/lockdep.h | 2 +-
 trunk/kernel/irq/handle.c     | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f4f8afe3f8fb..0fe87c6a5cee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f8a0ed4e5d86c01db5e7e3f95d9003b7cf9cb87
+refs/heads/master: 74c8a6130486bed224e960790f4aa72dd09c061e
diff --git a/trunk/include/linux/lockdep.h b/trunk/include/linux/lockdep.h
index 29aec6e10020..9dba554c802c 100644
--- a/trunk/include/linux/lockdep.h
+++ b/trunk/include/linux/lockdep.h
@@ -377,7 +377,7 @@ do {								\
 
 #endif /* CONFIG_LOCK_STAT */
 
-#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS)
+#ifdef CONFIG_GENERIC_HARDIRQS
 extern void early_init_irq_lock_class(void);
 #else
 static inline void early_init_irq_lock_class(void)
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
index f1a23069c20a..6492400cb50d 100644
--- a/trunk/kernel/irq/handle.c
+++ b/trunk/kernel/irq/handle.c
@@ -422,11 +422,8 @@ unsigned int __do_IRQ(unsigned int irq)
 }
 #endif
 
-
-#ifdef CONFIG_TRACE_IRQFLAGS
 void early_init_irq_lock_class(void)
 {
-#ifndef CONFIG_SPARSE_IRQ
 	struct irq_desc *desc;
 	int i;
 
@@ -436,9 +433,7 @@ void early_init_irq_lock_class(void)
 
 		lockdep_set_class(&desc->lock, &irq_desc_lock_class);
 	}
-#endif
 }
-#endif
 
 #ifdef CONFIG_SPARSE_IRQ
 unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)