From f8919e4ea26acd0a1e80fa16c2a2f78d1ded81b9 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 25 Jan 2013 16:03:35 -0800 Subject: [PATCH] --- yaml --- r: 356163 b: refs/heads/master c: 3596f5bb0a6afd01a784bfe120f420edbbf82861 h: refs/heads/master i: 356161: 3006ff489d6564eba50b90a04bdb8d63fe7a4cd1 356159: a57e6969266f04895ef2e0011e774eef0b4b508f v: v3 --- [refs] | 2 +- trunk/arch/x86/lguest/boot.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 85cd6d91d715..c017c8668a9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e4bf1a55da976a5ed60901bb8801f1024ef9774 +refs/heads/master: 3596f5bb0a6afd01a784bfe120f420edbbf82861 diff --git a/trunk/arch/x86/lguest/boot.c b/trunk/arch/x86/lguest/boot.c index 642d8805bc1b..139dd353c2f2 100644 --- a/trunk/arch/x86/lguest/boot.c +++ b/trunk/arch/x86/lguest/boot.c @@ -552,7 +552,8 @@ static void lguest_write_cr3(unsigned long cr3) current_cr3 = cr3; /* These two page tables are simple, linear, and used during boot */ - if (cr3 != __pa(swapper_pg_dir) && cr3 != __pa(initial_page_table)) + if (cr3 != __pa_symbol(swapper_pg_dir) && + cr3 != __pa_symbol(initial_page_table)) cr3_changed = true; }