9 files changed, 20 insertions, 24 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index dcb38f8ddfda..a765b823aa9e 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -746,7 +746,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
         struct acpi_processor *pr;
         struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
 
-        pr = __get_cpu_var(processors);
+        pr = __this_cpu_read(processors);
 
         if (unlikely(!pr))
                 return 0;
@@ -787,7 +787,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         s64 idle_time_ns;
         s64 idle_time;
 
-        pr = __get_cpu_var(processors);
+        pr = __this_cpu_read(processors);
 
         if (unlikely(!pr))
                 return 0;
@@ -864,7 +864,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         s64 idle_time;
 
 
-        pr = __get_cpu_var(processors);
+        pr = __this_cpu_read(processors);
 
         if (unlikely(!pr))
                 return 0;
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 5a1aa64f4e76..72a4fcb17745 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -626,7 +626,7 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
         preempt_disable();
         /* if over the trickle threshold, use only 1 in 4096 samples */
         if (input_pool.entropy_count > trickle_thresh &&
-            (__get_cpu_var(trickle_count)++ & 0xfff))
+            ((__this_cpu_inc_return(trickle_count) - 1) & 0xfff))
                 goto out;
 
         sample.jiffies = jiffies;
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index a7f046b0096c..2b46a7efa0ac 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -43,9 +43,10 @@ static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
 
 static inline void get_seq(__u32 *ts, int *cpu)
 {
-        *ts = get_cpu_var(proc_event_counts)++;
+        preempt_disable();
+        *ts = __this_cpu_inc_return(proc_event_counts) -1;
         *cpu = smp_processor_id();
-        put_cpu_var(proc_event_counts);
+        preempt_enable();
 }
 
 void proc_fork_connector(struct task_struct *task)
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 08d5f05378d9..386888f10df0 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -49,7 +49,7 @@ static int __cpuidle_register_device(struct cpuidle_device *dev);
  */
 static void cpuidle_idle_call(void)
 {
-        struct cpuidle_device *dev = __get_cpu_var(cpuidle_devices);
+        struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
         struct cpuidle_state *target_state;
         int next_state;
 
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index dbf741c95835..23cf8fc933ec 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -121,7 +121,7 @@ static int gameport_measure_speed(struct gameport *gameport)
         }
 
         gameport_close(gameport);
-        return (cpu_data(raw_smp_processor_id()).loops_per_jiffy *
+        return (this_cpu_read(cpu_info.loops_per_jiffy) *
                 (unsigned long)HZ / (1000 / 50)) / (tx < 1 ? 1 : tx);
 
 #else
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index f4e6cf3aceb8..430f875006f2 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -619,7 +619,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
         s390_idle_check(regs, S390_lowcore.int_clock,
                         S390_lowcore.async_enter_timer);
         irq_enter();
-        __get_cpu_var(s390_idle).nohz_delay = 1;
+        __this_cpu_write(s390_idle.nohz_delay, 1);
         if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator)
                 /* Serve timer interrupts first. */
                 clock_comparator_work();
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/lirc/lirc_serial.c
index 971844bbee28..9bcf149c4260 100644
--- a/drivers/staging/lirc/lirc_serial.c
+++ b/drivers/staging/lirc/lirc_serial.c
@@ -377,7 +377,7 @@ static int init_timing_params(unsigned int new_duty_cycle,
         duty_cycle = new_duty_cycle;
         freq = new_freq;
 
-        loops_per_sec = current_cpu_data.loops_per_jiffy;
+        loops_per_sec = __this_cpu_read(cpu.info.loops_per_jiffy);
         loops_per_sec *= HZ;
 
         /* How many clocks in a microsecond?, avoiding long long divide */
@@ -398,7 +398,7 @@ static int init_timing_params(unsigned int new_duty_cycle,
         dprintk("in init_timing_params, freq=%d, duty_cycle=%d, "
                 "clk/jiffy=%ld, pulse=%ld, space=%ld, "
                 "conv_us_to_clocks=%ld\n",
-                freq, duty_cycle, current_cpu_data.loops_per_jiffy,
+                freq, duty_cycle, __this_cpu_read(cpu_info.loops_per_jiffy),
                 pulse_width, space_width, conv_us_to_clocks);
         return 0;
 }
diff --git a/drivers/staging/speakup/fakekey.c b/drivers/staging/speakup/fakekey.c
index 65b231178f05..1b34a8771641 100644
--- a/drivers/staging/speakup/fakekey.c
+++ b/drivers/staging/speakup/fakekey.c
@@ -78,10 +78,10 @@ void speakup_fake_down_arrow(void)
         /* don't change CPU */
         preempt_disable();
 
-        __get_cpu_var(reporting_keystroke) = true;
+        __this_cpu_write(reporting_keystroke, true);
         input_report_key(virt_keyboard, KEY_DOWN, PRESSED);
         input_report_key(virt_keyboard, KEY_DOWN, RELEASED);
-        __get_cpu_var(reporting_keystroke) = false;
+        __this_cpu_write(reporting_keystroke, false);
 
         /* reenable preemption */
         preempt_enable();
@@ -95,10 +95,5 @@ void speakup_fake_down_arrow(void)
          */
 bool speakup_fake_key_pressed(void)
 {
-        bool is_pressed;
-
-        is_pressed = get_cpu_var(reporting_keystroke);
-        put_cpu_var(reporting_keystroke);
-
-        return is_pressed;
+        return this_cpu_read(reporting_keystroke);
 }
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 31af0ac31a98..65f8637d13cf 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -355,7 +355,7 @@ static void unmask_evtchn(int port)
                 struct evtchn_unmask unmask = { .port = port };
                 (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask);
         } else {
-                struct vcpu_info *vcpu_info = __get_cpu_var(xen_vcpu);
+                struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
 
                 sync_clear_bit(port, &s->evtchn_mask[0]);
 
@@ -1101,7 +1101,7 @@ static void __xen_evtchn_do_upcall(void)
 {
         int cpu = get_cpu();
         struct shared_info *s = HYPERVISOR_shared_info;
-        struct vcpu_info *vcpu_info = __get_cpu_var(xen_vcpu);
+        struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
         unsigned count;
 
         do {
@@ -1109,7 +1109,7 @@ static void __xen_evtchn_do_upcall(void)
 
                 vcpu_info->evtchn_upcall_pending = 0;
 
-                if (__get_cpu_var(xed_nesting_count)++)
+                if (__this_cpu_inc_return(xed_nesting_count) - 1)
                         goto out;
 
 #ifndef CONFIG_X86 /* No need for a barrier -- XCHG is a barrier on x86. */
@@ -1141,8 +1141,8 @@ static void __xen_evtchn_do_upcall(void)
 
                 BUG_ON(!irqs_disabled());
 
-                count = __get_cpu_var(xed_nesting_count);
-                __get_cpu_var(xed_nesting_count) = 0;
+                count = __this_cpu_read(xed_nesting_count);
+                __this_cpu_write(xed_nesting_count, 0);
         } while (count != 1 || vcpu_info->evtchn_upcall_pending);
 
 out: