Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 13 insertions, 25 deletions

diff --git a/arch/blackfin/kernel/nmi.c b/arch/blackfin/kernel/nmi.c
index 0b5f72f17fd0..679d0db35256 100644
--- a/arch/blackfin/kernel/nmi.c
+++ b/arch/blackfin/kernel/nmi.c
@@ -12,7 +12,7 @@
 
 #include <linux/bitops.h>
 #include <linux/hardirq.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/pm.h>
 #include <linux/nmi.h>
 #include <linux/smp.h>
@@ -145,16 +145,16 @@ int check_nmi_wdt_touched(void)
 {
         unsigned int this_cpu = smp_processor_id();
         unsigned int cpu;
+        cpumask_t mask;
 
-        cpumask_t mask = cpu_online_map;
-
+        cpumask_copy(&mask, cpu_online_mask);
         if (!atomic_read(&nmi_touched[this_cpu]))
                 return 0;
 
         atomic_set(&nmi_touched[this_cpu], 0);
 
-        cpu_clear(this_cpu, mask);
-        for_each_cpu_mask(cpu, mask) {
+        cpumask_clear_cpu(this_cpu, &mask);
+        for_each_cpu(cpu, &mask) {
                 invalidate_dcache_range((unsigned long)(&nmi_touched[cpu]),
                                 (unsigned long)(&nmi_touched[cpu]));
                 if (!atomic_read(&nmi_touched[cpu]))
@@ -196,43 +196,31 @@ void touch_nmi_watchdog(void)
 
 /* Suspend/resume support */
 #ifdef CONFIG_PM
-static int nmi_wdt_suspend(struct sys_device *dev, pm_message_t state)
+static int nmi_wdt_suspend(void)
 {
         nmi_wdt_stop();
         return 0;
 }
 
-static int nmi_wdt_resume(struct sys_device *dev)
+static void nmi_wdt_resume(void)
 {
         if (nmi_active)
                 nmi_wdt_start();
-        return 0;
 }
 
-static struct sysdev_class nmi_sysclass = {
-        .name           = DRV_NAME,
+static struct syscore_ops nmi_syscore_ops = {
         .resume         = nmi_wdt_resume,
         .suspend        = nmi_wdt_suspend,
 };
 
-static struct sys_device device_nmi_wdt = {
-        .id     = 0,
-        .cls    = &nmi_sysclass,
-};
-
-static int __init init_nmi_wdt_sysfs(void)
+static int __init init_nmi_wdt_syscore(void)
 {
-        int error;
-
-        if (!nmi_active)
-                return 0;
+        if (nmi_active)
+                register_syscore_ops(&nmi_syscore_ops);
 
-        error = sysdev_class_register(&nmi_sysclass);
-        if (!error)
-                error = sysdev_register(&device_nmi_wdt);
-        return error;
+        return 0;
 }
-late_initcall(init_nmi_wdt_sysfs);
+late_initcall(init_nmi_wdt_syscore);
 
 #endif  /* CONFIG_PM */