Commit f7f66b05 authored by Christoph Lameter's avatar Christoph Lameter Committed by Tejun Heo
Browse files

watchdog: Replace __raw_get_cpu_var uses 



Most of these are the uses of &__raw_get_cpu_var for address calculation.

touch_softlockup_watchdog_sync() uses __raw_get_cpu_var to write to
per cpu variables. Use __this_cpu_write instead.

Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-watchdog@vger.kernel.org
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 70b2776a

kernel/watchdog.c

+6 −6
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ void touch_nmi_watchdog(void) 
	 * case we shouldn't have to worry about the watchdog

	 * going off.

	 */

	__raw_get_cpu_var(watchdog_nmi_touch) = true;

	raw_cpu_write(watchdog_nmi_touch, true);

	touch_softlockup_watchdog();

}

EXPORT_SYMBOL(touch_nmi_watchdog);
@@ -194,8 +194,8 @@ EXPORT_SYMBOL(touch_nmi_watchdog); 


void touch_softlockup_watchdog_sync(void)

{

	__raw_get_cpu_var(softlockup_touch_sync) = true;

	__raw_get_cpu_var(watchdog_touch_ts) = 0;

	__this_cpu_write(softlockup_touch_sync, true);

	__this_cpu_write(watchdog_touch_ts, 0);

}



#ifdef CONFIG_HARDLOCKUP_DETECTOR
@@ -387,7 +387,7 @@ static void watchdog_set_prio(unsigned int policy, unsigned int prio) 


static void watchdog_enable(unsigned int cpu)

{

	struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);

	struct hrtimer *hrtimer = raw_cpu_ptr(&watchdog_hrtimer);



	/* kick off the timer for the hardlockup detector */

	hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
@@ -407,7 +407,7 @@ static void watchdog_enable(unsigned int cpu) 


static void watchdog_disable(unsigned int cpu)

{

	struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);

	struct hrtimer *hrtimer = raw_cpu_ptr(&watchdog_hrtimer);



	watchdog_set_prio(SCHED_NORMAL, 0);

	hrtimer_cancel(hrtimer);
@@ -534,7 +534,7 @@ static struct smp_hotplug_thread watchdog_threads = { 


static void restart_watchdog_hrtimer(void *info)

{

	struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);

	struct hrtimer *hrtimer = raw_cpu_ptr(&watchdog_hrtimer);

	int ret;



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE