Merge tag 'renesas-cleanup-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / kernel / watchdog.c

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 49e9537..70bf118 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -208,7 +208,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);
@@ -217,8 +217,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
@@ -425,7 +425,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);
@@ -445,7 +445,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);
@@ -585,7 +585,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;
 
        /*