ia64/linux-2.6.18-xen.hg

changeset 527:81c5a517a42b

xen, x86_64: Fix the build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Apr 22 18:56:27 2008 +0100 (2008-04-22)
parents f128849f9e78
children 5d938fac27a2 9f9b4214bec8
files arch/x86_64/kernel/e820-xen.c
line diff
     1.1 --- a/arch/x86_64/kernel/e820-xen.c	Tue Apr 22 14:41:51 2008 +0100
     1.2 +++ b/arch/x86_64/kernel/e820-xen.c	Tue Apr 22 18:56:27 2008 +0100
     1.3 @@ -45,6 +45,10 @@ unsigned long end_user_pfn = MAXMEM>>PAG
     1.4  
     1.5  extern struct resource code_resource, data_resource;
     1.6  
     1.7 +#ifdef CONFIG_XEN
     1.8 +extern struct e820map machine_e820;
     1.9 +#endif
    1.10 +
    1.11  /* Check for some hardcoded bad areas that early boot is not allowed to touch */ 
    1.12  static inline int bad_addr(unsigned long *addrp, unsigned long size)
    1.13  { 
    1.14 @@ -109,8 +113,6 @@ int e820_any_mapped(unsigned long start,
    1.15  	for (i = 0; i < e820.nr_map; i++) { 
    1.16  		struct e820entry *ei = &e820.map[i]; 
    1.17  #else
    1.18 -	extern struct e820map machine_e820;
    1.19 -
    1.20  	if (!is_initial_xendomain())
    1.21  		return 0;
    1.22  	for (i = 0; i < machine_e820.nr_map; i++) {
    1.23 @@ -141,8 +143,6 @@ int __init e820_all_mapped(unsigned long
    1.24  	for (i = 0; i < e820.nr_map; i++) {
    1.25  		struct e820entry *ei = &e820.map[i];
    1.26  #else
    1.27 -	extern struct e820map machine_e820;
    1.28 -
    1.29  	if (!is_initial_xendomain())
    1.30  		return 0;
    1.31  	for (i = 0; i < machine_e820.nr_map; i++) {