Skip to contentSkip to conversation

lock validator: sparc64, sparc, m68k, alpha, cris, irqtrace build fix

PATCH New Ingo Molnar 1 participant 1 message Jun 4, 2006 Locking primitives

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lock validator: sparc64, sparc, m68k, alpha, cris, irqtrace build fix

Subject: lock validator: sparc64, sparc, m68k, alpha, cris, irqtrace build fix
From: Ingo Molnar <[email protected]>

early_init_irq_lock_type() should only be provided by an architecture if it offers CONFIG_TRACE_IRQFLAGS.

this makes sparc64 (and probably the other non-genirq arches) build.

---
 include/linux/lockdep.h |    2 ++
 init/main.c             |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
include/linux/lockdep.h +2 -0
Index: linux/include/linux/lockdep.h
===================================================================
@@ -226,9 +226,11 @@ struct lockdep_type_key { };
 #endif /* !LOCKDEP */
 
 #ifdef CONFIG_TRACE_IRQFLAGS
+extern void early_init_irq_lock_type(void);
 extern void early_boot_irqs_off(void);
 extern void early_boot_irqs_on(void);
 #else
+# define early_init_irq_lock_type()		do { } while (0)
 # define early_boot_irqs_off()			do { } while (0)
 # define early_boot_irqs_on()			do { } while (0)
 #endif
init/main.c +0 -1
Index: linux/init/main.c
===================================================================
@@ -82,7 +82,6 @@
 
 static int init(void *);
 
-extern void early_init_irq_lock_type(void);
 extern void init_IRQ(void);
 extern void fork_init(unsigned long);
 extern void mca_init(void);