From 5a5bd2b2bcc622f23db7df6b3c716e2c47732f56 Mon Sep 17 00:00:00 2001
From: Li Yang <leoli@freescale.com>
Date: Tue, 30 Jan 2007 13:33:01 +0800
Subject: [PATCH] --- yaml --- r: 46810 b: refs/heads/master c:
 3b6eb6af5f20471a8cb1b8a3d090401e9a8a2bb8 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/powerpc/kernel/iomap.c             | 20 +++++++++----------
 .../arch/powerpc/platforms/83xx/mpc832x_mds.c |  1 +
 .../arch/powerpc/platforms/83xx/mpc8360e_pb.c |  1 +
 trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c      |  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 0782cf02da56..0f8e1d825645 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8943212c97cc56d4dcc853a097740e327fe8a6fe
+refs/heads/master: 3b6eb6af5f20471a8cb1b8a3d090401e9a8a2bb8
diff --git a/trunk/arch/powerpc/kernel/iomap.c b/trunk/arch/powerpc/kernel/iomap.c
index 601ef79a5916..c68113371050 100644
--- a/trunk/arch/powerpc/kernel/iomap.c
+++ b/trunk/arch/powerpc/kernel/iomap.c
@@ -12,23 +12,23 @@
  * Here comes the ppc64 implementation of the IOMAP 
  * interfaces.
  */
-unsigned int ioread8(void __iomem *addr)
+unsigned int fastcall ioread8(void __iomem *addr)
 {
 	return readb(addr);
 }
-unsigned int ioread16(void __iomem *addr)
+unsigned int fastcall ioread16(void __iomem *addr)
 {
 	return readw(addr);
 }
-unsigned int ioread16be(void __iomem *addr)
+unsigned int fastcall ioread16be(void __iomem *addr)
 {
 	return in_be16(addr);
 }
-unsigned int ioread32(void __iomem *addr)
+unsigned int fastcall ioread32(void __iomem *addr)
 {
 	return readl(addr);
 }
-unsigned int ioread32be(void __iomem *addr)
+unsigned int fastcall ioread32be(void __iomem *addr)
 {
 	return in_be32(addr);
 }
@@ -38,23 +38,23 @@ EXPORT_SYMBOL(ioread16be);
 EXPORT_SYMBOL(ioread32);
 EXPORT_SYMBOL(ioread32be);
 
-void iowrite8(u8 val, void __iomem *addr)
+void fastcall iowrite8(u8 val, void __iomem *addr)
 {
 	writeb(val, addr);
 }
-void iowrite16(u16 val, void __iomem *addr)
+void fastcall iowrite16(u16 val, void __iomem *addr)
 {
 	writew(val, addr);
 }
-void iowrite16be(u16 val, void __iomem *addr)
+void fastcall iowrite16be(u16 val, void __iomem *addr)
 {
 	out_be16(addr, val);
 }
-void iowrite32(u32 val, void __iomem *addr)
+void fastcall iowrite32(u32 val, void __iomem *addr)
 {
 	writel(val, addr);
 }
-void iowrite32be(u32 val, void __iomem *addr)
+void fastcall iowrite32be(u32 val, void __iomem *addr)
 {
 	out_be32(addr, val);
 }
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c b/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 36c75b003891..3ecb55f8a6e2 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -25,6 +25,7 @@
 #include <linux/initrd.h>
 
 #include <asm/of_device.h>
+#include <asm/of_platform.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/time.h>
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/trunk/arch/powerpc/platforms/83xx/mpc8360e_pb.c
index 832aec4a7443..ccce2f9f283d 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc8360e_pb.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc8360e_pb.c
@@ -31,6 +31,7 @@
 #include <linux/initrd.h>
 
 #include <asm/of_device.h>
+#include <asm/of_platform.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/time.h>
diff --git a/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c b/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 4d1dcb45963d..908568f4dd84 100644
--- a/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -323,7 +323,7 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic)
 	return irq_linear_revmap(qe_ic->irqhost, irq);
 }
 
-void qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc)
+void fastcall qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc)
 {
 	struct qe_ic *qe_ic = desc->handler_data;
 	unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic);
@@ -332,7 +332,7 @@ void qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc)
 		generic_handle_irq(cascade_irq);
 }
 
-void qe_ic_cascade_high(unsigned int irq, struct irq_desc *desc)
+void fastcall qe_ic_cascade_high(unsigned int irq, struct irq_desc *desc)
 {
 	struct qe_ic *qe_ic = desc->handler_data;
 	unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic);