[Xen-changelog] [linux-2.6.18-xen] xen, x86_64: Fix the build.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1208886987 -3600
# Node ID 81c5a517a42b817378b63ced1420684e9bed1e21
# Parent  f128849f9e78a355f10bb510f6aed06f592d0903
xen, x86_64: Fix the build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 arch/x86_64/kernel/e820-xen.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -r f128849f9e78 -r 81c5a517a42b arch/x86_64/kernel/e820-xen.c
--- a/arch/x86_64/kernel/e820-xen.c     Tue Apr 22 14:41:51 2008 +0100
+++ b/arch/x86_64/kernel/e820-xen.c     Tue Apr 22 18:56:27 2008 +0100
@@ -45,6 +45,10 @@ unsigned long end_user_pfn = MAXMEM>>PAG
 
 extern struct resource code_resource, data_resource;
 
+#ifdef CONFIG_XEN
+extern struct e820map machine_e820;
+#endif
+
 /* Check for some hardcoded bad areas that early boot is not allowed to touch 
*/ 
 static inline int bad_addr(unsigned long *addrp, unsigned long size)
 { 
@@ -109,8 +113,6 @@ int e820_any_mapped(unsigned long start,
        for (i = 0; i < e820.nr_map; i++) { 
                struct e820entry *ei = &e820.map[i]; 
 #else
-       extern struct e820map machine_e820;
-
        if (!is_initial_xendomain())
                return 0;
        for (i = 0; i < machine_e820.nr_map; i++) {
@@ -141,8 +143,6 @@ int __init e820_all_mapped(unsigned long
        for (i = 0; i < e820.nr_map; i++) {
                struct e820entry *ei = &e820.map[i];
 #else
-       extern struct e820map machine_e820;
-
        if (!is_initial_xendomain())
                return 0;
        for (i = 0; i < machine_e820.nr_map; i++) {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog