diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-08-07 13:50:22 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-08-08 20:49:45 +0200 |
| commit | 300d3739e873d50d4c6e3656f89007a217fb1d29 (patch) | |
| tree | 05ed9e06da5920926e0048ee0591a724ee487968 /kernel/power/suspend.c | |
| parent | 77254950bb174d637cd88d1a74e137ecf3185a65 (diff) | |
| download | linux-300d3739e873d50d4c6e3656f89007a217fb1d29.tar.gz linux-300d3739e873d50d4c6e3656f89007a217fb1d29.tar.bz2 linux-300d3739e873d50d4c6e3656f89007a217fb1d29.zip | |
Revert "NMI watchdog: fix for lockup detector breakage on resume"
Revert commit 45226e9 (NMI watchdog: fix for lockup detector breakage
on resume) which breaks resume from system suspend on my SH7372
Mackerel board (by causing a NULL pointer dereference to happen) and
is generally wrong, because it abuses the CPU hotplug functionality
in a shamelessly blatant way.
The original issue should be addressed through appropriate syscore
resume callback instead.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power/suspend.c')
| -rw-r--r-- | kernel/power/suspend.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 1da39ea248fd..c8b7446b27df 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -178,9 +178,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) arch_suspend_enable_irqs(); BUG_ON(irqs_disabled()); - /* Kick the lockup detector */ - lockup_detector_bootcpu_resume(); - Enable_cpus: enable_nonboot_cpus(); |