Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd83e65b authored by Christoph Lameter's avatar Christoph Lameter Committed by Tejun Heo
Browse files

metag: Replace __get_cpu_var uses for address calculation 



Replace __get_cpu_var uses for address calculation with this_cpu_ptr().

Acked-by: default avatarJames Hogan <james.hogan@imgtec.com>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 1f125e76

arch/metag/kernel/perf/perf_event.c

+7 −7
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int metag_pmu_event_set_period(struct perf_event *event, 


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

	struct hw_perf_event *hwc = &event->hw;

	int idx = hwc->idx;
@@ -306,7 +306,7 @@ static void metag_pmu_stop(struct perf_event *event, int flags) 


static int metag_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 idx = 0, ret = 0;
@@ -348,7 +348,7 @@ static int metag_pmu_add(struct perf_event *event, int flags) 


static void metag_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;

	int idx = hwc->idx;
@@ -597,7 +597,7 @@ static int _hw_perf_event_init(struct perf_event *event) 


static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx)

{

	struct cpu_hw_events *events = &__get_cpu_var(cpu_hw_events);

	struct cpu_hw_events *events = this_cpu_ptr(&cpu_hw_events);

	unsigned int config = event->config;

	unsigned int tmp = config & 0xf0;

	unsigned long flags;
@@ -670,7 +670,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx) 


static void metag_pmu_disable_counter(struct hw_perf_event *event, int idx)

{

	struct cpu_hw_events *events = &__get_cpu_var(cpu_hw_events);

	struct cpu_hw_events *events = this_cpu_ptr(&cpu_hw_events);

	unsigned int tmp = 0;

	unsigned long flags;
@@ -718,7 +718,7 @@ static u64 metag_pmu_read_counter(int idx) 


static void metag_pmu_write_counter(int idx, u32 val)

{

	struct cpu_hw_events *events = &__get_cpu_var(cpu_hw_events);

	struct cpu_hw_events *events = this_cpu_ptr(&cpu_hw_events);

	u32 tmp = 0;

	unsigned long flags;
@@ -751,7 +751,7 @@ static int metag_pmu_event_map(int idx) 
static irqreturn_t metag_pmu_counter_overflow(int irq, void *dev)

{

	int idx = (int)dev;

	struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);

	struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);

	struct perf_event *event = cpuhw->events[idx];

	struct hw_perf_event *hwc = &event->hw;

	struct pt_regs *regs = get_irq_regs();