xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'linus/master' into x86/bootmem

Browse Source
This commit is contained in:
H. Peter Anvin
2010-02-10 16:55:28 -08:00
parent 13ca0fcaa3 e28cab42f3
commit 84abd88a70
9951 changed files with 839284 additions and 440146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/kernel/e820.c
View File

@@ -732,7 +732,7 @@ core_initcall(e820_mark_nvs_memory);
/*
* Early reserved memory areas.
*/
#define MAX_EARLY_RES 20
#define MAX_EARLY_RES 32
struct early_res {
u64 start, end;
@@ -740,7 +740,16 @@ struct early_res {
char overlap_ok;
};
static struct early_res early_res[MAX_EARLY_RES] __initdata = {
{ 0, PAGE_SIZE, "BIOS data page" }, /* BIOS data page */
{ 0, PAGE_SIZE, "BIOS data page", 1 }, /* BIOS data page */
#if defined(CONFIG_X86_32) && defined(CONFIG_X86_TRAMPOLINE)
/*
* But first pinch a few for the stack/trampoline stuff
* FIXME: Don't need the extra page at 4K, but need to fix
* trampoline before removing it. (see the GDT stuff)
*/
{ PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE", 1 },
#endif
{}
};