[Xen-changelog] Fix x86/64 -xenU build. probe_roms() is only defined if building a privleged

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID dec7f819293c11f88281aa0fe408a10f8c1345ce
# Parent  9d838b8ceebfc3ead2e31b9c8ac86fdaaa5fe7e0
Fix x86/64 -xenU build. probe_roms() is only defined if building a privleged
or !xen build.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 9d838b8ceebf -r dec7f819293c 
linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c       Mon May 22 
09:23:21 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c       Mon May 22 
15:03:46 2006 +0100
@@ -931,8 +931,8 @@ void __init setup_arch(char **cmdline_p)
         * Request address space for all standard RAM and ROM resources
         * and also for regions reported as reserved by the e820.
         */
+#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
        probe_roms();
-#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
        if (xen_start_info->flags & SIF_INITDOMAIN) {
                machine_e820 = alloc_bootmem_low_pages(PAGE_SIZE);
 
@@ -944,6 +944,7 @@ void __init setup_arch(char **cmdline_p)
                e820_reserve_resources(machine_e820, memmap.nr_entries);
        }
 #elif !defined(CONFIG_XEN)
+       probe_roms();
        e820_reserve_resources(e820.map, e820.nr_map);
 #endif
 

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