summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiles Bader <miles@lsi.nec.co.jp>2002-11-26 05:20:35 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-11-26 05:20:35 -0800
commit3483b8769a273a115f91b051d22e4f225e745a2d (patch)
tree5742c011c7691bb639d0de4b91fadf98f8d06bea
parentd68080e67dbde1ddf2373f60b36a1f24f0ce112d (diff)
[PATCH] Update includes in v850 files to reflect recent header changes
Update includes in v850 files to reflect recent header changes
-rw-r--r--arch/v850/kernel/gbus_int.c5
-rw-r--r--include/asm-v850/hardirq.h1
-rw-r--r--include/asm-v850/percpu.h8
3 files changed, 11 insertions, 3 deletions
diff --git a/arch/v850/kernel/gbus_int.c b/arch/v850/kernel/gbus_int.c
index a1b659ec4e43..1a5462150e2b 100644
--- 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 cfe4febe8fd7..a093bf233ebd 100644
--- 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 1c145090c0c0..755ac6522b63 100644
--- 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__ */