[Xen-changelog] Fix x86/64 by passing the required length to reserve_bootmem instead of the end address

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

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID dbcb8acc8f5916dbcb9af4a5b4086611f879bb55
# Parent  c6da0c5b03ffec5ce4130aeba90a49f218772622
Fix x86/64 by passing the required length to reserve_bootmem instead of the end 
address

Fixup a warning since the machine_e820 and memmap variables are only used if
CONFIG_XEN_PRIVILEGED_GUEST.

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

diff -r c6da0c5b03ff -r dbcb8acc8f59 
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 
15:42:54 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c       Mon May 22 
17:03:24 2006 +0100
@@ -626,10 +626,12 @@ void __init setup_arch(char **cmdline_p)
 {
        unsigned long kernel_end;
 
-#ifdef CONFIG_XEN
+#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
        struct e820entry *machine_e820;
        struct xen_memory_map memmap;
-
+#endif
+
+#ifdef CONFIG_XEN
        /* Register a call for panic conditions. */
        notifier_chain_register(&panic_notifier_list, &xen_panic_block);
 
@@ -741,7 +743,7 @@ void __init setup_arch(char **cmdline_p)
 
 #ifdef CONFIG_XEN
        /* reserve physmap, start info and initial page tables */
-       reserve_bootmem(kernel_end, table_start<<PAGE_SHIFT);
+       reserve_bootmem(kernel_end, (table_start<<PAGE_SHIFT)-kernel_end);
 #else
        /*
         * reserve physical page 0 - it's a special BIOS page on many boxes,

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