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

Commit c9f29549 authored by Christoph Lameter's avatar Christoph Lameter Committed by Rusty Russell
Browse files

lguest: Use this_cpu_ops 



Use this_cpu_ops in a couple of places in lguest.

Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 85c06472

arch/x86/lguest/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static void __init lguest_init_IRQ(void) 


	for (i = FIRST_EXTERNAL_VECTOR; i < NR_VECTORS; i++) {

		/* Some systems map "vectors" to interrupts weirdly.  Not us! */

		__get_cpu_var(vector_irq)[i] = i - FIRST_EXTERNAL_VECTOR;

		__this_cpu_write(vector_irq[i]) = i - FIRST_EXTERNAL_VECTOR;

		if (i != SYSCALL_VECTOR)

			set_intr_gate(i, interrupt[i - FIRST_EXTERNAL_VECTOR]);

	}

drivers/lguest/page_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,7 @@ void free_guest_pagetable(struct lguest *lg) 
 */

void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages)

{

	pte_t *switcher_pte_page = __get_cpu_var(switcher_pte_pages);

	pte_t *switcher_pte_page = __this_cpu_read(switcher_pte_pages);

	pte_t regs_pte;



#ifdef CONFIG_X86_PAE

drivers/lguest/x86/core.c

+2 −2
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages) 
	 * meanwhile).  If that's not the case, we pretend everything in the

	 * Guest has changed.

	 */

	if (__get_cpu_var(lg_last_cpu) != cpu || cpu->last_pages != pages) {

		__get_cpu_var(lg_last_cpu) = cpu;

	if (__this_cpu_read(lg_last_cpu) != cpu || cpu->last_pages != pages) {

		__this_cpu_read(lg_last_cpu) = cpu;

		cpu->last_pages = pages;

		cpu->changed = CHANGED_ALL;

	}