10 files changed, 119 insertions, 83 deletions

diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
index 5369653dcf6a..fba5bf915073 100644
--- a/arch/powerpc/platforms/iseries/exception.S
+++ b/arch/powerpc/platforms/iseries/exception.S
@@ -43,17 +43,14 @@ system_reset_iSeries:
         LOAD_REG_ADDR(r23, alpaca)
         li      r0,ALPACA_SIZE
         sub     r23,r13,r23
-        divdu   r23,r23,r0              /* r23 has cpu number */
-        LOAD_REG_ADDR(r13, paca)
-        mulli   r0,r23,PACA_SIZE
-        add     r13,r13,r0
-        mtspr   SPRN_SPRG_PACA,r13      /* Save it away for the future */
-        mfmsr   r24
-        ori     r24,r24,MSR_RI
-        mtmsrd  r24                     /* RI on */
-        mr      r24,r23
+        divdu   r24,r23,r0              /* r24 has cpu number */
         cmpwi   0,r24,0                 /* Are we processor 0? */
         bne     1f
+        LOAD_REG_ADDR(r13, boot_paca)
+        mtspr   SPRN_SPRG_PACA,r13      /* Save it away for the future */
+        mfmsr   r23
+        ori     r23,r23,MSR_RI
+        mtmsrd  r23                     /* RI on */
         b       .__start_initialization_iSeries /* Start up the first processor */
 1:      mfspr   r4,SPRN_CTRLF
         li      r5,CTRL_RUNLATCH        /* Turn off the run light */
@@ -86,6 +83,16 @@ system_reset_iSeries:
 #endif
 
 2:
+        /* Load our paca now that it's been allocated */
+        LOAD_REG_ADDR(r13, paca)
+        ld      r13,0(r13)
+        mulli   r0,r24,PACA_SIZE
+        add     r13,r13,r0
+        mtspr   SPRN_SPRG_PACA,r13      /* Save it away for the future */
+        mfmsr   r23
+        ori     r23,r23,MSR_RI
+        mtmsrd  r23                     /* RI on */
+
         HMT_LOW
 #ifdef CONFIG_SMP
         lbz     r23,PACAPROCSTART(r13)  /* Test if this processor
diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c
index f99c6c4b6985..3ae66ab9d5e7 100644
--- a/arch/powerpc/platforms/iseries/htab.c
+++ b/arch/powerpc/platforms/iseries/htab.c
@@ -19,8 +19,7 @@
 
 #include "call_hpt.h"
 
-static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp =
-        { [0 ... 63] = SPIN_LOCK_UNLOCKED};
+static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp;
 
 /*
  * Very primitive algorithm for picking up a lock
@@ -245,6 +244,11 @@ static void iSeries_hpte_invalidate(unsigned long slot, unsigned long va,
 
 void __init hpte_init_iSeries(void)
 {
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(iSeries_hlocks); i++)
+                spin_lock_init(&iSeries_hlocks[i]);
+
         ppc_md.hpte_invalidate  = iSeries_hpte_invalidate;
         ppc_md.hpte_updatepp    = iSeries_hpte_updatepp;
         ppc_md.hpte_updateboltedpp = iSeries_hpte_updateboltedpp;
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index 9d53cb481a7c..ce61cea0afb5 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -29,6 +29,7 @@
 #include <linux/list.h>
 #include <linux/pci.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include <asm/iommu.h>
 #include <asm/vio.h>
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 94f444758836..ba446bf355a9 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -214,12 +214,12 @@ void __init iSeries_activate_IRQs()
         unsigned long flags;
 
         for_each_irq (irq) {
-                struct irq_desc *desc = get_irq_desc(irq);
+                struct irq_desc *desc = irq_to_desc(irq);
 
                 if (desc && desc->chip && desc->chip->startup) {
-                        spin_lock_irqsave(&desc->lock, flags);
+                        raw_spin_lock_irqsave(&desc->lock, flags);
                         desc->chip->startup(irq);
-                        spin_unlock_irqrestore(&desc->lock, flags);
+                        raw_spin_unlock_irqrestore(&desc->lock, flags);
                 }
         }
 }
@@ -273,7 +273,7 @@ static void iseries_end_IRQ(unsigned int irq)
 }
 
 static struct irq_chip iseries_pic = {
-        .typename       = "iSeries irq controller",
+        .name           = "iSeries",
         .startup        = iseries_startup_IRQ,
         .shutdown       = iseries_shutdown_IRQ,
         .unmask         = iseries_enable_IRQ,
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 0d9343df35bc..d2c1d497846e 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -33,6 +33,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/bcd.h>
 #include <linux/rtc.h>
+#include <linux/slab.h>
 
 #include <asm/time.h>
 #include <asm/uaccess.h>
@@ -855,59 +856,58 @@ static int mf_get_boot_rtc(struct rtc_time *tm)
 }
 
 #ifdef CONFIG_PROC_FS
-
-static int proc_mf_dump_cmdline(char *page, char **start, off_t off,
-                int count, int *eof, void *data)
+static int mf_cmdline_proc_show(struct seq_file *m, void *v)
 {
-        int len;
-        char *p;
+        char *page, *p;
         struct vsp_cmd_data vsp_cmd;
         int rc;
         dma_addr_t dma_addr;
 
         /* The HV appears to return no more than 256 bytes of command line */
-        if (off >= 256)
-                return 0;
-        if ((off + count) > 256)
-                count = 256 - off;
+        page = kmalloc(256, GFP_KERNEL);
+        if (!page)
+                return -ENOMEM;
 
-        dma_addr = iseries_hv_map(page, off + count, DMA_FROM_DEVICE);
-        if (dma_addr == DMA_ERROR_CODE)
+        dma_addr = iseries_hv_map(page, 256, DMA_FROM_DEVICE);
+        if (dma_addr == DMA_ERROR_CODE) {
+                kfree(page);
                 return -ENOMEM;
-        memset(page, 0, off + count);
+        }
+        memset(page, 0, 256);
         memset(&vsp_cmd, 0, sizeof(vsp_cmd));
         vsp_cmd.cmd = 33;
         vsp_cmd.sub_data.kern.token = dma_addr;
         vsp_cmd.sub_data.kern.address_type = HvLpDma_AddressType_TceIndex;
-        vsp_cmd.sub_data.kern.side = (u64)data;
-        vsp_cmd.sub_data.kern.length = off + count;
+        vsp_cmd.sub_data.kern.side = (u64)m->private;
+        vsp_cmd.sub_data.kern.length = 256;
         mb();
         rc = signal_vsp_instruction(&vsp_cmd);
-        iseries_hv_unmap(dma_addr, off + count, DMA_FROM_DEVICE);
-        if (rc)
+        iseries_hv_unmap(dma_addr, 256, DMA_FROM_DEVICE);
+        if (rc) {
+                kfree(page);
                 return rc;
-        if (vsp_cmd.result_code != 0)
+        }
+        if (vsp_cmd.result_code != 0) {
+                kfree(page);
                 return -ENOMEM;
+        }
         p = page;
-        len = 0;
-        while (len < (off + count)) {
-                if ((*p == '\0') || (*p == '\n')) {
-                        if (*p == '\0')
-                                *p = '\n';
-                        p++;
-                        len++;
-                        *eof = 1;
+        while (p - page < 256) {
+                if (*p == '\0' || *p == '\n') {
+                        *p = '\n';
                         break;
                 }
                 p++;
-                len++;
-        }
 
-        if (len < off) {
-                *eof = 1;
-                len = 0;
         }
-        return len;
+        seq_write(m, page, p - page);
+        kfree(page);
+        return 0;
+}
+
+static int mf_cmdline_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, mf_cmdline_proc_show, PDE(inode)->data);
 }
 
 #if 0
@@ -962,10 +962,8 @@ static int proc_mf_dump_vmlinux(char *page, char **start, off_t off,
 }
 #endif
 
-static int proc_mf_dump_side(char *page, char **start, off_t off,
-                int count, int *eof, void *data)
+static int mf_side_proc_show(struct seq_file *m, void *v)
 {
-        int len;
         char mf_current_side = ' ';
         struct vsp_cmd_data vsp_cmd;
 
@@ -989,21 +987,17 @@ static int proc_mf_dump_side(char *page, char **start, off_t off,
                 }
         }
 
-        len = sprintf(page, "%c\n", mf_current_side);
+        seq_printf(m, "%c\n", mf_current_side);
+        return 0;
+}
 
-        if (len <= (off + count))
-                *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len > count)
-                len = count;
-        if (len < 0)
-                len = 0;
-        return len;
+static int mf_side_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, mf_side_proc_show, NULL);
 }
 
-static int proc_mf_change_side(struct file *file, const char __user *buffer,
-                unsigned long count, void *data)
+static ssize_t mf_side_proc_write(struct file *file, const char __user *buffer,
+                                  size_t count, loff_t *pos)
 {
         char side;
         u64 newSide;
@@ -1041,6 +1035,15 @@ static int proc_mf_change_side(struct file *file, const char __user *buffer,
         return count;
 }
 
+static const struct file_operations mf_side_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = mf_side_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = mf_side_proc_write,
+};
+
 #if 0
 static void mf_getSrcHistory(char *buffer, int size)
 {
@@ -1087,8 +1090,7 @@ static void mf_getSrcHistory(char *buffer, int size)
 }
 #endif
 
-static int proc_mf_dump_src(char *page, char **start, off_t off,
-                int count, int *eof, void *data)
+static int mf_src_proc_show(struct seq_file *m, void *v)
 {
 #if 0
         int len;
@@ -1109,8 +1111,13 @@ static int proc_mf_dump_src(char *page, char **start, off_t off,
 #endif
 }
 
-static int proc_mf_change_src(struct file *file, const char __user *buffer,
-                unsigned long count, void *data)
+static int mf_src_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, mf_src_proc_show, NULL);
+}
+
+static ssize_t mf_src_proc_write(struct file *file, const char __user *buffer,
+                                 size_t count, loff_t *pos)
 {
         char stkbuf[10];
 
@@ -1135,9 +1142,19 @@ static int proc_mf_change_src(struct file *file, const char __user *buffer,
         return count;
 }
 
-static int proc_mf_change_cmdline(struct file *file, const char __user *buffer,
-                unsigned long count, void *data)
+static const struct file_operations mf_src_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = mf_src_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = mf_src_proc_write,
+};
+
+static ssize_t mf_cmdline_proc_write(struct file *file, const char __user *buffer,
+                                     size_t count, loff_t *pos)
 {
+        void *data = PDE(file->f_path.dentry->d_inode)->data;
         struct vsp_cmd_data vsp_cmd;
         dma_addr_t dma_addr;
         char *page;
@@ -1172,6 +1189,15 @@ out:
         return ret;
 }
 
+static const struct file_operations mf_cmdline_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = mf_cmdline_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = mf_cmdline_proc_write,
+};
+
 static ssize_t proc_mf_change_vmlinux(struct file *file,
                                       const char __user *buf,
                                       size_t count, loff_t *ppos)
@@ -1246,12 +1272,10 @@ static int __init mf_proc_init(void)
                 if (!mf)
                         return 1;
 
-                ent = create_proc_entry("cmdline", S_IFREG|S_IRUSR|S_IWUSR, mf);
+                ent = proc_create_data("cmdline", S_IRUSR|S_IWUSR, mf,
+                                       &mf_cmdline_proc_fops, (void *)(long)i);
                 if (!ent)
                         return 1;
-                ent->data = (void *)(long)i;
-                ent->read_proc = proc_mf_dump_cmdline;
-                ent->write_proc = proc_mf_change_cmdline;
 
                 if (i == 3)     /* no vmlinux entry for 'D' */
                         continue;
@@ -1263,19 +1287,15 @@ static int __init mf_proc_init(void)
                         return 1;
         }
 
-        ent = create_proc_entry("side", S_IFREG|S_IRUSR|S_IWUSR, mf_proc_root);
+        ent = proc_create("side", S_IFREG|S_IRUSR|S_IWUSR, mf_proc_root,
+                          &mf_side_proc_fops);
         if (!ent)
                 return 1;
-        ent->data = (void *)0;
-        ent->read_proc = proc_mf_dump_side;
-        ent->write_proc = proc_mf_change_side;
 
-        ent = create_proc_entry("src", S_IFREG|S_IRUSR|S_IWUSR, mf_proc_root);
+        ent = proc_create("src", S_IFREG|S_IRUSR|S_IWUSR, mf_proc_root,
+                          &mf_src_proc_fops);
         if (!ent)
                 return 1;
-        ent->data = (void *)0;
-        ent->read_proc = proc_mf_dump_src;
-        ent->write_proc = proc_mf_change_src;
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 175aac8ca7e5..b841c9a9db87 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
index 91f4c6cd4b99..06763682db47 100644
--- a/arch/powerpc/platforms/iseries/proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c
@@ -85,7 +85,7 @@ static int proc_titantod_show(struct seq_file *m, void *v)
 
                 seq_printf(m, "  titan elapsed = %lu uSec\n", titan_usec);
                 seq_printf(m, "  tb elapsed    = %lu ticks\n", tb_ticks);
-                seq_printf(m, "  titan jiffies = %lu.%04lu \n", titan_jiffies,
+                seq_printf(m, "  titan jiffies = %lu.%04lu\n", titan_jiffies,
                            titan_jiff_rem_usec);
                 seq_printf(m, "  tb jiffies    = %lu.%04lu\n", tb_jiffies,
                            tb_jiff_rem_usec);
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index a6cd3394feaa..b0863410517f 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -256,7 +256,7 @@ static unsigned long iSeries_process_mainstore_vpd(struct MemoryBlock *mb_array,
                 mem_blocks = iSeries_process_Condor_mainstore_vpd(mb_array,
                                 max_entries);
 
-        printk("Mainstore_VPD: numMemoryBlocks = %ld \n", mem_blocks);
+        printk("Mainstore_VPD: numMemoryBlocks = %ld\n", mem_blocks);
         for (i = 0; i < mem_blocks; ++i) {
                 printk("Mainstore_VPD: block %3ld logical chunks %016lx - %016lx\n"
                        "                             abs chunks %016lx - %016lx\n",
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
index 657b72f68493..00b6730bc48f 100644
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -22,7 +22,7 @@
  */
 #include <linux/of.h>
 #include <linux/init.h>
-#include <linux/gfp.h>
+#include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/proc_fs.h>
 #include <linux/module.h>
@@ -474,6 +474,8 @@ static void __init get_viotape_info(struct device_node *vio_root)
         struct vio_waitevent we;
         int ret;
 
+        init_completion(&we.com);
+
         ret = viopath_open(viopath_hostLp, viomajorsubtype_tape, 2);
         if (ret) {
                 printk(KERN_WARNING "get_viotape_info: "
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 49ff4dc422b7..b5f05d943a90 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -29,6 +29,7 @@
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/vmalloc.h>
 #include <linux/string.h>
@@ -116,7 +117,7 @@ static int proc_viopath_show(struct seq_file *m, void *v)
         u16 vlanMap;
         dma_addr_t handle;
         HvLpEvent_Rc hvrc;
-        DECLARE_COMPLETION(done);
+        DECLARE_COMPLETION_ONSTACK(done);
         struct device_node *node;
         const char *sysid;