diff --git a/[refs] b/[refs] index ab2bd2500b45..84e3d9b66af9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f445027e4e692bd885118460b292d08027fd5501 +refs/heads/master: 4ff819515b203f937cc6c8a0215a37a68d1ee71f diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c index d680381b0e9c..1d7bca7f4f52 100644 --- a/trunk/kernel/watchdog.c +++ b/trunk/kernel/watchdog.c @@ -481,6 +481,8 @@ static void watchdog_disable(int cpu) } } +/* sysctl functions */ +#ifdef CONFIG_SYSCTL static void watchdog_enable_all_cpus(void) { int cpu; @@ -510,8 +512,6 @@ static void watchdog_disable_all_cpus(void) } -/* sysctl functions */ -#ifdef CONFIG_SYSCTL /* * proc handler for /proc/sys/kernel/nmi_watchdog,watchdog_thresh */