ia64/xen-unstable

changeset 10135:dbcb8acc8f59

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@xensource.com>
author Ian.Campbell@xensource.com
date Mon May 22 17:03:24 2006 +0100 (2006-05-22)
parents c6da0c5b03ff
children 13d6d993d797
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 15:42:54 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Mon May 22 17:03:24 2006 +0100
     1.3 @@ -626,10 +626,12 @@ void __init setup_arch(char **cmdline_p)
     1.4  {
     1.5  	unsigned long kernel_end;
     1.6  
     1.7 -#ifdef CONFIG_XEN
     1.8 +#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
     1.9  	struct e820entry *machine_e820;
    1.10  	struct xen_memory_map memmap;
    1.11 +#endif
    1.12  
    1.13 +#ifdef CONFIG_XEN
    1.14  	/* Register a call for panic conditions. */
    1.15  	notifier_chain_register(&panic_notifier_list, &xen_panic_block);
    1.16  
    1.17 @@ -741,7 +743,7 @@ void __init setup_arch(char **cmdline_p)
    1.18  
    1.19  #ifdef CONFIG_XEN
    1.20  	/* reserve physmap, start info and initial page tables */
    1.21 -	reserve_bootmem(kernel_end, table_start<<PAGE_SHIFT);
    1.22 +	reserve_bootmem(kernel_end, (table_start<<PAGE_SHIFT)-kernel_end);
    1.23  #else
    1.24  	/*
    1.25  	 * reserve physical page 0 - it's a special BIOS page on many boxes,