From 60b30539f17fff40ad05f193dbeee2e4ca2002fd Mon Sep 17 00:00:00 2001
From: "linuxppc@jdl.com" <linuxppc@jdl.com>
Date: Mon, 19 Sep 2005 09:32:07 -0500
Subject: [PATCH] --- yaml --- r: 11444 b: refs/heads/master c:
 3e57615bb5a8b6208627049884ee441f6d05905e h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/ppc/platforms/83xx/mpc834x_sys.h   |  1 -
 .../ppc/platforms/85xx/mpc85xx_ads_common.h   |  1 -
 trunk/arch/ppc/platforms/85xx/stx_gp3.h       |  1 -
 .../{asm-ppc => asm-powerpc}/hardirq.h        | 15 +++--------
 trunk/include/asm-ppc/hw_irq.h                |  1 +
 trunk/include/asm-ppc64/hardirq.h             | 27 -------------------
 7 files changed, 6 insertions(+), 42 deletions(-)
 rename trunk/include/{asm-ppc => asm-powerpc}/hardirq.h (67%)
 delete mode 100644 trunk/include/asm-ppc64/hardirq.h

diff --git a/[refs] b/[refs]
index bdd0ea4f815e..ff5b736d057c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7aeffc4d38f0573b05bf5ebd2f037997ec9d075
+refs/heads/master: 3e57615bb5a8b6208627049884ee441f6d05905e
diff --git a/trunk/arch/ppc/platforms/83xx/mpc834x_sys.h b/trunk/arch/ppc/platforms/83xx/mpc834x_sys.h
index 1584cd77a9ef..58e44c042535 100644
--- a/trunk/arch/ppc/platforms/83xx/mpc834x_sys.h
+++ b/trunk/arch/ppc/platforms/83xx/mpc834x_sys.h
@@ -19,7 +19,6 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
-#include <linux/seq_file.h>
 #include <syslib/ppc83xx_setup.h>
 #include <asm/ppcboot.h>
 
diff --git a/trunk/arch/ppc/platforms/85xx/mpc85xx_ads_common.h b/trunk/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
index 3875e839cff7..84acf6e8d45e 100644
--- a/trunk/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
+++ b/trunk/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
@@ -19,7 +19,6 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
-#include <linux/seq_file.h>
 #include <asm/ppcboot.h>
 
 #define BOARD_CCSRBAR		((uint)0xe0000000)
diff --git a/trunk/arch/ppc/platforms/85xx/stx_gp3.h b/trunk/arch/ppc/platforms/85xx/stx_gp3.h
index 7bcc6c35a417..95fdf4b0680b 100644
--- a/trunk/arch/ppc/platforms/85xx/stx_gp3.h
+++ b/trunk/arch/ppc/platforms/85xx/stx_gp3.h
@@ -21,7 +21,6 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
-#include <linux/seq_file.h>
 #include <asm/ppcboot.h>
 
 #define BOARD_CCSRBAR		((uint)0xe0000000)
diff --git a/trunk/include/asm-ppc/hardirq.h b/trunk/include/asm-powerpc/hardirq.h
similarity index 67%
rename from trunk/include/asm-ppc/hardirq.h
rename to trunk/include/asm-powerpc/hardirq.h
index 94f1411b1a93..2c0a31b1008d 100644
--- a/trunk/include/asm-ppc/hardirq.h
+++ b/trunk/include/asm-powerpc/hardirq.h
@@ -1,11 +1,5 @@
-#ifdef __KERNEL__
-#ifndef __ASM_HARDIRQ_H
-#define __ASM_HARDIRQ_H
-
-#include <linux/config.h>
-#include <linux/cache.h>
-#include <linux/smp_lock.h>
-#include <asm/irq.h>
+#ifndef _ASM_POWERPC_HARDIRQ_H
+#define _ASM_POWERPC_HARDIRQ_H
 
 /* The __last_jiffy_stamp field is needed to ensure that no decrementer
  * interrupt is lost on SMP machines. Since on most CPUs it is in the same
@@ -13,7 +7,7 @@
  * for uniformity.
  */
 typedef struct {
-	unsigned long __softirq_pending;	/* set_bit is used on this */
+	unsigned int __softirq_pending;	/* set_bit is used on this */
 	unsigned int __last_jiffy_stamp;
 } ____cacheline_aligned irq_cpustat_t;
 
@@ -27,5 +21,4 @@ static inline void ack_bad_irq(int irq)
 	BUG();
 }
 
-#endif /* __ASM_HARDIRQ_H */
-#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_HARDIRQ_H */
diff --git a/trunk/include/asm-ppc/hw_irq.h b/trunk/include/asm-ppc/hw_irq.h
index 51a1d7ef5253..da0fa940adb3 100644
--- a/trunk/include/asm-ppc/hw_irq.h
+++ b/trunk/include/asm-ppc/hw_irq.h
@@ -7,6 +7,7 @@
 
 #include <asm/ptrace.h>
 #include <asm/reg.h>
+#include <asm/irq.h>
 
 extern void timer_interrupt(struct pt_regs *);
 
diff --git a/trunk/include/asm-ppc64/hardirq.h b/trunk/include/asm-ppc64/hardirq.h
deleted file mode 100644
index 4ee72bb1fd48..000000000000
--- a/trunk/include/asm-ppc64/hardirq.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __ASM_HARDIRQ_H
-#define __ASM_HARDIRQ_H
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/config.h>
-#include <linux/cache.h>
-#include <linux/preempt.h>
-
-typedef struct {
-	unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
-
-static inline void ack_bad_irq(int irq)
-{
-	printk(KERN_CRIT "illegal vector %d received!\n", irq);
-	BUG();
-}
-
-#endif /* __ASM_HARDIRQ_H */