Merge branch 'rusty-cpumask-parisc' into parisc

diff --combined arch/parisc/kernel/irq.c
index 1c740f5cbd6347f0046dc1560fb52dc806fd3103,103752a8fb941a29f3eb36b332054f4b2fcb33a5..4ea4229d765ccc0657148d4f2268931ea3d6b8f9
--- 1/arch/parisc/kernel/irq.c
--- 2/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@@ -138,7 -138,7 +138,7 @@@ static void cpu_set_affinity_irq(unsign
        if (cpu_dest < 0)
                return;
  
 -      cpumask_copy(&irq_desc[irq].affinity, &cpumask_of_cpu(cpu_dest));
 +      cpumask_copy(&irq_desc[irq].affinity, dest);
  }
  #endif
  
@@@ -185,7 -185,7 +185,7 @@@ int show_interrupts(struct seq_file *p
                seq_printf(p, "%3d: ", i);
  #ifdef CONFIG_SMP
                for_each_online_cpu(j)
 -                      seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
 +                      seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
  #else
                seq_printf(p, "%10u ", kstat_irqs(i));
  #endif
@@@ -311,12 -311,12 +311,12 @@@ unsigned long txn_alloc_addr(unsigned i
        next_cpu++; /* assign to "next" CPU we want this bugger on */
  
        /* validate entry */
-       while ((next_cpu < NR_CPUS) &&
+       while ((next_cpu < nr_cpu_ids) &&
                (!per_cpu(cpu_data, next_cpu).txn_addr ||
                 !cpu_online(next_cpu)))
                next_cpu++;
  
-       if (next_cpu >= NR_CPUS) 
+       if (next_cpu >= nr_cpu_ids) 
                next_cpu = 0;   /* nothing else, assign monarch */
  
        return txn_affinity_addr(virt_irq, next_cpu);

diff --combined arch/parisc/kernel/processor.c
index df5e28c7a829441e6faca6ccb6f9650685d429aa,bdbabfb87347f9e52692737a8e981d0dc9c22899..e09d0f7fb6b047ad2c2cf34d95046f89f2263874
--- 1/arch/parisc/kernel/processor.c
--- 2/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@@ -100,8 -100,8 +100,8 @@@ static int __cpuinit processor_probe(st
        struct cpuinfo_parisc *p;
  
  #ifdef CONFIG_SMP
-       if (num_online_cpus() >= NR_CPUS) {
-               printk(KERN_INFO "num_online_cpus() >= NR_CPUS\n");
+       if (num_online_cpus() >= nr_cpu_ids) {
+               printk(KERN_INFO "num_online_cpus() >= nr_cpu_ids\n");
                return 1;
        }
  #else
@@@ -214,7 -214,7 +214,7 @@@
         */
  #ifdef CONFIG_SMP
        if (cpuid) {
-               cpu_set(cpuid, cpu_present_map);
+               set_cpu_present(cpuid, true);
                cpu_up(cpuid);
        }
  #endif
@@@ -364,13 -364,6 +364,13 @@@ show_cpuinfo (struct seq_file *m, void 
                                 boot_cpu_data.cpu_hz / 1000000,
                                 boot_cpu_data.cpu_hz % 1000000  );
  
 +              seq_printf(m, "capabilities\t:");
 +              if (boot_cpu_data.pdc.capabilities & PDC_MODEL_OS32)
 +                      seq_printf(m, " os32");
 +              if (boot_cpu_data.pdc.capabilities & PDC_MODEL_OS64)
 +                      seq_printf(m, " os64");
 +              seq_printf(m, "\n");
 +
                seq_printf(m, "model\t\t: %s\n"
                                "model name\t: %s\n",
                                 boot_cpu_data.pdc.sys_model_name,

diff --combined arch/parisc/kernel/smp.c
index 8545f2e7a2c0d1af8b0bcab9cbc5be8874af303a,869197992f9704ad4137889b6890f0506b63bd70..1fd0f0cec037f3fa19ce2630ee7311dc7cc34dbc
--- 1/arch/parisc/kernel/smp.c
--- 2/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@@ -31,7 -31,6 +31,7 @@@
  #include <linux/err.h>
  #include <linux/delay.h>
  #include <linux/bitops.h>
 +#include <linux/ftrace.h>
  
  #include <asm/system.h>
  #include <asm/atomic.h>
@@@ -114,14 -113,14 +114,14 @@@ halt_processor(void
  {
        /* REVISIT : redirect I/O Interrupts to another CPU? */
        /* REVISIT : does PM *know* this CPU isn't available? */
-       cpu_clear(smp_processor_id(), cpu_online_map);
+       set_cpu_online(smp_processor_id(), false);
        local_irq_disable();
        for (;;)
                ;
  }
  
  
 -irqreturn_t
 +irqreturn_t __irq_entry
  ipi_interrupt(int irq, void *dev_id) 
  {
        int this_cpu = smp_processor_id();
@@@ -215,11 -214,11 +215,11 @@@ ipi_send(int cpu, enum ipi_message_typ
  }
  
  static void
- send_IPI_mask(cpumask_t mask, enum ipi_message_type op)
+ send_IPI_mask(const struct cpumask *mask, enum ipi_message_type op)
  {
        int cpu;
  
-       for_each_cpu_mask(cpu, mask)
+       for_each_cpu(cpu, mask)
                ipi_send(cpu, op);
  }
  
@@@ -258,7 -257,7 +258,7 @@@ smp_send_all_nop(void
        send_IPI_allbutself(IPI_NOP);
  }
  
- void arch_send_call_function_ipi(cpumask_t mask)
+ void arch_send_call_function_ipi_mask(const struct cpumask *mask)
  {
        send_IPI_mask(mask, IPI_CALL_FUNC);
  }
@@@ -297,13 -296,14 +297,14 @@@ smp_cpu_init(int cpunum
        mb();
  
        /* Well, support 2.4 linux scheme as well. */
-       if (cpu_test_and_set(cpunum, cpu_online_map))
+       if (cpu_isset(cpunum, cpu_online_map))
        {
                extern void machine_halt(void); /* arch/parisc.../process.c */
  
                printk(KERN_CRIT "CPU#%d already initialized!\n", cpunum);
                machine_halt();
        }  
+       set_cpu_online(cpunum, true);
  
        /* Initialise the idle task for this CPU */
        atomic_inc(&init_mm.mm_count);
@@@ -425,8 -425,8 +426,8 @@@ void __init smp_prepare_boot_cpu(void
        /* Setup BSP mappings */
        printk(KERN_INFO "SMP: bootstrap CPU ID is %d\n", bootstrap_processor);
  
-       cpu_set(bootstrap_processor, cpu_online_map);
-       cpu_set(bootstrap_processor, cpu_present_map);
+       set_cpu_online(bootstrap_processor, true);
+       set_cpu_present(bootstrap_processor, true);
  }
  
  
@@@ -437,8 -437,7 +438,7 @@@
  */
  void __init smp_prepare_cpus(unsigned int max_cpus)
  {
-       cpus_clear(cpu_present_map);
-       cpu_set(0, cpu_present_map);
+       init_cpu_present(cpumask_of(0));
  
        parisc_max_cpus = max_cpus;
        if (!max_cpus)