[PATCH] Update includes in v850 files to reflect recent header changes

Update includes in v850 files to reflect recent header changes

diff --git a/arch/v850/kernel/gbus_int.c b/arch/v850/kernel/gbus_int.c
index a1b659ec4e43032fe5056f0d39fb1861e7c4802d..1a5462150e2beef966dbdb263c26d1bf7a188405 100644 (file)
--- a/arch/v850/kernel/gbus_int.c
+++ b/arch/v850/kernel/gbus_int.c
@@ -14,11 +14,10 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/irq.h>
-#include <linux/sched.h>       /* For some unfathomable reason,
-                                  request_irq/free_irq are declared here.  */
+#include <linux/interrupt.h>
+#include <linux/signal.h>
 
 #include <asm/machdep.h>
-#include <asm/irq.h>
 
 
 /* The number of shared GINT interrupts. */

diff --git a/include/asm-v850/hardirq.h b/include/asm-v850/hardirq.h
index cfe4febe8fd7c2c274312580afbda568fa87b881..a093bf233ebd142603cfdacefcf2566174b0da7b 100644 (file)
--- a/include/asm-v850/hardirq.h
+++ b/include/asm-v850/hardirq.h
@@ -3,6 +3,7 @@
 
 #include <linux/config.h>
 #include <linux/threads.h>
+#include <linux/cache.h>
 
 typedef struct {
        unsigned int __softirq_pending;

diff --git a/include/asm-v850/percpu.h b/include/asm-v850/percpu.h
index 1c145090c0c0e6d38fe734c06d69121b32b7d782..755ac6522b63dd7315c7df8a6bf476004428cef6 100644 (file)
--- a/include/asm-v850/percpu.h
+++ b/include/asm-v850/percpu.h
@@ -3,4 +3,12 @@
 
 #include <asm-generic/percpu.h>
 
+/* This is a stupid hack to satisfy some grotty implicit include-file
+   dependency; basically, <linux/smp.h> uses BUG_ON, which calls BUG, but
+   doesn't include the necessary headers to define it.  In the twisted
+   festering mess of includes this must all be resolved somehow on other
+   platforms, but I haven't the faintest idea how, and don't care; here will
+   do, even though doesn't actually make any sense.  */
+#include <asm/page.h>
+
 #endif /* __V850_PERCPU_H__ */