ia64/xen-unstable

changeset 9612:131051c09008

find changesets by author, revision, files, or words in the commit message
Move misplaced CONFIG_KEXEC code chunk in setup-xen.c to its proper location.

From: Jan Beulich

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Apr 06 15:22:46 2006 +0100 (2006-04-06)
parents 8b39930c70d5
children b128f55ca05c
files linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Thu Apr 06 14:58:55 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Thu Apr 06 15:22:46 2006 +0100
     1.3 @@ -1317,6 +1317,11 @@ void __init setup_bootmem_allocator(void
     1.4  		}
     1.5  	}
     1.6  #endif
     1.7 +#ifdef CONFIG_KEXEC
     1.8 +	if (crashk_res.start != crashk_res.end)
     1.9 +		reserve_bootmem(crashk_res.start,
    1.10 +			crashk_res.end - crashk_res.start + 1);
    1.11 +#endif
    1.12  
    1.13  	if (!xen_feature(XENFEAT_auto_translated_physmap))
    1.14  		phys_to_machine_mapping =
    1.15 @@ -1436,11 +1441,6 @@ legacy_init_iomem_resources(struct resou
    1.16  		}
    1.17  	}
    1.18  #endif
    1.19 -#ifdef CONFIG_KEXEC
    1.20 -	if (crashk_res.start != crashk_res.end)
    1.21 -		reserve_bootmem(crashk_res.start,
    1.22 -			crashk_res.end - crashk_res.start + 1);
    1.23 -#endif
    1.24  }
    1.25  
    1.26  /*