Commit 0429fbc0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 6929c358 513d1a28

arch/alpha/kernel/perf_event.c

+8 −8
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static void maybe_change_configuration(struct cpu_hw_events *cpuc) 
 */

static int alpha_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 = &event->hw;

	int n0;

	int ret;
@@ -483,7 +483,7 @@ static int alpha_pmu_add(struct perf_event *event, int flags) 
 */

static void alpha_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);

	struct hw_perf_event *hwc = &event->hw;

	unsigned long irq_flags;

	int j;
@@ -531,7 +531,7 @@ static void alpha_pmu_read(struct perf_event *event) 
static void alpha_pmu_stop(struct perf_event *event, int flags)

{

	struct hw_perf_event *hwc = &event->hw;

	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);

	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);



	if (!(hwc->state & PERF_HES_STOPPED)) {

		cpuc->idx_mask &= ~(1UL<<hwc->idx);
@@ -551,7 +551,7 @@ static void alpha_pmu_stop(struct perf_event *event, int flags) 
static void alpha_pmu_start(struct perf_event *event, int flags)

{

	struct hw_perf_event *hwc = &event->hw;

	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);

	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);



	if (WARN_ON_ONCE(!(hwc->state & PERF_HES_STOPPED)))

		return;
@@ -724,7 +724,7 @@ static int alpha_pmu_event_init(struct perf_event *event) 
 */

static void alpha_pmu_enable(struct pmu *pmu)

{

	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);

	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);



	if (cpuc->enabled)

		return;
@@ -750,7 +750,7 @@ static void alpha_pmu_enable(struct pmu *pmu) 


static void alpha_pmu_disable(struct pmu *pmu)

{

	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);

	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);



	if (!cpuc->enabled)

		return;
@@ -814,8 +814,8 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr, 
	struct hw_perf_event *hwc;

	int idx, j;



	__get_cpu_var(irq_pmi_count)++;

	cpuc = &__get_cpu_var(cpu_hw_events);

	__this_cpu_inc(irq_pmi_count);

	cpuc = this_cpu_ptr(&cpu_hw_events);



	/* Completely counting through the PMC's period to trigger a new PMC

	 * overflow interrupt while in this interrupt routine is utterly

arch/alpha/kernel/time.c

+3 −3
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ unsigned long est_cycle_freq; 


DEFINE_PER_CPU(u8, irq_work_pending);



#define set_irq_work_pending_flag()  __get_cpu_var(irq_work_pending) = 1

#define test_irq_work_pending()      __get_cpu_var(irq_work_pending)

#define clear_irq_work_pending()     __get_cpu_var(irq_work_pending) = 0

#define set_irq_work_pending_flag()  __this_cpu_write(irq_work_pending, 1)

#define test_irq_work_pending()      __this_cpu_read(irq_work_pending)

#define clear_irq_work_pending()     __this_cpu_write(irq_work_pending, 0)



void arch_irq_work_raise(void)

{

arch/arm/kernel/smp_twd.c

+6 −6
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int twd_timer_ack(void) 


static void twd_timer_stop(void)

{

	struct clock_event_device *clk = __this_cpu_ptr(twd_evt);

	struct clock_event_device *clk = raw_cpu_ptr(twd_evt);



	twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);

	disable_percpu_irq(clk->irq);
@@ -108,7 +108,7 @@ static void twd_update_frequency(void *new_rate) 
{

	twd_timer_rate = *((unsigned long *) new_rate);



	clockevents_update_freq(__this_cpu_ptr(twd_evt), twd_timer_rate);

	clockevents_update_freq(raw_cpu_ptr(twd_evt), twd_timer_rate);

}



static int twd_rate_change(struct notifier_block *nb,
@@ -134,7 +134,7 @@ static struct notifier_block twd_clk_nb = { 


static int twd_clk_init(void)

{

	if (twd_evt && __this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))

	if (twd_evt && raw_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))

		return clk_notifier_register(twd_clk, &twd_clk_nb);



	return 0;
@@ -153,7 +153,7 @@ static void twd_update_frequency(void *data) 
{

	twd_timer_rate = clk_get_rate(twd_clk);



	clockevents_update_freq(__this_cpu_ptr(twd_evt), twd_timer_rate);

	clockevents_update_freq(raw_cpu_ptr(twd_evt), twd_timer_rate);

}



static int twd_cpufreq_transition(struct notifier_block *nb,
@@ -179,7 +179,7 @@ static struct notifier_block twd_cpufreq_nb = { 


static int twd_cpufreq_init(void)

{

	if (twd_evt && __this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))

	if (twd_evt && raw_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))

		return cpufreq_register_notifier(&twd_cpufreq_nb,

			CPUFREQ_TRANSITION_NOTIFIER);
@@ -269,7 +269,7 @@ static void twd_get_clock(struct device_node *np) 
 */

static void twd_timer_setup(void)

{

	struct clock_event_device *clk = __this_cpu_ptr(twd_evt);

	struct clock_event_device *clk = raw_cpu_ptr(twd_evt);

	int cpu = smp_processor_id();



	/*

arch/avr32/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs) 


static void __kprobes set_current_kprobe(struct kprobe *p)

{

	__get_cpu_var(current_kprobe) = p;

	__this_cpu_write(current_kprobe, p);

}



static int __kprobes kprobe_handler(struct pt_regs *regs)

arch/blackfin/include/asm/ipipe.h

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul) 
}



#define __ipipe_do_root_xirq(ipd, irq)					\

	((ipd)->irqs[irq].handler(irq, &__raw_get_cpu_var(__ipipe_tick_regs)))

	((ipd)->irqs[irq].handler(irq, raw_cpu_ptr(&__ipipe_tick_regs)))



#define __ipipe_run_irqtail(irq)  /* Must be a macro */			\

	do {								\

CRA Git | Maintained and supported by SUSTech CRA and CCSE