From: Keir Fraser <keir@xen.org>
Date: Wed, 12 Sep 2012 19:23:10 +0000 (+0100)
Subject: x86: HYPERVISOR_VIRT_END is always defined. Remove ifdef'ery.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7919
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b4423022f6a9cb5d804db2b218046e65d537e3a6;p=xen.git

x86: HYPERVISOR_VIRT_END is always defined. Remove ifdef'ery.

Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 1108881b97..d5d480d60f 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1087,9 +1087,7 @@ void __init __start_xen(unsigned long mbi_p)
 
     /* Check definitions in public headers match internal defs. */
     BUILD_BUG_ON(__HYPERVISOR_VIRT_START != HYPERVISOR_VIRT_START);
-#ifdef HYPERVISOR_VIRT_END
     BUILD_BUG_ON(__HYPERVISOR_VIRT_END   != HYPERVISOR_VIRT_END);
-#endif
     BUILD_BUG_ON(MACH2PHYS_VIRT_START != RO_MPT_VIRT_START);
     BUILD_BUG_ON(MACH2PHYS_VIRT_END   != RO_MPT_VIRT_END);
 
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 8a6f646d15..80ad696f6d 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -1161,13 +1161,8 @@ static int handle_gdt_ldt_mapping_fault(
     return EXCRET_fault_fixed;
 }
 
-#ifdef HYPERVISOR_VIRT_END
 #define IN_HYPERVISOR_RANGE(va) \
     (((va) >= HYPERVISOR_VIRT_START) && ((va) < HYPERVISOR_VIRT_END))
-#else
-#define IN_HYPERVISOR_RANGE(va) \
-    (((va) >= HYPERVISOR_VIRT_START))
-#endif
 
 enum pf_type {
     real_fault,