[XenPPC] [pushed] [ppc] more text to make diffing from original linux file even easier

[jimix@xxxxxxxxxxxxxx]

changeset:   10282:574ea299bed7292a1996e339c727b676e30faffd
user:        jimix@xxxxxxxxxxxxxxxxxxxxx
date:        Tue May 16 10:43:48 2006 -0400
files:       xen/arch/ppc/mpic.c
description:
[ppc] more text to make diffing from original linux file even easier


diff -r f84c4d5304ffaff2136cda894ba529058a44aaf6 -r 
574ea299bed7292a1996e339c727b676e30faffd xen/arch/ppc/mpic.c
--- a/xen/arch/ppc/mpic.c       Mon May 15 17:48:51 2006 -0400
+++ b/xen/arch/ppc/mpic.c       Tue May 16 10:43:48 2006 -0400
@@ -10,10 +10,6 @@
                (((__u32)(__x) & (__u32)0xff000000UL) >> 24) )); \
 })
 
-static inline void smp_message_recv(int msg, void /* struct pt_regs */ *regs)
-{
-    return;
-}
 
 #define alloc_bootmem(x) xmalloc_bytes(x)
 #define request_irq(irq, handler, f, devname, dev_id) \
@@ -51,6 +47,8 @@ typedef int irqreturn_t;
 #define MSG_ALL 0x8001
 #define MSG_ALL_BUT_SELF 0x8000
 
+/* keeps file even closer to the original */
+#define pt_regs cpu_user_regs
 
 /*
  *  arch/powerpc/kernel/mpic.c
@@ -96,6 +94,11 @@ typedef int irqreturn_t;
 #endif
 #include <asm/mpic.h>
 #include <asm/smp.h>
+
+static inline void smp_message_recv(int msg, struct pt_regs *regs)
+{
+    return;
+}
 
 #ifdef DEBUG
 #define DBG(fmt...) printk(fmt)
@@ -457,7 +460,7 @@ static inline void mpic_eoi(struct mpic 
 }
 
 #ifdef CONFIG_SMP
-static irqreturn_t mpic_ipi_action(int irq, void *dev_id, struct cpu_user_regs 
/* pt_regs  */ *regs)
+static irqreturn_t mpic_ipi_action(int irq, void *dev_id, struct pt_regs *regs)
 {
        struct mpic *mpic = dev_id;
 
@@ -861,6 +864,7 @@ void __init mpic_init(struct mpic *mpic)
                        printk(KERN_ERR "mpic: BROKEN_U3 set, but CONFIG 
doesn't match\n");
 #endif
                }
+
                DBG("setup source %d, vecpri: %08x, level: %d\n", i, vecpri,
                    (level != 0));
 
@@ -1018,7 +1022,7 @@ void mpic_send_ipi(unsigned int ipi_no, 
                       mpic_physmask(cpu_mask & cpus_addr(cpu_online_map)[0]));
 }
 
-int mpic_get_one_irq(struct mpic *mpic, struct cpu_user_regs /* pt_regs */ 
*regs)
+int mpic_get_one_irq(struct mpic *mpic, struct pt_regs *regs)
 {
        u32 irq;
 
@@ -1048,7 +1052,7 @@ int mpic_get_one_irq(struct mpic *mpic, 
        return irq - MPIC_VEC_IPI_0 + mpic->ipi_offset;
 }
 
-int mpic_get_irq(struct cpu_user_regs /* pt_regs */ *regs)
+int mpic_get_irq(struct pt_regs *regs)
 {
        struct mpic *mpic = mpic_primary;
 



_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel