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

Commit 0a3aee0d authored by Tejun Heo's avatar Tejun Heo
Browse files

x86: Use this_cpu_ops to optimize code 



Go through x86 code and replace __get_cpu_var and get_cpu_var
instances that refer to a scalar and are not used for address
determinations.

Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatar"H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 7c839120

arch/x86/include/asm/debugreg.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static inline void hw_breakpoint_disable(void) 


static inline int hw_breakpoint_active(void)

{

	return __get_cpu_var(cpu_dr7) & DR_GLOBAL_ENABLE_MASK;

	return __this_cpu_read(cpu_dr7) & DR_GLOBAL_ENABLE_MASK;

}



extern void aout_dump_debugregs(struct user *dump);

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) 
		unsigned int irr;

		struct irq_desc *desc;

		struct irq_cfg *cfg;

		irq = __get_cpu_var(vector_irq)[vector];

		irq = __this_cpu_read(vector_irq[vector]);



		if (irq == -1)

			continue;
@@ -2336,7 +2336,7 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) 
			apic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR);

			goto unlock;

		}

		__get_cpu_var(vector_irq)[vector] = -1;

		__this_cpu_write(vector_irq[vector], -1);

unlock:

		raw_spin_unlock(&desc->lock);

	}

arch/x86/kernel/apic/nmi.c

+12 −12
Original line number Diff line number Diff line
@@ -306,12 +306,12 @@ void acpi_nmi_disable(void) 
 */

void cpu_nmi_set_wd_enabled(void)

{

	__get_cpu_var(wd_enabled) = 1;

	__this_cpu_write(wd_enabled, 1);

}



void setup_apic_nmi_watchdog(void *unused)

{

	if (__get_cpu_var(wd_enabled))

	if (__this_cpu_read(wd_enabled))

		return;



	/* cheap hack to support suspend/resume */
@@ -322,12 +322,12 @@ void setup_apic_nmi_watchdog(void *unused) 
	switch (nmi_watchdog) {

	case NMI_LOCAL_APIC:

		if (lapic_watchdog_init(nmi_hz) < 0) {

			__get_cpu_var(wd_enabled) = 0;

			__this_cpu_write(wd_enabled, 0);

			return;

		}

		/* FALL THROUGH */

	case NMI_IO_APIC:

		__get_cpu_var(wd_enabled) = 1;

		__this_cpu_write(wd_enabled, 1);

		atomic_inc(&nmi_active);

	}

}
@@ -337,13 +337,13 @@ void stop_apic_nmi_watchdog(void *unused) 
	/* only support LOCAL and IO APICs for now */

	if (!nmi_watchdog_active())

		return;

	if (__get_cpu_var(wd_enabled) == 0)

	if (__this_cpu_read(wd_enabled) == 0)

		return;

	if (nmi_watchdog == NMI_LOCAL_APIC)

		lapic_watchdog_stop();

	else

		__acpi_nmi_disable(NULL);

	__get_cpu_var(wd_enabled) = 0;

	__this_cpu_write(wd_enabled, 0);

	atomic_dec(&nmi_active);

}
@@ -403,8 +403,8 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason) 


	sum = get_timer_irqs(cpu);



	if (__get_cpu_var(nmi_touch)) {

		__get_cpu_var(nmi_touch) = 0;

	if (__this_cpu_read(nmi_touch)) {

		__this_cpu_write(nmi_touch, 0);

		touched = 1;

	}
@@ -427,7 +427,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason) 
		touched = 1;



	/* if the none of the timers isn't firing, this cpu isn't doing much */

	if (!touched && __get_cpu_var(last_irq_sum) == sum) {

	if (!touched && __this_cpu_read(last_irq_sum) == sum) {

		/*

		 * Ayiee, looks like this CPU is stuck ...

		 * wait a few IRQs (5 seconds) before doing the oops ...
@@ -440,12 +440,12 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason) 
			die_nmi("BUG: NMI Watchdog detected LOCKUP",

				regs, panic_on_timeout);

	} else {

		__get_cpu_var(last_irq_sum) = sum;

		__this_cpu_write(last_irq_sum, sum);

		__this_cpu_write(alert_counter, 0);

	}



	/* see if the nmi watchdog went off */

	if (!__get_cpu_var(wd_enabled))

	if (!__this_cpu_read(wd_enabled))

		return rc;

	switch (nmi_watchdog) {

	case NMI_LOCAL_APIC:
@@ -467,7 +467,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason) 


static void enable_ioapic_nmi_watchdog_single(void *unused)

{

	__get_cpu_var(wd_enabled) = 1;

	__this_cpu_write(wd_enabled, 1);

	atomic_inc(&nmi_active);

	__acpi_nmi_enable(NULL);

}

arch/x86/kernel/apic/x2apic_uv_x.c

+4 −4
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) 
		else if (!strcmp(oem_table_id, "UVX"))

			uv_system_type = UV_X2APIC;

		else if (!strcmp(oem_table_id, "UVH")) {

			__get_cpu_var(x2apic_extra_bits) =

				nodeid << (uvh_apicid.s.pnode_shift - 1);

			__this_cpu_write(x2apic_extra_bits,

				nodeid << (uvh_apicid.s.pnode_shift - 1));

			uv_system_type = UV_NON_UNIQUE_APIC;

			uv_set_apicid_hibit();

			return 1;
@@ -284,7 +284,7 @@ static unsigned int x2apic_get_apic_id(unsigned long x) 
	unsigned int id;



	WARN_ON(preemptible() && num_online_cpus() > 1);

	id = x | __get_cpu_var(x2apic_extra_bits);

	id = x | __this_cpu_read(x2apic_extra_bits);



	return id;

}
@@ -376,7 +376,7 @@ struct apic __refdata apic_x2apic_uv_x = { 


static __cpuinit void set_x2apic_extra_bits(int pnode)

{

	__get_cpu_var(x2apic_extra_bits) = (pnode << 6);

	__this_cpu_write(x2apic_extra_bits, (pnode << 6));

}



/*

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

+1 −1
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ static int __devexit powernowk8_cpu_exit(struct cpufreq_policy *pol) 
static void query_values_on_cpu(void *_err)

{

	int *err = _err;

	struct powernow_k8_data *data = __get_cpu_var(powernow_data);

	struct powernow_k8_data *data = __this_cpu_read(powernow_data);



	*err = query_current_values_with_pending_wait(data);

}