watchdog/hardlockup: move SMP barriers from common code to buddy code

[linux-2.6-block.git] / kernel / watchdog.c

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 6cc46b8e3d074ae4ce043a8d7484460acd826448..a351ab0c35ebf4bc28887010c9d53a7d22487bcb 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -109,9 +109,6 @@ EXPORT_SYMBOL(arch_touch_nmi_watchdog);
 void watchdog_hardlockup_touch_cpu(unsigned int cpu)
 {
        per_cpu(watchdog_hardlockup_touched, cpu) = true;
-
-       /* Match with smp_rmb() in watchdog_hardlockup_check() */
-       smp_wmb();
 }
 
 static bool is_hardlockup(unsigned int cpu)
@@ -141,9 +138,6 @@ static void watchdog_hardlockup_kick(void)
 
 void watchdog_hardlockup_check(unsigned int cpu, struct pt_regs *regs)
 {
-       /* Match with smp_wmb() in watchdog_hardlockup_touch_cpu() */
-       smp_rmb();
-
        if (per_cpu(watchdog_hardlockup_touched, cpu)) {
                per_cpu(watchdog_hardlockup_touched, cpu) = false;
                return;