[uml-devel] [PATCH v3 3/3] um: enable trace irqflags support

[Thomas M. <th...@m3...>]

Add TRACE_IRQFLAGS_SUPPORT to UML.
This enables LOCKDEP_SUPPORT and TRACING_SUPPORT.

Signed-off-by: Thomas Meyer <th...@m3...>
---
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 87bc868..6a33c3a 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -28,10 +28,9 @@ config PCI
 config PCMCIA
 	bool
 
-# Yet to do!
 config TRACE_IRQFLAGS_SUPPORT
 	bool
-	default n
+	default y
 
 config LOCKDEP_SUPPORT
 	bool
diff --git a/arch/um/include/asm/irqflags.h b/arch/um/include/asm/irqflags.h
index c780d8a..c5b636e 100644
--- a/arch/um/include/asm/irqflags.h
+++ b/arch/um/include/asm/irqflags.h
@@ -34,9 +34,9 @@ static inline unsigned long arch_local_irq_save(void)
 	return flags;
 }
 
-static inline bool arch_irqs_disabled(void)
+static inline int arch_irqs_disabled_flags(unsigned long flags)
 {
-	return arch_local_save_flags() == 0;
+	return flags == 0;
 }
 
 #endif
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index f1efeee..fc188d8 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -251,6 +251,9 @@ static struct notifier_block panic_exit_notifier = {
 
 void uml_finishsetup(void)
 {
+#ifdef CONFIG_LOCKDEP
+	lockdep_init();
+#endif
 	atomic_notifier_chain_register(&panic_notifier_list,
 				       &panic_exit_notifier);