summaryrefslogtreecommitdiffstats
path: root/drivers/edac/edac_module.c
diff options
context:
space:
mode:
authorDave Jiang <djiang@mvista.com>2007-07-19 01:49:52 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 10:04:54 -0700
commit81d87cb13e367bb804bf44889ae0de7369705d6c (patch)
tree1c135cb57d92ae3baf2b3308f01fb548ab39f644 /drivers/edac/edac_module.c
parent535c6a53035d8911f6b90455550c5fde0da7b866 (diff)
downloadlinux-81d87cb13e367bb804bf44889ae0de7369705d6c.tar.bz2
drivers/edac: mod MC to use workq instead of kthread
Move the memory controller object to work queue based implementation from the kernel thread based. Signed-off-by: Dave Jiang <djiang@mvista.com> Signed-off-by: Douglas Thompson <dougthompson@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/edac/edac_module.c')
-rw-r--r--drivers/edac/edac_module.c86
1 files changed, 11 insertions, 75 deletions
diff --git a/drivers/edac/edac_module.c b/drivers/edac/edac_module.c
index 2f84f0d035be..dc900ed75178 100644
--- a/drivers/edac/edac_module.c
+++ b/drivers/edac/edac_module.c
@@ -1,6 +1,14 @@
-
-#include <linux/freezer.h>
-#include <linux/kthread.h>
+/*
+ * edac_module.c
+ *
+ * (C) 2007 www.douglaskthompson.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@xmission.com>
+ *
+ */
#include <linux/edac.h>
#include "edac_core.h"
@@ -17,10 +25,6 @@ EXPORT_SYMBOL_GPL(edac_debug_level);
/* scope is to module level only */
struct workqueue_struct *edac_workqueue;
-/* private to this file */
-static struct task_struct *edac_thread;
-
-
/*
* sysfs object: /sys/devices/system/edac
* need to export to other files in this modules
@@ -84,63 +88,6 @@ static void edac_unregister_sysfs_edac_name(void)
edac_class_valid = 0;
}
-
-/*
- * Check MC status every edac_get_poll_msec().
- * Check PCI status every edac_get_poll_msec() as well.
- *
- * This where the work gets done for edac.
- *
- * SMP safe, doesn't use NMI, and auto-rate-limits.
- */
-static void do_edac_check(void)
-{
- debugf3("%s()\n", __func__);
-
- /* perform the poll activities */
- edac_check_mc_devices();
- edac_pci_do_parity_check();
-}
-
-/*
- * handler for EDAC to check if NMI type handler has asserted interrupt
- */
-static int edac_assert_error_check_and_clear(void)
-{
- int vreg;
-
- if(edac_op_state == EDAC_OPSTATE_POLL)
- return 1;
-
- vreg = atomic_read(&edac_err_assert);
- if(vreg) {
- atomic_set(&edac_err_assert, 0);
- return 1;
- }
-
- return 0;
-}
-
-/*
- * Action thread for EDAC to perform the POLL operations
- */
-static int edac_kernel_thread(void *arg)
-{
- int msec;
-
- while (!kthread_should_stop()) {
- if(edac_assert_error_check_and_clear())
- do_edac_check();
-
- /* goto sleep for the interval */
- msec = (HZ * edac_get_poll_msec()) / 1000;
- schedule_timeout_interruptible(msec);
- try_to_freeze();
- }
-
- return 0;
-}
-
/*
* edac_workqueue_setup
* initialize the edac work queue for polling operations
@@ -221,19 +168,9 @@ static int __init edac_init(void)
goto error_pci;
}
- /* create our kernel thread */
- edac_thread = kthread_run(edac_kernel_thread, NULL, "kedac");
-
- if (IS_ERR(edac_thread)) {
- err = PTR_ERR(edac_thread);
- goto error_work;
- }
-
return 0;
/* Error teardown stack */
-error_work:
- edac_workqueue_teardown();
error_pci:
edac_sysfs_pci_teardown();
error_mem:
@@ -251,7 +188,6 @@ error:
static void __exit edac_exit(void)
{
debugf0("%s()\n", __func__);
- kthread_stop(edac_thread);
/* tear down the various subsystems*/
edac_workqueue_teardown();