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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 25 insertions, 19 deletions

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 6b21e25f7a84..d69144a09043 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -76,6 +76,8 @@ static void edac_mc_dump_mci(struct mem_ctl_info *mci)
         debugf3("\tpvt_info = %p\n\n", mci->pvt_info);
 }
 
+#endif                          /* CONFIG_EDAC_DEBUG */
+
 /*
  * keep those in sync with the enum mem_type
  */
@@ -100,8 +102,6 @@ const char *edac_mem_types[] = {
 };
 EXPORT_SYMBOL_GPL(edac_mem_types);
 
-#endif                          /* CONFIG_EDAC_DEBUG */
-
 /* 'ptr' points to a possibly unaligned item X such that sizeof(X) is 'size'.
  * Adjust 'ptr' so that its alignment is at least as stringent as what the
  * compiler would provide for X and return the aligned result.
@@ -207,6 +207,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
         }
 
         mci->op_state = OP_ALLOC;
+        INIT_LIST_HEAD(&mci->grp_kobj_list);
 
         /*
          * Initialize the 'root' kobj for the edac_mc controller
@@ -234,18 +235,24 @@ EXPORT_SYMBOL_GPL(edac_mc_alloc);
  */
 void edac_mc_free(struct mem_ctl_info *mci)
 {
+        debugf1("%s()\n", __func__);
+
         edac_mc_unregister_sysfs_main_kobj(mci);
+
+        /* free the mci instance memory here */
+        kfree(mci);
 }
 EXPORT_SYMBOL_GPL(edac_mc_free);
 
 
-/*
+/**
  * find_mci_by_dev
  *
  *      scan list of controllers looking for the one that manages
  *      the 'dev' device
+ * @dev: pointer to a struct device related with the MCI
  */
-static struct mem_ctl_info *find_mci_by_dev(struct device *dev)
+struct mem_ctl_info *find_mci_by_dev(struct device *dev)
 {
         struct mem_ctl_info *mci;
         struct list_head *item;
@@ -261,6 +268,7 @@ static struct mem_ctl_info *find_mci_by_dev(struct device *dev)
 
         return NULL;
 }
+EXPORT_SYMBOL_GPL(find_mci_by_dev);
 
 /*
  * handler for EDAC to check if NMI type handler has asserted interrupt
@@ -439,20 +447,16 @@ fail1:
         return 1;
 }
 
-static void complete_mc_list_del(struct rcu_head *head)
-{
-        struct mem_ctl_info *mci;
-
-        mci = container_of(head, struct mem_ctl_info, rcu);
-        INIT_LIST_HEAD(&mci->link);
-}
-
 static void del_mc_from_global_list(struct mem_ctl_info *mci)
 {
         atomic_dec(&edac_handlers);
         list_del_rcu(&mci->link);
-        call_rcu(&mci->rcu, complete_mc_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(&mci->link);
 }
 
 /**
@@ -578,14 +582,16 @@ struct mem_ctl_info *edac_mc_del_mc(struct device *dev)
                 return NULL;
         }
 
-        /* marking MCI offline */
-        mci->op_state = OP_OFFLINE;
-
         del_mc_from_global_list(mci);
         mutex_unlock(&mem_ctls_mutex);
 
-        /* flush workq processes and remove sysfs */
+        /* flush workq processes */
         edac_mc_workq_teardown(mci);
+
+        /* marking MCI offline */
+        mci->op_state = OP_OFFLINE;
+
+        /* remove from sysfs */
         edac_remove_sysfs_mci_device(mci);
 
         edac_printk(KERN_INFO, EDAC_MC,
@@ -714,7 +720,7 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
                  * Some MC's can remap memory so that it is still available
                  * at a different address when PCI devices map into memory.
                  * MC's that can't do this lose the memory where PCI devices
-                 * are mapped.  This mapping is MC dependant and so we call
+                 * are mapped.  This mapping is MC dependent and so we call
                  * back into the MC driver for it to map the MC page to
                  * a physical (CPU) page which can then be mapped to a virtual
                  * page - which can then be scrubbed.