Bjørn Mork 3935e89505 watchdog: Fix disable/enable regression ... Commit 8d4516904b ("watchdog: Fix CPU hotplug regression") causes an oops or hard lockup when doing echo 0 > /proc/sys/kernel/nmi_watchdog echo 1 > /proc/sys/kernel/nmi_watchdog and the kernel is booted with nmi_watchdog=1 (default) Running laptop-mode-tools and disconnecting/connecting AC power will cause this to trigger, making it a common failure scenario on laptops. Instead of bailing out of watchdog_disable() when !watchdog_enabled we can initialize the hrtimer regardless of watchdog_enabled status. This makes it safe to call watchdog_disable() in the nmi_watchdog=0 case, without the negative effect on the enabled => disabled => enabled case. All these tests pass with this patch: - nmi_watchdog=1 echo 0 > /proc/sys/kernel/nmi_watchdog echo 1 > /proc/sys/kernel/nmi_watchdog - nmi_watchdog=0 echo 0 > /sys/devices/system/cpu/cpu1/online - nmi_watchdog=0 echo mem > /sys/power/state Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=51661 Cc: <stable@vger.kernel.org> # v3.7 Cc: Norbert Warmuth <nwarmuth@t-online.de> Cc: Joseph Salisbury <joseph.salisbury@canonical.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2012-12-19 12:10:33 -08:00
..
debug
events	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-12-17 15:44:47 -08:00
gcov
irq	irq: tsk->comm is an array	2012-12-18 15:02:11 -08:00
power
sched	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-12-17 15:44:47 -08:00
time
trace	Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace	2012-12-18 12:28:39 -08:00
.gitignore
acct.c
async.c
audit.c
audit.h
audit_tree.c
audit_watch.c
auditfilter.c
auditsc.c
backtracetest.c
bounds.c
capability.c
cgroup.c	Merge branch 'akpm' (Andrew's patch-bomb)	2012-12-17 20:58:12 -08:00
cgroup_freezer.c
compat.c	compat: generic compat_sys_sched_rr_get_interval() implementation	2012-12-17 17:15:18 -08:00
configs.c
context_tracking.c
cpu.c
cpu_pm.c
cpuset.c
crash_dump.c
cred.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-12-18 10:55:28 -08:00
delayacct.c
dma.c
elfcore.c
exec_domain.c
exit.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-12-17 15:44:47 -08:00
extable.c
fork.c	fork: protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs	2012-12-18 15:02:13 -08:00
freezer.c
futex.c
futex_compat.c
groups.c
hrtimer.c
hung_task.c
irq_work.c
itimer.c
jump_label.c
kallsyms.c
kcmp.c
Kconfig.freezer
Kconfig.hz
Kconfig.locks
Kconfig.preempt
kexec.c
kfifo.c
kmod.c
kprobes.c
ksysfs.c
kthread.c
latencytop.c
lglock.c
lockdep.c
lockdep_internals.h
lockdep_proc.c
lockdep_states.h
Makefile	Nothing all that exciting; a new module-from-fd syscall for those who want	2012-12-19 07:55:08 -08:00
modsign_certificate.S	MODSIGN: Avoid using .incbin in C source	2012-12-14 13:06:44 +10:30
modsign_pubkey.c	MODSIGN: Avoid using .incbin in C source	2012-12-14 13:06:44 +10:30
module-internal.h
module.c	Nothing all that exciting; a new module-from-fd syscall for those who want	2012-12-19 07:55:08 -08:00
module_signing.c
mutex-debug.c
mutex-debug.h
mutex.c
mutex.h
notifier.c
nsproxy.c
padata.c
panic.c
params.c
pid.c	Merge branch 'akpm' (Andrew's patch-bomb)	2012-12-17 20:58:12 -08:00
pid_namespace.c	userns: Require CAP_SYS_ADMIN for most uses of setns.	2012-12-14 16:12:03 -08:00
posix-cpu-timers.c
posix-timers.c
printk.c	printk: boot_delay should only affect output	2012-12-17 17:15:13 -08:00
profile.c
ptrace.c	Merge branch 'akpm' (Andrew's patch-bomb)	2012-12-17 20:58:12 -08:00
range.c
rcu.h
rcupdate.c
rcutiny.c
rcutiny_plugin.h
rcutorture.c
rcutree.c
rcutree.h
rcutree_plugin.h
rcutree_trace.c
relay.c
res_counter.c	res_counter: return amount of charges after res_counter_uncharge()	2012-12-18 15:02:12 -08:00
resource.c
rtmutex-debug.c
rtmutex-debug.h
rtmutex-tester.c
rtmutex.c
rtmutex.h
rtmutex_common.h
rwsem.c
seccomp.c
semaphore.c
signal.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-12-17 15:44:47 -08:00
smp.c
smpboot.c
smpboot.h
softirq.c
spinlock.c
srcu.c
stacktrace.c
stop_machine.c
sys.c
sys_ni.c	module: add syscall to load module from fd	2012-12-14 13:05:22 +10:30
sysctl.c	Automatic NUMA Balancing V11	2012-12-16 15:18:08 -08:00
sysctl_binary.c
task_work.c
taskstats.c
test_kprobes.c
time.c
timeconst.pl
timer.c
tracepoint.c
tsacct.c
uid16.c
up.c
user-return-notifier.c
user.c
user_namespace.c	userns: Fix typo in description of the limitation of userns_install	2012-12-14 18:36:36 -08:00
utsname.c	userns: Require CAP_SYS_ADMIN for most uses of setns.	2012-12-14 16:12:03 -08:00
utsname_sysctl.c
wait.c
watchdog.c	watchdog: Fix disable/enable regression	2012-12-19 12:10:33 -08:00
workqueue.c
workqueue_sched.h