ia64/xen-unstable

changeset 10133:dec7f819293c

Fix x86/64 -xenU build. probe_roms() is only defined if building a privleged
or !xen build.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian.Campbell@xensource.com
date Mon May 22 15:03:46 2006 +0100 (2006-05-22)
parents 9d838b8ceebf
children c6da0c5b03ff
files linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Mon May 22 09:23:21 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Mon May 22 15:03:46 2006 +0100
     1.3 @@ -931,8 +931,8 @@ void __init setup_arch(char **cmdline_p)
     1.4  	 * Request address space for all standard RAM and ROM resources
     1.5  	 * and also for regions reported as reserved by the e820.
     1.6  	 */
     1.7 +#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
     1.8  	probe_roms();
     1.9 -#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
    1.10  	if (xen_start_info->flags & SIF_INITDOMAIN) {
    1.11  		machine_e820 = alloc_bootmem_low_pages(PAGE_SIZE);
    1.12  
    1.13 @@ -944,6 +944,7 @@ void __init setup_arch(char **cmdline_p)
    1.14  		e820_reserve_resources(machine_e820, memmap.nr_entries);
    1.15  	}
    1.16  #elif !defined(CONFIG_XEN)
    1.17 +	probe_roms();
    1.18  	e820_reserve_resources(e820.map, e820.nr_map);
    1.19  #endif
    1.20