diff --git a/[refs] b/[refs] index 2792ccdb6020..a6aa98d265b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b4a2700f462102569b407102c60d3b9cf4432a0 +refs/heads/master: 433039e97f672b81e6c8f6daef385dcf035c6e29 diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c index bafba687a6d8..6e3c41a4024c 100644 --- a/trunk/kernel/watchdog.c +++ b/trunk/kernel/watchdog.c @@ -43,7 +43,7 @@ static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts_saved); static DEFINE_PER_CPU(struct perf_event *, watchdog_ev); #endif -static int __initdata no_watchdog; +static int no_watchdog; /* boot commands */