Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

Pull percpu consistent-ops changes from Tejun Heo:
 "Way back, before the current percpu allocator was implemented, static
  and dynamic percpu memory areas were allocated and handled separately
  and had their own accessors.  The distinction has been gone for many
  years now; however, the now duplicate two sets of accessors remained
  with the pointer based ones - this_cpu_*() - evolving various other
  operations over time.  During the process, we also accumulated other
  inconsistent operations.

  This pull request contains Christoph's patches to clean up the
  duplicate accessor situation.  __get_cpu_var() uses are replaced with
  with this_cpu_ptr() and __this_cpu_ptr() with raw_cpu_ptr().

  Unfortunately, the former sometimes is tricky thanks to C being a bit
  messy with the distinction between lvalues and pointers, which led to
  a rather ugly solution for cpumask_var_t involving the introduction of
  this_cpu_cpumask_var_ptr().

  This converts most of the uses but not all.  Christoph will follow up
  with the remaining conversions in this merge window and hopefully
  remove the obsolete accessors"

* 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (38 commits)
  irqchip: Properly fetch the per cpu offset
  percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_t -fix
  ia64: sn_nodepda cannot be assigned to after this_cpu conversion. Use __this_cpu_write.
  percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_t
  Revert "powerpc: Replace __get_cpu_var uses"
  percpu: Remove __this_cpu_ptr
  clocksource: Replace __this_cpu_ptr with raw_cpu_ptr
  sparc: Replace __get_cpu_var uses
  avr32: Replace __get_cpu_var with __this_cpu_write
  blackfin: Replace __get_cpu_var uses
  tile: Use this_cpu_ptr() for hardware counters
  tile: Replace __get_cpu_var uses
  powerpc: Replace __get_cpu_var uses
  alpha: Replace __get_cpu_var
  ia64: Replace __get_cpu_var uses
  s390: cio driver &__get_cpu_var replacements
  s390: Replace __get_cpu_var uses
  mips: Replace __get_cpu_var uses
  MIPS: Replace __get_cpu_var uses in FPU emulator.
  arm: Replace __this_cpu_ptr with raw_cpu_ptr
  ...

2 files changed, 21 insertions, 21 deletions

diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
index c89c93320c12..c6b146e67116 100644
--- a/arch/x86/platform/uv/uv_nmi.c
+++ b/arch/x86/platform/uv/uv_nmi.c
@@ -63,8 +63,8 @@
 
 static struct uv_hub_nmi_s **uv_hub_nmi_list;
 
-DEFINE_PER_CPU(struct uv_cpu_nmi_s, __uv_cpu_nmi);
-EXPORT_PER_CPU_SYMBOL_GPL(__uv_cpu_nmi);
+DEFINE_PER_CPU(struct uv_cpu_nmi_s, uv_cpu_nmi);
+EXPORT_PER_CPU_SYMBOL_GPL(uv_cpu_nmi);
 
 static unsigned long nmi_mmr;
 static unsigned long nmi_mmr_clear;
@@ -215,7 +215,7 @@ static int uv_check_nmi(struct uv_hub_nmi_s *hub_nmi)
         int nmi = 0;
 
         local64_inc(&uv_nmi_count);
-        uv_cpu_nmi.queries++;
+        this_cpu_inc(uv_cpu_nmi.queries);
 
         do {
                 nmi = atomic_read(&hub_nmi->in_nmi);
@@ -293,7 +293,7 @@ static void uv_nmi_nr_cpus_ping(void)
         int cpu;
 
         for_each_cpu(cpu, uv_nmi_cpu_mask)
-                atomic_set(&uv_cpu_nmi_per(cpu).pinging, 1);
+                uv_cpu_nmi_per(cpu).pinging = 1;
 
         apic->send_IPI_mask(uv_nmi_cpu_mask, APIC_DM_NMI);
 }
@@ -304,8 +304,8 @@ static void uv_nmi_cleanup_mask(void)
         int cpu;
 
         for_each_cpu(cpu, uv_nmi_cpu_mask) {
-                atomic_set(&uv_cpu_nmi_per(cpu).pinging, 0);
-                atomic_set(&uv_cpu_nmi_per(cpu).state, UV_NMI_STATE_OUT);
+                uv_cpu_nmi_per(cpu).pinging =  0;
+                uv_cpu_nmi_per(cpu).state = UV_NMI_STATE_OUT;
                 cpumask_clear_cpu(cpu, uv_nmi_cpu_mask);
         }
 }
@@ -328,7 +328,7 @@ static int uv_nmi_wait_cpus(int first)
                 int loop_delay = uv_nmi_loop_delay;
 
                 for_each_cpu(j, uv_nmi_cpu_mask) {
-                        if (atomic_read(&uv_cpu_nmi_per(j).state)) {
+                        if (uv_cpu_nmi_per(j).state) {
                                 cpumask_clear_cpu(j, uv_nmi_cpu_mask);
                                 if (++k >= n)
                                         break;
@@ -359,7 +359,7 @@ static int uv_nmi_wait_cpus(int first)
 static void uv_nmi_wait(int master)
 {
         /* indicate this cpu is in */
-        atomic_set(&uv_cpu_nmi.state, UV_NMI_STATE_IN);
+        this_cpu_write(uv_cpu_nmi.state, UV_NMI_STATE_IN);
 
         /* if not the first cpu in (the master), then we are a slave cpu */
         if (!master)
@@ -419,7 +419,7 @@ static void uv_nmi_dump_state_cpu(int cpu, struct pt_regs *regs)
                         "UV:%sNMI process trace for CPU %d\n", dots, cpu);
                 show_regs(regs);
         }
-        atomic_set(&uv_cpu_nmi.state, UV_NMI_STATE_DUMP_DONE);
+        this_cpu_write(uv_cpu_nmi.state, UV_NMI_STATE_DUMP_DONE);
 }
 
 /* Trigger a slave cpu to dump it's state */
@@ -427,20 +427,20 @@ static void uv_nmi_trigger_dump(int cpu)
 {
         int retry = uv_nmi_trigger_delay;
 
-        if (atomic_read(&uv_cpu_nmi_per(cpu).state) != UV_NMI_STATE_IN)
+        if (uv_cpu_nmi_per(cpu).state != UV_NMI_STATE_IN)
                 return;
 
-        atomic_set(&uv_cpu_nmi_per(cpu).state, UV_NMI_STATE_DUMP);
+        uv_cpu_nmi_per(cpu).state = UV_NMI_STATE_DUMP;
         do {
                 cpu_relax();
                 udelay(10);
-                if (atomic_read(&uv_cpu_nmi_per(cpu).state)
+                if (uv_cpu_nmi_per(cpu).state
                                 != UV_NMI_STATE_DUMP)
                         return;
         } while (--retry > 0);
 
         pr_crit("UV: CPU %d stuck in process dump function\n", cpu);
-        atomic_set(&uv_cpu_nmi_per(cpu).state, UV_NMI_STATE_DUMP_DONE);
+        uv_cpu_nmi_per(cpu).state = UV_NMI_STATE_DUMP_DONE;
 }
 
 /* Wait until all cpus ready to exit */
@@ -488,7 +488,7 @@ static void uv_nmi_dump_state(int cpu, struct pt_regs *regs, int master)
         } else {
                 while (!atomic_read(&uv_nmi_slave_continue))
                         cpu_relax();
-                while (atomic_read(&uv_cpu_nmi.state) != UV_NMI_STATE_DUMP)
+                while (this_cpu_read(uv_cpu_nmi.state) != UV_NMI_STATE_DUMP)
                         cpu_relax();
                 uv_nmi_dump_state_cpu(cpu, regs);
         }
@@ -615,7 +615,7 @@ int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)
         local_irq_save(flags);
 
         /* If not a UV System NMI, ignore */
-        if (!atomic_read(&uv_cpu_nmi.pinging) && !uv_check_nmi(hub_nmi)) {
+        if (!this_cpu_read(uv_cpu_nmi.pinging) && !uv_check_nmi(hub_nmi)) {
                 local_irq_restore(flags);
                 return NMI_DONE;
         }
@@ -639,7 +639,7 @@ int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)
                 uv_call_kgdb_kdb(cpu, regs, master);
 
         /* Clear per_cpu "in nmi" flag */
-        atomic_set(&uv_cpu_nmi.state, UV_NMI_STATE_OUT);
+        this_cpu_write(uv_cpu_nmi.state, UV_NMI_STATE_OUT);
 
         /* Clear MMR NMI flag on each hub */
         uv_clear_nmi(cpu);
@@ -666,16 +666,16 @@ static int uv_handle_nmi_ping(unsigned int reason, struct pt_regs *regs)
 {
         int ret;
 
-        uv_cpu_nmi.queries++;
-        if (!atomic_read(&uv_cpu_nmi.pinging)) {
+        this_cpu_inc(uv_cpu_nmi.queries);
+        if (!this_cpu_read(uv_cpu_nmi.pinging)) {
                 local64_inc(&uv_nmi_ping_misses);
                 return NMI_DONE;
         }
 
-        uv_cpu_nmi.pings++;
+        this_cpu_inc(uv_cpu_nmi.pings);
         local64_inc(&uv_nmi_ping_count);
         ret = uv_handle_nmi(reason, regs);
-        atomic_set(&uv_cpu_nmi.pinging, 0);
+        this_cpu_write(uv_cpu_nmi.pinging, 0);
         return ret;
 }
 
diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
index 5c86786bbfd2..a244237f3cfa 100644
--- a/arch/x86/platform/uv/uv_time.c
+++ b/arch/x86/platform/uv/uv_time.c
@@ -365,7 +365,7 @@ __setup("uvrtcevt", uv_enable_evt_rtc);
 
 static __init void uv_rtc_register_clockevents(struct work_struct *dummy)
 {
-        struct clock_event_device *ced = &__get_cpu_var(cpu_ced);
+        struct clock_event_device *ced = this_cpu_ptr(&cpu_ced);
 
         *ced = clock_event_device_uv;
         ced->cpumask = cpumask_of(smp_processor_id());