diff options
| author | Horms <horms@verge.net.au> | 2006-12-12 17:49:03 +0900 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-12-12 10:11:00 -0800 |
| commit | 45a98fc622ae700eed34eb2be00743910d50dbe1 (patch) | |
| tree | e5e5279c25582a7d26c37af189330318fe0f42dd /arch/ia64/mm | |
| parent | adf142e379bd20ad906a7e36f722eaabb3b44b0c (diff) | |
| download | blackbird-obmc-linux-45a98fc622ae700eed34eb2be00743910d50dbe1.tar.gz blackbird-obmc-linux-45a98fc622ae700eed34eb2be00743910d50dbe1.zip | |
[IA64] CONFIG_KEXEC/CONFIG_CRASH_DUMP permutations
Actually, on reflection I think that there is a good case for
keeping the options separate. I am thinking particularly of people
who want a very small crashdump kernel and thus don't want to compile
in kexec.
The patch below should fix things up so that all valid combinations of
KEXEC, CRASH_DUMP and VMCORE compile cleanly - VMCORE depends on
CRASH_DUMP which is why I said valid combinations. In a nutshell
it just untangles unrelated code and switches around a few defines.
Please note that it creats a new file, arch/ia64/kernel/crash_dump.c
This is in keeping with the i386 implementation.
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm')
| -rw-r--r-- | arch/ia64/mm/contig.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 82deaa3a7c48..fd103886bb0a 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c @@ -174,6 +174,12 @@ find_memory (void) reserve_bootmem(bootmap_start, bootmap_size); find_initrd(); + +#ifdef CONFIG_CRASH_DUMP + /* If we are doing a crash dump, we still need to know the real mem + * size before original memory map is * reset. */ + saved_max_pfn = max_pfn; +#endif } #ifdef CONFIG_SMP |
