Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e9101ae authored by Ingo Molnar's avatar Ingo Molnar
Browse files

watchdog: Fix non-standard prototype of get_softlockup_thresh() 



This build warning slipped through:

  kernel/watchdog.c:102: warning: function declaration isn't a prototype

As reported by Stephen Rothwell.

Also address an unused variable warning that GCC 4.6.0 reports:
we cannot do anything about failed watchdog ops during CPU hotplug
(it's not serious enough to return an error from the notifier),
so ignore them.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Mandeep Singh Baines <msb@chromium.org>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20110524134129.8da27016.sfr@canb.auug.org.au


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
LKML-Reference: <20110517071642.GF22305@elte.hu>
parent 0f61f3e4

kernel/watchdog.c

+4 −7
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ __setup("nosoftlockup", nosoftlockup_setup); 
 * the thresholds with a factor: we make the soft threshold twice the amount of

 * time the hard threshold is.

 */

static int get_softlockup_thresh()

static int get_softlockup_thresh(void)

{

	return watchdog_thresh * 2;

}
@@ -415,15 +415,13 @@ static void watchdog_nmi_disable(int cpu) { return; } 
#endif /* CONFIG_HARDLOCKUP_DETECTOR */



/* prepare/enable/disable routines */

static int watchdog_prepare_cpu(int cpu)

static void watchdog_prepare_cpu(int cpu)

{

	struct hrtimer *hrtimer = &per_cpu(watchdog_hrtimer, cpu);



	WARN_ON(per_cpu(softlockup_watchdog, cpu));

	hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

	hrtimer->function = watchdog_timer_fn;



	return 0;

}



static int watchdog_enable(int cpu)
@@ -542,17 +540,16 @@ static int __cpuinit 
cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)

{

	int hotcpu = (unsigned long)hcpu;

	int err = 0;



	switch (action) {

	case CPU_UP_PREPARE:

	case CPU_UP_PREPARE_FROZEN:

		err = watchdog_prepare_cpu(hotcpu);

		watchdog_prepare_cpu(hotcpu);

		break;

	case CPU_ONLINE:

	case CPU_ONLINE_FROZEN:

		if (watchdog_enabled)

			err = watchdog_enable(hotcpu);

			watchdog_enable(hotcpu);

		break;

#ifdef CONFIG_HOTPLUG_CPU

	case CPU_UP_CANCELED: