12 files changed, 62 insertions, 48 deletions

diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 57c39843fb2a..90350f838f05 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -653,7 +653,7 @@ static void __cpuinit dr_cpu_data(struct ds_info *dp,
                 if (cpu_list[i] == CPU_SENTINEL)
                         continue;
 
-                if (cpu_list[i] < NR_CPUS)
+                if (cpu_list[i] < nr_cpu_ids)
                         cpu_set(cpu_list[i], mask);
         }
 
diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
index 44dd5ee64339..ad800b80c718 100644
--- a/arch/sparc/kernel/irq_32.c
+++ b/arch/sparc/kernel/irq_32.c
@@ -439,7 +439,6 @@ static int request_fast_irq(unsigned int irq,
         flush_cache_all();
 
         action->flags = irqflags;
-        cpus_clear(action->mask);
         action->name = devname;
         action->dev_id = NULL;
         action->next = NULL;
@@ -574,7 +573,6 @@ int request_irq(unsigned int irq,
 
         action->handler = handler;
         action->flags = irqflags;
-        cpus_clear(action->mask);
         action->name = devname;
         action->next = NULL;
         action->dev_id = dev_id;
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index d0d6a515499a..5deabe921a47 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -266,12 +266,12 @@ static int irq_choose_cpu(unsigned int virt_irq)
                 spin_lock_irqsave(&irq_rover_lock, flags);
 
                 while (!cpu_online(irq_rover)) {
-                        if (++irq_rover >= NR_CPUS)
+                        if (++irq_rover >= nr_cpu_ids)
                                 irq_rover = 0;
                 }
                 cpuid = irq_rover;
                 do {
-                        if (++irq_rover >= NR_CPUS)
+                        if (++irq_rover >= nr_cpu_ids)
                                 irq_rover = 0;
                 } while (!cpu_online(irq_rover));
 
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c
index adaaed4ea2fb..00d034ea2164 100644
--- a/arch/sparc/kernel/led.c
+++ b/arch/sparc/kernel/led.c
@@ -126,7 +126,6 @@ static int __init led_init(void)
         led = proc_create("led", 0, NULL, &led_proc_fops);
         if (!led)
                 return -ENOMEM;
-        led->owner = THIS_MODULE;
 
         printk(KERN_INFO
                "led: version %s, Lars Kotthoff <metalhead@metalhead.ws>\n",
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 3f79f0c23a08..f0e6ed23a468 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -567,7 +567,7 @@ static void __init report_platform_properties(void)
                         max_cpu = NR_CPUS;
                 }
                 for (i = 0; i < max_cpu; i++)
-                        cpu_set(i, cpu_possible_map);
+                        set_cpu_possible(i, true);
         }
 #endif
 
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index f3577223c863..2c0cc72d295b 100644
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/kprobes.h>
 #include <linux/kernel_stat.h>
+#include <linux/reboot.h>
 #include <linux/slab.h>
 #include <linux/kdebug.h>
 #include <linux/delay.h>
@@ -206,13 +207,33 @@ void nmi_adjust_hz(unsigned int new_hz)
 }
 EXPORT_SYMBOL_GPL(nmi_adjust_hz);
 
+static int nmi_shutdown(struct notifier_block *nb, unsigned long cmd, void *p)
+{
+        on_each_cpu(stop_watchdog, NULL, 1);
+        return 0;
+}
+
+static struct notifier_block nmi_reboot_notifier = {
+        .notifier_call = nmi_shutdown,
+};
+
 int __init nmi_init(void)
 {
+        int err;
+
         nmi_usable = 1;
 
         on_each_cpu(start_watchdog, NULL, 1);
 
-        return check_nmi_watchdog();
+        err = check_nmi_watchdog();
+        if (!err) {
+                err = register_reboot_notifier(&nmi_reboot_notifier);
+                if (err) {
+                        nmi_usable = 0;
+                        on_each_cpu(stop_watchdog, NULL, 1);
+                }
+        }
+        return err;
 }
 
 static int __init setup_nmi_watchdog(char *str)
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index edecca7b8116..ca55c7012f77 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -518,8 +518,8 @@ void __init of_fill_in_cpu_data(void)
                 }
 
 #ifdef CONFIG_SMP
-                cpu_set(cpuid, cpu_present_map);
-                cpu_set(cpuid, cpu_possible_map);
+                set_cpu_present(cpuid, true);
+                set_cpu_possible(cpuid, true);
 #endif
         }
 
diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index 1e5ac4e282e1..132d81fb2616 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -70,13 +70,12 @@ void __init smp_cpus_done(unsigned int max_cpus)
         extern void smp4m_smp_done(void);
         extern void smp4d_smp_done(void);
         unsigned long bogosum = 0;
-        int cpu, num;
+        int cpu, num = 0;
 
-        for (cpu = 0, num = 0; cpu < NR_CPUS; cpu++)
-                if (cpu_online(cpu)) {
-                        num++;
-                        bogosum += cpu_data(cpu).udelay_val;
-                }
+        for_each_online_cpu(cpu) {
+                num++;
+                bogosum += cpu_data(cpu).udelay_val;
+        }
 
         printk("Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
                 num, bogosum/(500000/HZ),
@@ -144,7 +143,7 @@ void smp_flush_tlb_all(void)
 void smp_flush_cache_mm(struct mm_struct *mm)
 {
         if(mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = mm->cpu_vm_mask;
+                cpumask_t cpu_mask = *mm_cpumask(mm);
                 cpu_clear(smp_processor_id(), cpu_mask);
                 if (!cpus_empty(cpu_mask))
                         xc1((smpfunc_t) BTFIXUP_CALL(local_flush_cache_mm), (unsigned long) mm);
@@ -155,12 +154,13 @@ void smp_flush_cache_mm(struct mm_struct *mm)
 void smp_flush_tlb_mm(struct mm_struct *mm)
 {
         if(mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = mm->cpu_vm_mask;
+                cpumask_t cpu_mask = *mm_cpumask(mm);
                 cpu_clear(smp_processor_id(), cpu_mask);
                 if (!cpus_empty(cpu_mask)) {
                         xc1((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_mm), (unsigned long) mm);
                         if(atomic_read(&mm->mm_users) == 1 && current->active_mm == mm)
-                                mm->cpu_vm_mask = cpumask_of_cpu(smp_processor_id());
+                                cpumask_copy(mm_cpumask(mm),
+                                             cpumask_of(smp_processor_id()));
                 }
                 local_flush_tlb_mm(mm);
         }
@@ -172,7 +172,7 @@ void smp_flush_cache_range(struct vm_area_struct *vma, unsigned long start,
         struct mm_struct *mm = vma->vm_mm;
 
         if (mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = mm->cpu_vm_mask;
+                cpumask_t cpu_mask = *mm_cpumask(mm);
                 cpu_clear(smp_processor_id(), cpu_mask);
                 if (!cpus_empty(cpu_mask))
                         xc3((smpfunc_t) BTFIXUP_CALL(local_flush_cache_range), (unsigned long) vma, start, end);
@@ -186,7 +186,7 @@ void smp_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
         struct mm_struct *mm = vma->vm_mm;
 
         if (mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = mm->cpu_vm_mask;
+                cpumask_t cpu_mask = *mm_cpumask(mm);
                 cpu_clear(smp_processor_id(), cpu_mask);
                 if (!cpus_empty(cpu_mask))
                         xc3((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_range), (unsigned long) vma, start, end);
@@ -199,7 +199,7 @@ void smp_flush_cache_page(struct vm_area_struct *vma, unsigned long page)
         struct mm_struct *mm = vma->vm_mm;
 
         if(mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = mm->cpu_vm_mask;
+                cpumask_t cpu_mask = *mm_cpumask(mm);
                 cpu_clear(smp_processor_id(), cpu_mask);
                 if (!cpus_empty(cpu_mask))
                         xc2((smpfunc_t) BTFIXUP_CALL(local_flush_cache_page), (unsigned long) vma, page);
@@ -212,7 +212,7 @@ void smp_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
         struct mm_struct *mm = vma->vm_mm;
 
         if(mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = mm->cpu_vm_mask;
+                cpumask_t cpu_mask = *mm_cpumask(mm);
                 cpu_clear(smp_processor_id(), cpu_mask);
                 if (!cpus_empty(cpu_mask))
                         xc2((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_page), (unsigned long) vma, page);
@@ -241,7 +241,7 @@ void smp_flush_page_to_ram(unsigned long page)
 
 void smp_flush_sig_insns(struct mm_struct *mm, unsigned long insn_addr)
 {
-        cpumask_t cpu_mask = mm->cpu_vm_mask;
+        cpumask_t cpu_mask = *mm_cpumask(mm);
         cpu_clear(smp_processor_id(), cpu_mask);
         if (!cpus_empty(cpu_mask))
                 xc2((smpfunc_t) BTFIXUP_CALL(local_flush_sig_insns), (unsigned long) mm, insn_addr);
@@ -332,8 +332,8 @@ void __init smp_setup_cpu_possible_map(void)
         instance = 0;
         while (!cpu_find_by_instance(instance, NULL, &mid)) {
                 if (mid < NR_CPUS) {
-                        cpu_set(mid, cpu_possible_map);
-                        cpu_set(mid, cpu_present_map);
+                        set_cpu_possible(mid, true);
+                        set_cpu_present(mid, true);
                 }
                 instance++;
         }
@@ -351,8 +351,8 @@ void __init smp_prepare_boot_cpu(void)
                 printk("boot cpu id != 0, this could work but is untested\n");
 
         current_thread_info()->cpu = cpuid;
-        cpu_set(cpuid, cpu_online_map);
-        cpu_set(cpuid, cpu_possible_map);
+        set_cpu_online(cpuid, true);
+        set_cpu_possible(cpuid, true);
 }
 
 int __cpuinit __cpu_up(unsigned int cpu)
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 79457f682b5a..708e12a26b05 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -808,9 +808,9 @@ static void smp_start_sync_tick_client(int cpu)
 
 extern unsigned long xcall_call_function;
 
-void arch_send_call_function_ipi(cpumask_t mask)
+void arch_send_call_function_ipi_mask(const struct cpumask *mask)
 {
-        xcall_deliver((u64) &xcall_call_function, 0, 0, &mask);
+        xcall_deliver((u64) &xcall_call_function, 0, 0, mask);
 }
 
 extern unsigned long xcall_call_function_single;
@@ -850,7 +850,7 @@ static void tsb_sync(void *info)
 
 void smp_tsb_sync(struct mm_struct *mm)
 {
-        smp_call_function_mask(mm->cpu_vm_mask, tsb_sync, mm, 1);
+        smp_call_function_many(mm_cpumask(mm), tsb_sync, mm, 1);
 }
 
 extern unsigned long xcall_flush_tlb_mm;
@@ -1055,13 +1055,13 @@ void smp_flush_tlb_mm(struct mm_struct *mm)
         int cpu = get_cpu();
 
         if (atomic_read(&mm->mm_users) == 1) {
-                mm->cpu_vm_mask = cpumask_of_cpu(cpu);
+                cpumask_copy(mm_cpumask(mm), cpumask_of(cpu));
                 goto local_flush_and_out;
         }
 
         smp_cross_call_masked(&xcall_flush_tlb_mm,
                               ctx, 0, 0,
-                              &mm->cpu_vm_mask);
+                              mm_cpumask(mm));
 
 local_flush_and_out:
         __flush_tlb_mm(ctx, SECONDARY_CONTEXT);
@@ -1075,11 +1075,11 @@ void smp_flush_tlb_pending(struct mm_struct *mm, unsigned long nr, unsigned long
         int cpu = get_cpu();
 
         if (mm == current->mm && atomic_read(&mm->mm_users) == 1)
-                mm->cpu_vm_mask = cpumask_of_cpu(cpu);
+                cpumask_copy(mm_cpumask(mm), cpumask_of(cpu));
         else
                 smp_cross_call_masked(&xcall_flush_tlb_pending,
                                       ctx, nr, (unsigned long) vaddrs,
-                                      &mm->cpu_vm_mask);
+                                      mm_cpumask(mm));
 
         __flush_tlb_pending(ctx, nr, vaddrs);
 
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index 3369fef5b4b3..ab036a72de5a 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -326,7 +326,6 @@ int sun4d_request_irq(unsigned int irq,
 
         action->handler = handler;
         action->flags = irqflags;
-        cpus_clear(action->mask);
         action->name = devname;
         action->next = NULL;
         action->dev_id = dev_id;
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 50afaed99c8a..54fb02468f0d 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -150,7 +150,7 @@ void __cpuinit smp4d_callin(void)
         spin_lock_irqsave(&sun4d_imsk_lock, flags);
         cc_set_imsk(cc_get_imsk() & ~0x4000); /* Allow PIL 14 as well */
         spin_unlock_irqrestore(&sun4d_imsk_lock, flags);
-        cpu_set(cpuid, cpu_online_map);
+        set_cpu_online(cpuid, true);
 
 }
 
@@ -228,11 +228,10 @@ void __init smp4d_smp_done(void)
         /* setup cpu list for irq rotation */
         first = 0;
         prev = &first;
-        for (i = 0; i < NR_CPUS; i++)
-                if (cpu_online(i)) {
-                        *prev = i;
-                        prev = &cpu_data(i).next;
-                }
+        for_each_online_cpu(i) {
+                *prev = i;
+                prev = &cpu_data(i).next;
+        }
         *prev = first;
         local_flush_cache_all();
 
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 8040376c4890..960b113d0006 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -113,7 +113,7 @@ void __cpuinit smp4m_callin(void)
 
         local_irq_enable();
 
-        cpu_set(cpuid, cpu_online_map);
+        set_cpu_online(cpuid, true);
 }
 
 /*
@@ -186,11 +186,9 @@ void __init smp4m_smp_done(void)
         /* setup cpu list for irq rotation */
         first = 0;
         prev = &first;
-        for (i = 0; i < NR_CPUS; i++) {
-                if (cpu_online(i)) {
-                        *prev = i;
-                        prev = &cpu_data(i).next;
-                }
+        for_each_online_cpu(i) {
+                *prev = i;
+                prev = &cpu_data(i).next;
         }
         *prev = first;
         local_flush_cache_all();