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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 8 insertions, 20 deletions

diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index d5e13c94714f..c3f67437afb6 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -346,30 +346,18 @@ fail1:
 }
 
 /*
- * complete_edac_device_list_del
- *
- *      callback function when reference count is zero
- */
-static void complete_edac_device_list_del(struct rcu_head *head)
-{
-        struct edac_device_ctl_info *edac_dev;
-
-        edac_dev = container_of(head, struct edac_device_ctl_info, rcu);
-        INIT_LIST_HEAD(&edac_dev->link);
-}
-
-/*
  * del_edac_device_from_global_list
- *
- *      remove the RCU, setup for a callback call,
- *      then wait for the callback to occur
  */
 static void del_edac_device_from_global_list(struct edac_device_ctl_info
                                                 *edac_device)
 {
         list_del_rcu(&edac_device->link);
-        call_rcu(&edac_device->rcu, complete_edac_device_list_del);
-        rcu_barrier();
+
+        /* these are for safe removal of devices from global list while
+         * NMI handlers may be traversing list
+         */
+        synchronize_rcu();
+        INIT_LIST_HEAD(&edac_device->link);
 }
 
 /*
@@ -672,7 +660,7 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
                 block->counters.ce_count++;
         }
 
-        /* Propogate the count up the 'totals' tree */
+        /* Propagate the count up the 'totals' tree */
         instance->counters.ce_count++;
         edac_dev->counters.ce_count++;
 
@@ -718,7 +706,7 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
                 block->counters.ue_count++;
         }
 
-        /* Propogate the count up the 'totals' tree */
+        /* Propagate the count up the 'totals' tree */
         instance->counters.ue_count++;
         edac_dev->counters.ue_count++;