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 /include | |
| parent | 77254950bb174d637cd88d1a74e137ecf3185a65 (diff) | |
| download | linux-stable-300d3739e873d50d4c6e3656f89007a217fb1d29.tar.gz linux-stable-300d3739e873d50d4c6e3656f89007a217fb1d29.tar.bz2 linux-stable-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 'include')
| -rw-r--r-- | include/linux/sched.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index c147e7024f11..b8c86648a2f9 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -334,14 +334,6 @@ static inline void lockup_detector_init(void) } #endif -#if defined(CONFIG_LOCKUP_DETECTOR) && defined(CONFIG_SUSPEND) -void lockup_detector_bootcpu_resume(void); -#else -static inline void lockup_detector_bootcpu_resume(void) -{ -} -#endif - #ifdef CONFIG_DETECT_HUNG_TASK extern unsigned int sysctl_hung_task_panic; extern unsigned long sysctl_hung_task_check_count; |