[patch, -rc5-mm3] lock validator: sparc64, sparc, m68k, alpha, cris, irqtrace build fix

From: Ingo Molnar
Date: Sun Jun 04 2006 - 07:02:17 EST


Subject: lock validator: sparc64, sparc, m68k, alpha, cris, irqtrace build fix
From: Ingo Molnar <mingo@xxxxxxx>

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.

Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
include/linux/lockdep.h | 2 ++
init/main.c | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)

Index: linux/include/linux/lockdep.h
===================================================================
--- linux.orig/include/linux/lockdep.h
+++ 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
Index: linux/init/main.c
===================================================================
--- linux.orig/init/main.c
+++ 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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/