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
  ...

13 files changed, 36 insertions, 35 deletions

diff --git a/arch/tile/include/asm/irqflags.h b/arch/tile/include/asm/irqflags.h
index 71af5747874d..60d62a292fce 100644
--- a/arch/tile/include/asm/irqflags.h
+++ b/arch/tile/include/asm/irqflags.h
@@ -140,12 +140,12 @@ extern unsigned int debug_smp_processor_id(void);
 
 /*
  * Read the set of maskable interrupts.
- * We avoid the preemption warning here via __this_cpu_ptr since even
+ * We avoid the preemption warning here via raw_cpu_ptr since even
  * if irqs are already enabled, it's harmless to read the wrong cpu's
  * enabled mask.
  */
 #define arch_local_irqs_enabled() \
-        (*__this_cpu_ptr(&interrupts_enabled_mask))
+        (*raw_cpu_ptr(&interrupts_enabled_mask))
 
 /* Re-enable all maskable interrupts. */
 #define arch_local_irq_enable() \
diff --git a/arch/tile/include/asm/mmu_context.h b/arch/tile/include/asm/mmu_context.h
index 4734215e2ad4..f67753db1f78 100644
--- a/arch/tile/include/asm/mmu_context.h
+++ b/arch/tile/include/asm/mmu_context.h
@@ -84,7 +84,7 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *t)
          * clear any pending DMA interrupts.
          */
         if (current->thread.tile_dma_state.enabled)
-                install_page_table(mm->pgd, __get_cpu_var(current_asid));
+                install_page_table(mm->pgd, __this_cpu_read(current_asid));
 #endif
 }
 
@@ -96,12 +96,12 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
                 int cpu = smp_processor_id();
 
                 /* Pick new ASID. */
-                int asid = __get_cpu_var(current_asid) + 1;
+                int asid = __this_cpu_read(current_asid) + 1;
                 if (asid > max_asid) {
                         asid = min_asid;
                         local_flush_tlb();
                 }
-                __get_cpu_var(current_asid) = asid;
+                __this_cpu_write(current_asid, asid);
 
                 /* Clear cpu from the old mm, and set it in the new one. */
                 cpumask_clear_cpu(cpu, mm_cpumask(prev));
diff --git a/arch/tile/kernel/irq.c b/arch/tile/kernel/irq.c
index 637f2ffaa5f5..ba85765e1436 100644
--- a/arch/tile/kernel/irq.c
+++ b/arch/tile/kernel/irq.c
@@ -73,7 +73,7 @@ static DEFINE_PER_CPU(int, irq_depth);
  */
 void tile_dev_intr(struct pt_regs *regs, int intnum)
 {
-        int depth = __get_cpu_var(irq_depth)++;
+        int depth = __this_cpu_inc_return(irq_depth);
         unsigned long original_irqs;
         unsigned long remaining_irqs;
         struct pt_regs *old_regs;
@@ -120,7 +120,7 @@ void tile_dev_intr(struct pt_regs *regs, int intnum)
 
                 /* Count device irqs; Linux IPIs are counted elsewhere. */
                 if (irq != IRQ_RESCHEDULE)
-                        __get_cpu_var(irq_stat).irq_dev_intr_count++;
+                        __this_cpu_inc(irq_stat.irq_dev_intr_count);
 
                 generic_handle_irq(irq);
         }
@@ -130,10 +130,10 @@ void tile_dev_intr(struct pt_regs *regs, int intnum)
          * including any that were reenabled during interrupt
          * handling.
          */
-        if (depth == 0)
-                unmask_irqs(~__get_cpu_var(irq_disable_mask));
+        if (depth == 1)
+                unmask_irqs(~__this_cpu_read(irq_disable_mask));
 
-        __get_cpu_var(irq_depth)--;
+        __this_cpu_dec(irq_depth);
 
         /*
          * Track time spent against the current process again and
@@ -151,7 +151,7 @@ void tile_dev_intr(struct pt_regs *regs, int intnum)
 static void tile_irq_chip_enable(struct irq_data *d)
 {
         get_cpu_var(irq_disable_mask) &= ~(1UL << d->irq);
-        if (__get_cpu_var(irq_depth) == 0)
+        if (__this_cpu_read(irq_depth) == 0)
                 unmask_irqs(1UL << d->irq);
         put_cpu_var(irq_disable_mask);
 }
@@ -197,7 +197,7 @@ static void tile_irq_chip_ack(struct irq_data *d)
  */
 static void tile_irq_chip_eoi(struct irq_data *d)
 {
-        if (!(__get_cpu_var(irq_disable_mask) & (1UL << d->irq)))
+        if (!(__this_cpu_read(irq_disable_mask) & (1UL << d->irq)))
                 unmask_irqs(1UL << d->irq);
 }
 
diff --git a/arch/tile/kernel/messaging.c b/arch/tile/kernel/messaging.c
index 7867266f9716..ac950be1318e 100644
--- a/arch/tile/kernel/messaging.c
+++ b/arch/tile/kernel/messaging.c
@@ -28,7 +28,7 @@ static DEFINE_PER_CPU(HV_MsgState, msg_state);
 void init_messaging(void)
 {
         /* Allocate storage for messages in kernel space */
-        HV_MsgState *state = &__get_cpu_var(msg_state);
+        HV_MsgState *state = this_cpu_ptr(&msg_state);
         int rc = hv_register_message_state(state);
         if (rc != HV_OK)
                 panic("hv_register_message_state: error %d", rc);
@@ -96,7 +96,7 @@ void hv_message_intr(struct pt_regs *regs, int intnum)
                         struct hv_driver_cb *cb =
                                 (struct hv_driver_cb *)him->intarg;
                         cb->callback(cb, him->intdata);
-                        __get_cpu_var(irq_stat).irq_hv_msg_count++;
+                        __this_cpu_inc(irq_stat.irq_hv_msg_count);
                 }
         }
 
diff --git a/arch/tile/kernel/perf_event.c b/arch/tile/kernel/perf_event.c
index 2bf6c9c135c1..bb509cee3b59 100644
--- a/arch/tile/kernel/perf_event.c
+++ b/arch/tile/kernel/perf_event.c
@@ -590,7 +590,7 @@ static int tile_event_set_period(struct perf_event *event)
  */
 static void tile_pmu_stop(struct perf_event *event, int flags)
 {
-        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
         struct hw_perf_event *hwc = &event->hw;
         int idx = hwc->idx;
 
@@ -616,7 +616,7 @@ static void tile_pmu_stop(struct perf_event *event, int flags)
  */
 static void tile_pmu_start(struct perf_event *event, int flags)
 {
-        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
         int idx = event->hw.idx;
 
         if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED)))
@@ -650,7 +650,7 @@ static void tile_pmu_start(struct perf_event *event, int flags)
  */
 static int tile_pmu_add(struct perf_event *event, int flags)
 {
-        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
         struct hw_perf_event *hwc;
         unsigned long mask;
         int b, max_cnt;
@@ -706,7 +706,7 @@ static int tile_pmu_add(struct perf_event *event, int flags)
  */
 static void tile_pmu_del(struct perf_event *event, int flags)
 {
-        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
         int i;
 
         /*
@@ -880,14 +880,14 @@ static struct pmu tilera_pmu = {
 int tile_pmu_handle_irq(struct pt_regs *regs, int fault)
 {
         struct perf_sample_data data;
-        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
         struct perf_event *event;
         struct hw_perf_event *hwc;
         u64 val;
         unsigned long status;
         int bit;
 
-        __get_cpu_var(perf_irqs)++;
+        __this_cpu_inc(perf_irqs);
 
         if (!atomic_read(&tile_active_events))
                 return 0;
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index 16ed58948757..0050cbc1d9de 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -64,7 +64,7 @@ early_param("idle", idle_setup);
 
 void arch_cpu_idle(void)
 {
-        __get_cpu_var(irq_stat).idle_timestamp = jiffies;
+        __this_cpu_write(irq_stat.idle_timestamp, jiffies);
         _cpu_idle();
 }
 
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 112ababa9e55..b9736ded06f2 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -1218,7 +1218,8 @@ static void __init validate_hv(void)
          * various asid variables to their appropriate initial states.
          */
         asid_range = hv_inquire_asid(0);
-        __get_cpu_var(current_asid) = min_asid = asid_range.start;
+        min_asid = asid_range.start;
+        __this_cpu_write(current_asid, min_asid);
         max_asid = asid_range.start + asid_range.size - 1;
 
         if (hv_confstr(HV_CONFSTR_CHIP_MODEL, (HV_VirtAddr)chip_model,
diff --git a/arch/tile/kernel/single_step.c b/arch/tile/kernel/single_step.c
index de07fa7d1315..6cb2ce31b5a2 100644
--- a/arch/tile/kernel/single_step.c
+++ b/arch/tile/kernel/single_step.c
@@ -740,7 +740,7 @@ static DEFINE_PER_CPU(unsigned long, ss_saved_pc);
 
 void gx_singlestep_handle(struct pt_regs *regs, int fault_num)
 {
-        unsigned long *ss_pc = &__get_cpu_var(ss_saved_pc);
+        unsigned long *ss_pc = this_cpu_ptr(&ss_saved_pc);
         struct thread_info *info = (void *)current_thread_info();
         int is_single_step = test_ti_thread_flag(info, TIF_SINGLESTEP);
         unsigned long control = __insn_mfspr(SPR_SINGLE_STEP_CONTROL_K);
@@ -766,7 +766,7 @@ void gx_singlestep_handle(struct pt_regs *regs, int fault_num)
 
 void single_step_once(struct pt_regs *regs)
 {
-        unsigned long *ss_pc = &__get_cpu_var(ss_saved_pc);
+        unsigned long *ss_pc = this_cpu_ptr(&ss_saved_pc);
         unsigned long control = __insn_mfspr(SPR_SINGLE_STEP_CONTROL_K);
 
         *ss_pc = regs->pc;
diff --git a/arch/tile/kernel/smp.c b/arch/tile/kernel/smp.c
index 19eaa62d456a..d3c4ed780ce2 100644
--- a/arch/tile/kernel/smp.c
+++ b/arch/tile/kernel/smp.c
@@ -189,7 +189,7 @@ EXPORT_SYMBOL(flush_icache_range);
 /* Called when smp_send_reschedule() triggers IRQ_RESCHEDULE. */
 static irqreturn_t handle_reschedule_ipi(int irq, void *token)
 {
-        __get_cpu_var(irq_stat).irq_resched_count++;
+        __this_cpu_inc(irq_stat.irq_resched_count);
         scheduler_ipi();
 
         return IRQ_HANDLED;
diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c
index 732e9d138661..0d59a1b60c74 100644
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
@@ -41,7 +41,7 @@ void __init smp_prepare_boot_cpu(void)
         int cpu = smp_processor_id();
         set_cpu_online(cpu, 1);
         set_cpu_present(cpu, 1);
-        __get_cpu_var(cpu_state) = CPU_ONLINE;
+        __this_cpu_write(cpu_state, CPU_ONLINE);
 
         init_messaging();
 }
@@ -158,7 +158,7 @@ static void start_secondary(void)
         /* printk(KERN_DEBUG "Initializing CPU#%d\n", cpuid); */
 
         /* Initialize the current asid for our first page table. */
-        __get_cpu_var(current_asid) = min_asid;
+        __this_cpu_write(current_asid, min_asid);
 
         /* Set up this thread as another owner of the init_mm */
         atomic_inc(&init_mm.mm_count);
@@ -201,7 +201,7 @@ void online_secondary(void)
         notify_cpu_starting(smp_processor_id());
 
         set_cpu_online(smp_processor_id(), 1);
-        __get_cpu_var(cpu_state) = CPU_ONLINE;
+        __this_cpu_write(cpu_state, CPU_ONLINE);
 
         /* Set up tile-specific state for this cpu. */
         setup_cpu(0);
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index c1b362277fb7..b854a1cd0079 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -162,7 +162,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = {
 
 void setup_tile_timer(void)
 {
-        struct clock_event_device *evt = &__get_cpu_var(tile_timer);
+        struct clock_event_device *evt = this_cpu_ptr(&tile_timer);
 
         /* Fill in fields that are speed-specific. */
         clockevents_calc_mult_shift(evt, cycles_per_sec, TILE_MINSEC);
@@ -182,7 +182,7 @@ void setup_tile_timer(void)
 void do_timer_interrupt(struct pt_regs *regs, int fault_num)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
-        struct clock_event_device *evt = &__get_cpu_var(tile_timer);
+        struct clock_event_device *evt = this_cpu_ptr(&tile_timer);
 
         /*
          * Mask the timer interrupt here, since we are a oneshot timer
@@ -194,7 +194,7 @@ void do_timer_interrupt(struct pt_regs *regs, int fault_num)
         irq_enter();
 
         /* Track interrupt count. */
-        __get_cpu_var(irq_stat).irq_timer_count++;
+        __this_cpu_inc(irq_stat.irq_timer_count);
 
         /* Call the generic timer handler */
         evt->event_handler(evt);
@@ -235,7 +235,7 @@ cycles_t ns2cycles(unsigned long nsecs)
          * We do not have to disable preemption here as each core has the same
          * clock frequency.
          */
-        struct clock_event_device *dev = &__raw_get_cpu_var(tile_timer);
+        struct clock_event_device *dev = raw_cpu_ptr(&tile_timer);
 
         /*
          * as in clocksource.h and x86's timer.h, we split the calculation
diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c
index 0dc218294770..6aa2f2625447 100644
--- a/arch/tile/mm/highmem.c
+++ b/arch/tile/mm/highmem.c
@@ -103,7 +103,7 @@ static void kmap_atomic_register(struct page *page, int type,
         spin_lock(&amp_lock);
 
         /* With interrupts disabled, now fill in the per-cpu info. */
-        amp = &__get_cpu_var(amps).per_type[type];
+        amp = this_cpu_ptr(&amps.per_type[type]);
         amp->page = page;
         amp->cpu = smp_processor_id();
         amp->va = va;
diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c
index a092e393bd20..caa270165f86 100644
--- a/arch/tile/mm/init.c
+++ b/arch/tile/mm/init.c
@@ -593,14 +593,14 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
         interrupt_mask_set_mask(-1ULL);
         rc = flush_and_install_context(__pa(pgtables),
                                        init_pgprot((unsigned long)pgtables),
-                                       __get_cpu_var(current_asid),
+                                       __this_cpu_read(current_asid),
                                        cpumask_bits(my_cpu_mask));
         interrupt_mask_restore_mask(irqmask);
         BUG_ON(rc != 0);
 
         /* Copy the page table back to the normal swapper_pg_dir. */
         memcpy(pgd_base, pgtables, sizeof(pgtables));
-        __install_page_table(pgd_base, __get_cpu_var(current_asid),
+        __install_page_table(pgd_base, __this_cpu_read(current_asid),
                              swapper_pgprot);
 
         /*