]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
i386: vmalloc size fix
authorDave Young <hidave.darkstar@gmail.com>
Wed, 20 Aug 2008 23:43:03 +0000 (16:43 -0700)
committerIngo Molnar <mingo@elte.hu>
Thu, 21 Aug 2008 08:13:21 +0000 (10:13 +0200)
commite621bd18958ef5dbace3129ebe17a0a475e127d9
tree214b768e7791b60db3e06676d76e01e77e54c791
parent6a55617ed5d1aa62b850de2cf66f5ede2eef4825
i386: vmalloc size fix

Booting kernel with vmalloc=[any size<=16m] will oops on my pc (i386/1G memory).

BUG_ON in arch/x86/mm/init_32.c triggered:
BUG_ON((unsigned long)high_memory > VMALLOC_START);

It's due to the vm area hole.

In include/asm-x86/pgtable_32.h:
#define VMALLOC_OFFSET (8 * 1024 * 1024)
#define VMALLOC_START (((unsigned long)high_memory + 2 * VMALLOC_OFFSET - 1) \
 & ~(VMALLOC_OFFSET - 1))

There's several related point:
1. MAXMEM :
 (-__PAGE_OFFSET - __VMALLOC_RESERVE).
The space after VMALLOC_END is included as well, I set it to
(VMALLOC_END - PAGE_OFFSET - __VMALLOC_RESERVE)

2. VMALLOC_OFFSET is not considered in __VMALLOC_RESERVE
fixed by adding VMALLOC_OFFSET to it.

3. VMALLOC_START :
 (((unsigned long)high_memory + 2 * VMALLOC_OFFSET - 1) & ~(VMALLOC_OFFSET - 1))
So it's not always 8M, bigger than 8M possible.
I set it to ((unsigned long)high_memory + VMALLOC_OFFSET)

4. the VMALLOC_RESERVE is an unused macro, so remove it here.

Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Cc: akpm@linux-foundation.org
Cc: hidave.darkstar@gmail.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
arch/x86/mm/pgtable_32.c
include/asm-x86/page_32.h
include/asm-x86/pgtable_32.h