Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / setup_64.c

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 7551e5692597c979a5c3e1fee260d8b36ba34fe8..c69671c03c3b5b7dc9b3e1f70726abba12c5c4b1 100644 (file)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -793,7 +793,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh)
  */
 static int __init disable_hardlockup_detector(void)
 {
-       watchdog_enable_hardlockup_detector(false);
+       hardlockup_detector_disable();
 
        return 0;
 }