The patch titled
drivers/edac: code tidying on export-gpl
has been removed from the -mm tree. Its filename was
drivers-edac-code-tidying-on-export-gpl.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: drivers/edac: code tidying on export-gpl
From: Doug Thompson <dougthompson@xxxxxxxxxxxx>
Change EXPORT_SYMBOLs to EXPORT_SYMBOLS_GPL
Tidy changes: blank lines, inline removal, add comment
Signed-off-by: Doug Thompson <dougthompson@xxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/edac/edac_module.c | 9 +++++----
drivers/edac/edac_stub.c | 20 +++++++++++---------
2 files changed, 16 insertions(+), 13 deletions(-)
diff -puN drivers/edac/edac_module.c~drivers-edac-code-tidying-on-export-gpl drivers/edac/edac_module.c
--- a/drivers/edac/edac_module.c~drivers-edac-code-tidying-on-export-gpl
+++ a/drivers/edac/edac_module.c
@@ -1,12 +1,13 @@
/*
* edac_module.c
*
- * (C) 2007 www.douglaskthompson.com
+ * (C) 2007 www.softwarebitmaker.com
+ *
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*
- * Author: Doug Thompson <norsk5@xxxxxxxxxxxx>
+ * Author: Doug Thompson <dougthompson@xxxxxxxxxxxx>
*
*/
#include <linux/edac.h>
@@ -14,7 +15,7 @@
#include "edac_core.h"
#include "edac_module.h"
-#define EDAC_MC_VERSION "Ver: 2.0.5 " __DATE__
+#define EDAC_VERSION "Ver: 2.1.0 " __DATE__
#ifdef CONFIG_EDAC_DEBUG
/* Values of 0 to 4 will generate output */
@@ -141,7 +142,7 @@ static int __init edac_init(void)
{
int err = 0;
- edac_printk(KERN_INFO, EDAC_MC, EDAC_MC_VERSION "\n");
+ edac_printk(KERN_INFO, EDAC_MC, EDAC_VERSION "\n");
/*
* Harvest and clear any boot/initialization PCI parity errors
diff -puN drivers/edac/edac_stub.c~drivers-edac-code-tidying-on-export-gpl drivers/edac/edac_stub.c
--- a/drivers/edac/edac_stub.c~drivers-edac-code-tidying-on-export-gpl
+++ a/drivers/edac/edac_stub.c
@@ -15,30 +15,32 @@
#include <asm/edac.h>
int edac_op_state = EDAC_OPSTATE_INVAL;
-EXPORT_SYMBOL(edac_op_state);
+EXPORT_SYMBOL_GPL(edac_op_state);
atomic_t edac_handlers = ATOMIC_INIT(0);
-EXPORT_SYMBOL(edac_handlers);
+EXPORT_SYMBOL_GPL(edac_handlers);
int edac_err_assert = 0;
-EXPORT_SYMBOL(edac_err_assert);
+EXPORT_SYMBOL_GPL(edac_err_assert);
-inline int edac_handler_set(void)
+/*
+ * called to determine if there is an EDAC driver interested in
+ * knowing an event (such as NMI) occurred
+ */
+int edac_handler_set(void)
{
if (edac_op_state == EDAC_OPSTATE_POLL)
return 0;
return atomic_read(&edac_handlers);
}
-
-EXPORT_SYMBOL(edac_handler_set);
+EXPORT_SYMBOL_GPL(edac_handler_set);
/*
* handler for NMI type of interrupts to assert error
*/
-inline void edac_atomic_assert_error(void)
+void edac_atomic_assert_error(void)
{
edac_err_assert++;
}
-
-EXPORT_SYMBOL(edac_atomic_assert_error);
+EXPORT_SYMBOL_GPL(edac_atomic_assert_error);
_
Patches currently in -mm which might be from dougthompson@xxxxxxxxxxxx are
origin.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
