The patch titled
EDAC: fix module names quoted in sysfs
has been removed from the -mm tree. Its filename is
edac-bug-fix-module-names-quoted-in-sysfs.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: EDAC: fix module names quoted in sysfs
From: Doug Thompson <norsk5@xxxxxxxxxxxx>
Fix the quoted module name in the sysfs for EDAC modules and reported by several
people.
Instead of ../_edac_e752x_/ now the following will be presented, like other
modules: ../edac_e752x/
Signed-off-by: Doug Thompson <norsk5@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/edac/amd76x_edac.c | 4 ++--
drivers/edac/e752x_edac.c | 3 ++-
drivers/edac/e7xxx_edac.c | 3 ++-
drivers/edac/edac_mc.h | 4 ----
drivers/edac/i82860_edac.c | 3 ++-
drivers/edac/i82875p_edac.c | 3 ++-
drivers/edac/r82600_edac.c | 3 ++-
7 files changed, 12 insertions(+), 11 deletions(-)
diff -puN drivers/edac/amd76x_edac.c~edac-bug-fix-module-names-quoted-in-sysfs drivers/edac/amd76x_edac.c
--- a/drivers/edac/amd76x_edac.c~edac-bug-fix-module-names-quoted-in-sysfs
+++ a/drivers/edac/amd76x_edac.c
@@ -19,8 +19,8 @@
#include <linux/slab.h>
#include "edac_mc.h"
-#define AMD76X_REVISION " Ver: 2.0.0 " __DATE__
-
+#define AMD76X_REVISION " Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR "amd76x_edac"
#define amd76x_printk(level, fmt, arg...) \
edac_printk(level, "amd76x", fmt, ##arg)
diff -puN drivers/edac/e752x_edac.c~edac-bug-fix-module-names-quoted-in-sysfs drivers/edac/e752x_edac.c
--- a/drivers/edac/e752x_edac.c~edac-bug-fix-module-names-quoted-in-sysfs
+++ a/drivers/edac/e752x_edac.c
@@ -24,7 +24,8 @@
#include <linux/slab.h>
#include "edac_mc.h"
-#define E752X_REVISION " Ver: 2.0.0 " __DATE__
+#define E752X_REVISION " Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR "e752x_edac"
static int force_function_unhide;
diff -puN drivers/edac/e7xxx_edac.c~edac-bug-fix-module-names-quoted-in-sysfs drivers/edac/e7xxx_edac.c
--- a/drivers/edac/e7xxx_edac.c~edac-bug-fix-module-names-quoted-in-sysfs
+++ a/drivers/edac/e7xxx_edac.c
@@ -29,7 +29,8 @@
#include <linux/slab.h>
#include "edac_mc.h"
-#define E7XXX_REVISION " Ver: 2.0.0 " __DATE__
+#define E7XXX_REVISION " Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR "e7xxx_edac"
#define e7xxx_printk(level, fmt, arg...) \
edac_printk(level, "e7xxx", fmt, ##arg)
diff -puN drivers/edac/edac_mc.h~edac-bug-fix-module-names-quoted-in-sysfs drivers/edac/edac_mc.h
--- a/drivers/edac/edac_mc.h~edac-bug-fix-module-names-quoted-in-sysfs
+++ a/drivers/edac/edac_mc.h
@@ -78,10 +78,6 @@ extern int edac_debug_level;
#endif /* !CONFIG_EDAC_DEBUG */
-#define edac_xstr(s) edac_str(s)
-#define edac_str(s) #s
-#define EDAC_MOD_STR edac_xstr(KBUILD_BASENAME)
-
#define BIT(x) (1 << (x))
#define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \
diff -puN drivers/edac/i82860_edac.c~edac-bug-fix-module-names-quoted-in-sysfs drivers/edac/i82860_edac.c
--- a/drivers/edac/i82860_edac.c~edac-bug-fix-module-names-quoted-in-sysfs
+++ a/drivers/edac/i82860_edac.c
@@ -16,7 +16,8 @@
#include <linux/slab.h>
#include "edac_mc.h"
-#define I82860_REVISION " Ver: 2.0.0 " __DATE__
+#define I82860_REVISION " Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR "i82860_edac"
#define i82860_printk(level, fmt, arg...) \
edac_printk(level, "i82860", fmt, ##arg)
diff -puN drivers/edac/i82875p_edac.c~edac-bug-fix-module-names-quoted-in-sysfs drivers/edac/i82875p_edac.c
--- a/drivers/edac/i82875p_edac.c~edac-bug-fix-module-names-quoted-in-sysfs
+++ a/drivers/edac/i82875p_edac.c
@@ -20,7 +20,8 @@
#include <linux/slab.h>
#include "edac_mc.h"
-#define I82875P_REVISION " Ver: 2.0.0 " __DATE__
+#define I82875P_REVISION " Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR "i82875p_edac"
#define i82875p_printk(level, fmt, arg...) \
edac_printk(level, "i82875p", fmt, ##arg)
diff -puN drivers/edac/r82600_edac.c~edac-bug-fix-module-names-quoted-in-sysfs drivers/edac/r82600_edac.c
--- a/drivers/edac/r82600_edac.c~edac-bug-fix-module-names-quoted-in-sysfs
+++ a/drivers/edac/r82600_edac.c
@@ -22,7 +22,8 @@
#include <linux/slab.h>
#include "edac_mc.h"
-#define R82600_REVISION " Ver: 2.0.0 " __DATE__
+#define R82600_REVISION " Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR "r82600_edac"
#define r82600_printk(level, fmt, arg...) \
edac_printk(level, "r82600", fmt, ##arg)
_
Patches currently in -mm which might be from norsk5@xxxxxxxxxxxx are
origin.patch
fix-and-enable-edac-sysfs-operation.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
