]> git.baikalelectronics.ru Git - kernel.git/commit
x86: fix watchdog ops for CoreDuo
authorJan Beulich <jbeulich@novell.com>
Tue, 22 Apr 2008 15:28:41 +0000 (16:28 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 26 Apr 2008 15:35:46 +0000 (17:35 +0200)
commit9662de5fbe0c556938dbb7a1696369c543308e33
tree0d19a04db723148b9e4fddbbdf6407126f167755
parenta9027d14b348067ebac9a9fc23688cb57980f2c7
x86: fix watchdog ops for CoreDuo

There apparently was an unnoticed conflict between an earlier patch to
this file and mine (64778fff6c144d39d14c5986fb19546adbdd8990), which
I noticed only now. I suppose a change like the one below (untested) is
needed; I didn't get any response on a confirmation request for this from
the submitter of the first patch.

The issue is the writing of the 'checkbit' member at the end of
setup_intel_arch_watchdog(), which my patch made go to intel_arch_wd_ops
rather than wd_ops.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/perfctr-watchdog.c