diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-27 11:30:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-27 11:30:05 +0100 |
| commit | 34bf5d0ff54d03f0a8ed690d47efb806ee2fffcb (patch) | |
| tree | 5465f999b2b067744220b66c89b75f0f10445d6e /arch/x86/kernel/head64.c | |
| parent | bd8b96dfc216eebc72950a6c40da8d3eca8667df (diff) | |
| parent | 79a66b96c339626a3e4b226fefc0e45244cfe6ff (diff) | |
Merge branch 'x86/core' into x86/cleanups
Diffstat (limited to 'arch/x86/kernel/head64.c')
| -rw-r--r-- | arch/x86/kernel/head64.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index d16084f90649..388e05a5fc17 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -24,6 +24,7 @@ #include <asm/kdebug.h> #include <asm/e820.h> #include <asm/bios_ebda.h> +#include <asm/trampoline.h> /* boot cpu pda */ static struct x8664_pda _boot_cpu_pda __read_mostly; @@ -120,6 +121,8 @@ void __init x86_64_start_reservations(char *real_mode_data) { copy_bootdata(__va(real_mode_data)); + reserve_trampoline_memory(); + reserve_early(__pa_symbol(&_text), __pa_symbol(&_end), "TEXT DATA BSS"); #ifdef CONFIG_BLK_DEV_INITRD |