Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

Conflicts:

	arch/parisc/hpux/sys_hpux.c
	arch/parisc/mm/ioremap.c

7 files changed, 19 insertions, 15 deletions

diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c
index d6c486e9501c..6274cd268e6a 100644
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
@@ -689,7 +689,9 @@ parse_tree_node(struct device *parent, int index, struct hardware_path *modpath)
                 .fn     = check_parent,
         };
 
-        device_for_each_child(parent, &recurse_data, descend_children);
+        if (device_for_each_child(parent, &recurse_data, descend_children))
+                /* nothing */;
+
         return d.dev;
 }
 
@@ -835,8 +837,8 @@ static void print_parisc_device(struct parisc_device *dev)
         static int count;
 
         print_pa_hwpath(dev, hw_path);
-        printk(KERN_INFO "%d. %s at 0x%lx [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
-                ++count, dev->name, dev->hpa.start, hw_path, dev->id.hw_type,
+        printk(KERN_INFO "%d. %s at 0x%p [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
+                ++count, dev->name, (void*) dev->hpa.start, hw_path, dev->id.hw_type,
                 dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);
 
         if (dev->num_addrs) {
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
index f50b982b0834..47ea4e4a2179 100644
--- a/arch/parisc/kernel/module.c
+++ b/arch/parisc/kernel/module.c
@@ -822,7 +822,8 @@ int module_finalize(const Elf_Ehdr *hdr,
                me->name, strtab, symhdr);
 
         if(me->arch.got_count > MAX_GOTS) {
-                printk(KERN_ERR "%s: Global Offset Table overflow (used %ld, allowed %d\n", me->name, me->arch.got_count, MAX_GOTS);
+                printk(KERN_ERR "%s: Global Offset Table overflow (used %ld, allowed %d)\n",
+                                me->name, me->arch.got_count, MAX_GOTS);
                 return -EINVAL;
         }
         
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index a6caf1073085..0c3aecb85a5c 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -342,7 +342,7 @@ pcxl_dma_init(void)
         pcxl_res_map = (char *)__get_free_pages(GFP_KERNEL,
                                             get_order(pcxl_res_size));
         memset(pcxl_res_map, 0, pcxl_res_size);
-        proc_gsc_root = proc_mkdir("gsc", 0);
+        proc_gsc_root = proc_mkdir("gsc", NULL);
         if (!proc_gsc_root)
                 printk(KERN_WARNING
                         "pcxl_dma_init: Unable to create gsc /proc dir entry\n");
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c
index 199887a61c76..563df0072dee 100644
--- a/arch/parisc/kernel/pci.c
+++ b/arch/parisc/kernel/pci.c
@@ -200,8 +200,8 @@ static void
 pcibios_link_hba_resources( struct resource *hba_res, struct resource *r)
 {
         if (!r->parent) {
-                printk(KERN_EMERG "PCI: resource not parented! [%lx-%lx]\n",
-                                r->start, r->end);
+                printk(KERN_EMERG "PCI: resource not parented! [%p-%p]\n",
+                                (void*) r->start, (void*) r->end);
                 r->parent = hba_res;
 
                 /* reverse link is harder *sigh*  */
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 2f9f9dfa66f7..dfca014b49ba 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -355,8 +355,8 @@ asmlinkage int sys_execve(struct pt_regs *regs)
         error = PTR_ERR(filename);
         if (IS_ERR(filename))
                 goto out;
-        error = do_execve(filename, (char __user **) regs->gr[25],
-                (char __user **) regs->gr[24], regs);
+        error = do_execve(filename, (char __user * __user *) regs->gr[25],
+                (char __user * __user *) regs->gr[24], regs);
         if (error == 0) {
                 task_lock(current);
                 current->ptrace &= ~PT_DTRACE;
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index fb81e5687e7c..0af1fad2fc65 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -153,8 +153,6 @@ static int __init processor_probe(struct parisc_device *dev)
         p->cpuid = cpuid;       /* save CPU id */
         p->txn_addr = txn_addr; /* save CPU IRQ address */
 #ifdef CONFIG_SMP
-        spin_lock_init(&p->lock);
-
         /*
         ** FIXME: review if any other initialization is clobbered
         **      for boot_cpu by the above memset().
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 12cc019307ad..3b67d115fb0a 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -76,6 +76,7 @@ cpumask_t cpu_possible_map __read_mostly = CPU_MASK_ALL;	/* Bitmap of Present CP
 EXPORT_SYMBOL(cpu_online_map);
 EXPORT_SYMBOL(cpu_possible_map);
 
+DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED;
 
 struct smp_call_struct {
         void (*func) (void *info);
@@ -167,10 +168,11 @@ ipi_interrupt(int irq, void *dev_id)
         mb();   /* Order interrupt and bit testing. */
 
         for (;;) {
-                spin_lock_irqsave(&(p->lock),flags);
+                spinlock_t *lock = &per_cpu(ipi_lock, this_cpu);
+                spin_lock_irqsave(lock, flags);
                 ops = p->pending_ipi;
                 p->pending_ipi = 0;
-                spin_unlock_irqrestore(&(p->lock),flags);
+                spin_unlock_irqrestore(lock, flags);
 
                 mb(); /* Order bit clearing and data access. */
 
@@ -275,12 +277,13 @@ static inline void
 ipi_send(int cpu, enum ipi_message_type op)
 {
         struct cpuinfo_parisc *p = &cpu_data[cpu];
+        spinlock_t *lock = &per_cpu(ipi_lock, cpu);
         unsigned long flags;
 
-        spin_lock_irqsave(&(p->lock),flags);
+        spin_lock_irqsave(lock, flags);
         p->pending_ipi |= 1 << op;
         gsc_writel(IPI_IRQ - CPU_IRQ_BASE, cpu_data[cpu].hpa);
-        spin_unlock_irqrestore(&(p->lock),flags);
+        spin_unlock_irqrestore(lock, flags);
 }