diff options
| author | chrisw@osdl.org[kaf24] <chrisw@osdl.org[kaf24]> | 2005-06-13 22:51:02 +0000 |
|---|---|---|
| committer | chrisw@osdl.org[kaf24] <chrisw@osdl.org[kaf24]> | 2005-06-13 22:51:02 +0000 |
| commit | 2d0fe9c80f2db0cce0318eb953a9ce732ba2b9b4 (patch) | |
| tree | b1c92ba8f03556664fa137de581973415c0251e1 | |
| parent | 264c8b7aac4d2c7ab164b35faca8073c114a3174 (diff) | |
| download | xen-2d0fe9c80f2db0cce0318eb953a9ce732ba2b9b4.tar.gz xen-2d0fe9c80f2db0cce0318eb953a9ce732ba2b9b4.tar.bz2 xen-2d0fe9c80f2db0cce0318eb953a9ce732ba2b9b4.zip | |
bitkeeper revision 1.1713.1.7 (42ae0dd6jIaFvKcbyu8YLCgOrZScdg)
[PATCH] [PATCH] fix x86_64 initrd support
* Chris Wright (chrisw@osdl.org) wrote:
Ugh, that one had some tab damage, here's the proper patch.
-chris
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c index 8951d61c2a..72d4cd59e4 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c @@ -727,23 +727,20 @@ void __init setup_arch(char **cmdline_p) acpi_reserve_bootmem(); #endif #ifdef CONFIG_BLK_DEV_INITRD - if (xen_start_info.mod_start) { - if (LOADER_TYPE && INITRD_START) { - if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) { - /* reserve_bootmem_generic(INITRD_START, INITRD_SIZE); */ - initrd_start = INITRD_START + PAGE_OFFSET; - initrd_end = initrd_start+INITRD_SIZE; - initrd_below_start_ok = 1; - } - else { - printk(KERN_ERR "initrd extends beyond end of memory " - "(0x%08lx > 0x%08lx)\ndisabling initrd\n", - (unsigned long)(INITRD_START + INITRD_SIZE), - (unsigned long)(end_pfn << PAGE_SHIFT)); - initrd_start = 0; - } - } - } + if (xen_start_info.mod_start) { + if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) { + /*reserve_bootmem_generic(INITRD_START, INITRD_SIZE);*/ + initrd_start = INITRD_START + PAGE_OFFSET; + initrd_end = initrd_start+INITRD_SIZE; + initrd_below_start_ok = 1; + } else { + printk(KERN_ERR "initrd extends beyond end of memory " + "(0x%08lx > 0x%08lx)\ndisabling initrd\n", + (unsigned long)(INITRD_START + INITRD_SIZE), + (unsigned long)(end_pfn << PAGE_SHIFT)); + initrd_start = 0; + } + } #endif paging_init(); #ifdef CONFIG_X86_LOCAL_APIC |