diff options
Diffstat (limited to 'arch/x86/kernel/e820.c')
| -rw-r--r-- | arch/x86/kernel/e820.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 90a85295f332..4004f10285d1 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c | |||
| @@ -743,29 +743,11 @@ struct early_res { | |||
| 743 | char name[15]; | 743 | char name[15]; |
| 744 | char overlap_ok; | 744 | char overlap_ok; |
| 745 | }; | 745 | }; |
| 746 | static struct early_res early_res_x[MAX_EARLY_RES_X] __initdata = { | 746 | static struct early_res early_res_x[MAX_EARLY_RES_X] __initdata; |
| 747 | { 0, PAGE_SIZE, "BIOS data page", 1 }, /* BIOS data page */ | ||
| 748 | #if defined(CONFIG_X86_32) && defined(CONFIG_X86_TRAMPOLINE) | ||
| 749 | /* | ||
| 750 | * But first pinch a few for the stack/trampoline stuff | ||
| 751 | * FIXME: Don't need the extra page at 4K, but need to fix | ||
| 752 | * trampoline before removing it. (see the GDT stuff) | ||
| 753 | */ | ||
| 754 | { PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE", 1 }, | ||
| 755 | #endif | ||
| 756 | |||
| 757 | {} | ||
| 758 | }; | ||
| 759 | 747 | ||
| 760 | static int max_early_res __initdata = MAX_EARLY_RES_X; | 748 | static int max_early_res __initdata = MAX_EARLY_RES_X; |
| 761 | static struct early_res *early_res __initdata = &early_res_x[0]; | 749 | static struct early_res *early_res __initdata = &early_res_x[0]; |
| 762 | static int early_res_count __initdata = | 750 | static int early_res_count __initdata; |
| 763 | #ifdef CONFIG_X86_32 | ||
| 764 | 2 | ||
| 765 | #else | ||
| 766 | 1 | ||
| 767 | #endif | ||
| 768 | ; | ||
| 769 | 751 | ||
| 770 | static int __init find_overlapped_early(u64 start, u64 end) | 752 | static int __init find_overlapped_early(u64 start, u64 end) |
| 771 | { | 753 | { |
