remove queue-3.7/edac-fix-kcalloc-argument-order.patch

diff --git a/queue-3.7/edac-fix-kcalloc-argument-order.patch b/queue-3.7/edac-fix-kcalloc-argument-order.patch
deleted file mode 100644 (file)
index 46aa7d5..0000000
--- a/queue-3.7/edac-fix-kcalloc-argument-order.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d3d09e18203dba16a9dbdb2b4cc673d90748cdd1 Mon Sep 17 00:00:00 2001
-From: Joe Perches <joe@perches.com>
-Date: Sat, 26 Jan 2013 11:24:00 -0800
-Subject: EDAC: Fix kcalloc argument order
-
-From: Joe Perches <joe@perches.com>
-
-commit d3d09e18203dba16a9dbdb2b4cc673d90748cdd1 upstream.
-
-First number, then size.
-
-Signed-off-by: Joe Perches <joe@perches.com>
-Signed-off-by: Borislav Petkov <bp@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/edac/edac_mc.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/edac/edac_mc.c
-+++ b/drivers/edac/edac_mc.c
-@@ -340,7 +340,7 @@ struct mem_ctl_info *edac_mc_alloc(unsig
-       /*
-        * Alocate and fill the csrow/channels structs
-        */
--      mci->csrows = kcalloc(sizeof(*mci->csrows), tot_csrows, GFP_KERNEL);
-+      mci->csrows = kcalloc(tot_csrows, sizeof(*mci->csrows), GFP_KERNEL);
-       if (!mci->csrows)
-               goto error;
-       for (row = 0; row < tot_csrows; row++) {
-@@ -351,7 +351,7 @@ struct mem_ctl_info *edac_mc_alloc(unsig
-               csr->csrow_idx = row;
-               csr->mci = mci;
-               csr->nr_channels = tot_channels;
--              csr->channels = kcalloc(sizeof(*csr->channels), tot_channels,
-+              csr->channels = kcalloc(tot_channels, sizeof(*csr->channels),
-                                       GFP_KERNEL);
-               if (!csr->channels)
-                       goto error;
-@@ -369,7 +369,7 @@ struct mem_ctl_info *edac_mc_alloc(unsig
-       /*
-        * Allocate and fill the dimm structs
-        */
--      mci->dimms  = kcalloc(sizeof(*mci->dimms), tot_dimms, GFP_KERNEL);
-+      mci->dimms  = kcalloc(tot_dimms, sizeof(*mci->dimms), GFP_KERNEL);
-       if (!mci->dimms)
-               goto error;
- 

diff --git a/queue-3.7/series b/queue-3.7/series
index f4bf7ea3044203d0f5576261ee471b60063d7e60..98d9f9e46066f7eb050470e3651a1e7fc78b232e 100644 (file)
--- a/queue-3.7/series
+++ b/queue-3.7/series
@@ -46,7 +46,6 @@ alsa-hda-add-a-fixup-for-packard-bell-desktop-with-alc880.patch
 alsa-hda-fix-inverted-internal-mic-on-acer-aoa150-zg5.patch
 alsa-hda-fix-non-snoop-page-handling.patch
 edac-test-correct-variable-in-store-function.patch
-edac-fix-kcalloc-argument-order.patch
 asoc-arizona-use-actual-rather-than-desired-bclk-when-calculating-lrclk.patch
 asoc-wm2200-correct-mixer-values-and-text.patch
 bluetooth-fix-incorrect-strncpy-in-hidp_setup_hid.patch