From 9b2fe0d61d0a949f413aed4eb6e6570579b6fe00 Mon Sep 17 00:00:00 2001 From: Glauber de Oliveira Costa Date: Thu, 17 Jan 2008 19:11:20 -0200 Subject: [PATCH] --- yaml --- r: 80919 b: refs/heads/master c: c40a9f4719d36841a2d7ff4fe866dce7bfb454b7 h: refs/heads/master i: 80917: ba3352000bdf20463892f1c95c5b202b1a25f336 80915: 284914e6982dfb04a12f11ea00312bbb360b3859 80911: 1f08c570c8c169bc32b1918d72f5b9d5cf84682a v: v3 --- [refs] | 2 +- trunk/drivers/lguest/x86/core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bc872341f6d6..81bc3d17269f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2092aa277b0adfb8f4f47ab8a9ee00aff0ca7ed6 +refs/heads/master: c40a9f4719d36841a2d7ff4fe866dce7bfb454b7 diff --git a/trunk/drivers/lguest/x86/core.c b/trunk/drivers/lguest/x86/core.c index 8c723555ffb3..10eab6748d84 100644 --- a/trunk/drivers/lguest/x86/core.c +++ b/trunk/drivers/lguest/x86/core.c @@ -60,7 +60,7 @@ static struct lguest_pages *lguest_pages(unsigned int cpu) (SWITCHER_ADDR + SHARED_SWITCHER_PAGES*PAGE_SIZE))[cpu]); } -static DEFINE_PER_CPU(struct lguest *, last_guest); +static DEFINE_PER_CPU(struct lg_cpu *, last_cpu); /*S:010 * We approach the Switcher. @@ -80,8 +80,8 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages) * same Guest we ran last time (and that Guest hasn't run anywhere else * meanwhile). If that's not the case, we pretend everything in the * Guest has changed. */ - if (__get_cpu_var(last_guest) != lg || lg->last_pages != pages) { - __get_cpu_var(last_guest) = lg; + if (__get_cpu_var(last_cpu) != cpu || lg->last_pages != pages) { + __get_cpu_var(last_cpu) = cpu; lg->last_pages = pages; lg->changed = CHANGED_ALL; }