---

yaml --- r: 80919 b: refs/heads/master c: c40a9f4 h: refs/heads/master i: 80917: ba33520 80915: 284914e 80911: 1f08c57 v: v3
git-mirror · Jan 30, 2008 · 9b2fe0d · 9b2fe0d
1 parent 465060a
commit 9b2fe0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;
 	}