Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Provide _sdata in the vmlinux.lds.S file x86: handle initrd that extends into unusable memory
This commit is contained in:
commit
db8e7f10ed
|
@ -301,15 +301,13 @@ static void __init reserve_brk(void)
|
||||||
|
|
||||||
#ifdef CONFIG_BLK_DEV_INITRD
|
#ifdef CONFIG_BLK_DEV_INITRD
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
|
||||||
|
|
||||||
#define MAX_MAP_CHUNK (NR_FIX_BTMAPS << PAGE_SHIFT)
|
#define MAX_MAP_CHUNK (NR_FIX_BTMAPS << PAGE_SHIFT)
|
||||||
static void __init relocate_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;
|
||||||
u64 end_of_lowmem = max_low_pfn << PAGE_SHIFT;
|
u64 end_of_lowmem = max_low_pfn_mapped << PAGE_SHIFT;
|
||||||
u64 ramdisk_here;
|
u64 ramdisk_here;
|
||||||
unsigned long slop, clen, mapaddr;
|
unsigned long slop, clen, mapaddr;
|
||||||
char *p, *q;
|
char *p, *q;
|
||||||
|
@ -365,14 +363,13 @@ static void __init relocate_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);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
static void __init reserve_initrd(void)
|
static void __init reserve_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;
|
||||||
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_mapped << PAGE_SHIFT;
|
||||||
|
|
||||||
if (!boot_params.hdr.type_of_loader ||
|
if (!boot_params.hdr.type_of_loader ||
|
||||||
!ramdisk_image || !ramdisk_size)
|
!ramdisk_image || !ramdisk_size)
|
||||||
|
@ -402,14 +399,8 @@ static void __init reserve_initrd(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
|
||||||
relocate_initrd();
|
relocate_initrd();
|
||||||
#else
|
|
||||||
printk(KERN_ERR "initrd extends beyond end of memory "
|
|
||||||
"(0x%08llx > 0x%08llx)\ndisabling initrd\n",
|
|
||||||
ramdisk_end, end_of_lowmem);
|
|
||||||
initrd_start = 0;
|
|
||||||
#endif
|
|
||||||
free_early(ramdisk_image, ramdisk_end);
|
free_early(ramdisk_image, ramdisk_end);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -108,6 +108,8 @@ SECTIONS
|
||||||
/* Data */
|
/* Data */
|
||||||
. = ALIGN(PAGE_SIZE);
|
. = ALIGN(PAGE_SIZE);
|
||||||
.data : AT(ADDR(.data) - LOAD_OFFSET) {
|
.data : AT(ADDR(.data) - LOAD_OFFSET) {
|
||||||
|
/* Start of data section */
|
||||||
|
_sdata = .;
|
||||||
DATA_DATA
|
DATA_DATA
|
||||||
CONSTRUCTORS
|
CONSTRUCTORS
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue