summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-02-15 03:29:27 +0100
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-02-15 03:29:27 +0100
commit5eb65be2d9a1f7c5e2b95aede16e7eab1cdb67e2 (patch)
tree4733d857534b1958402776964abe8f1eaa7d4bed /arch/x86
parentxen: remove redundant NULL check before unregister_and_remove_pcpu(). (diff)
downloadlinux-5eb65be2d9a1f7c5e2b95aede16e7eab1cdb67e2.tar.xz
linux-5eb65be2d9a1f7c5e2b95aede16e7eab1cdb67e2.zip
Revert "xen/PVonHVM: fix compile warning in init_hvm_pv_info"
This reverts commit a7be94ac8d69c037d08f0fd94b45a593f1d45176. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/enlighten.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 138e5667409a..5fb3ec1e062e 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1579,7 +1579,7 @@ static void __init xen_hvm_init_shared_info(void)
static void __init init_hvm_pv_info(void)
{
- uint32_t ecx, edx, pages, msr, base;
+ uint32_t eax, ebx, ecx, edx, pages, msr, base;
u64 pfn;
base = xen_cpuid_base();