forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: introduce init_memory_mapping for 32bit #2

Browse source 
moving relocate_initrd early

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-06-24 12:18:58 -07:00 • committed by Ingo Molnar
parent 4e29684c40
commit cfb0e53b05
3 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
arch/x86/kernel/setup_32.c
View file

@ -186,7 +186,7 @@ static inline void copy_edd(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
static bool do_relocate_initrd = false; static void __init relocate_initrd(void);
static void __init reserve_initrd(void) static void __init reserve_initrd(void)
{ {
@ -195,7 +195,6 @@ static void __init reserve_initrd(void)
u64 ramdisk_end = ramdisk_image + ramdisk_size; u64 ramdisk_end = ramdisk_image + ramdisk_size;
u64 end_of_lowmem = max_low_pfn << PAGE_SHIFT; u64 end_of_lowmem = max_low_pfn << PAGE_SHIFT;
u64 ramdisk_here; u64 ramdisk_here;
u64 ramdisk_target;
if (!boot_params.hdr.type_of_loader || if (!boot_params.hdr.type_of_loader ||
!ramdisk_image || !ramdisk_size) !ramdisk_image || !ramdisk_size)
@ -242,12 +241,12 @@ static void __init reserve_initrd(void)
printk(KERN_INFO "Allocated new RAMDISK: %08llx - %08llx\n", printk(KERN_INFO "Allocated new RAMDISK: %08llx - %08llx\n",
ramdisk_here, ramdisk_here + ramdisk_size); ramdisk_here, ramdisk_here + ramdisk_size);
do_relocate_initrd = true; relocate_initrd();
} }
#define MAX_MAP_CHUNK (NR_FIX_BTMAPS << PAGE_SHIFT) #define MAX_MAP_CHUNK (NR_FIX_BTMAPS << PAGE_SHIFT)
void __init post_reserve_initrd(void) static void __init relocate_initrd(void)
{ {
u64 ramdisk_image = boot_params.hdr.ramdisk_image; u64 ramdisk_image = boot_params.hdr.ramdisk_image;
u64 ramdisk_size = boot_params.hdr.ramdisk_size; u64 ramdisk_size = boot_params.hdr.ramdisk_size;
@ -256,9 +255,6 @@ void __init post_reserve_initrd(void)
unsigned long slop, clen, mapaddr; unsigned long slop, clen, mapaddr;
char *p, *q; char *p, *q;
if (!do_relocate_initrd)
return;
ramdisk_here = initrd_start - PAGE_OFFSET; ramdisk_here = initrd_start - PAGE_OFFSET;
q = (char *)initrd_start; q = (char *)initrd_start;
@ -269,10 +265,6 @@ void __init post_reserve_initrd(void)
p = (char *)__va(ramdisk_image); p = (char *)__va(ramdisk_image);
memcpy(q, p, clen); memcpy(q, p, clen);
q += clen; q += clen;
/* need to free these low pages...*/
printk(KERN_INFO "Freeing old partial RAMDISK %08llx-%08llx\n",
ramdisk_image, ramdisk_image + clen - 1);
free_bootmem(ramdisk_image, clen);
ramdisk_image += clen; ramdisk_image += clen;
ramdisk_size -= clen; ramdisk_size -= clen;
} }
@ -298,16 +290,16 @@ void __init post_reserve_initrd(void)
ramdisk_image, ramdisk_image + ramdisk_size - 1, ramdisk_image, ramdisk_image + ramdisk_size - 1,
ramdisk_here, ramdisk_here + ramdisk_size - 1); ramdisk_here, ramdisk_here + ramdisk_size - 1);
/* need to free that, otherwise init highmem will reserve it again */ /*
* need to free old one, otherwise init cross max_low_pfn could be
* converted to bootmem
*/
free_early(ramdisk_image, ramdisk_image+ramdisk_size); free_early(ramdisk_image, ramdisk_image+ramdisk_size);
} }
#else #else
void __init reserve_initrd(void) void __init reserve_initrd(void)
{ {
} }
void __init post_reserve_initrd(void)
{
}
#endif /* CONFIG_BLK_DEV_INITRD */ #endif /* CONFIG_BLK_DEV_INITRD */
#ifdef CONFIG_MCA #ifdef CONFIG_MCA

3
arch/x86/mm/init_32.c
View file

@ -831,9 +831,6 @@ void __init paging_init(void)
/* /*
* NOTE: at this point the bootmem allocator is fully available. * NOTE: at this point the bootmem allocator is fully available.
*/ */
post_reserve_initrd();
remapped_pgdat_init(); remapped_pgdat_init();
sparse_init(); sparse_init();
zone_sizes_init(); zone_sizes_init();

1
include/asm-x86/setup.h
View file

@ -39,7 +39,6 @@ void reserve_crashkernel(void);
#include <asm/bootparam.h> #include <asm/bootparam.h>
void reserve_standard_io_resources(void); void reserve_standard_io_resources(void);
extern void post_reserve_initrd(void);
#ifndef _SETUP #ifndef _SETUP