path: root/arch/x86/kernel/head32.c
diff options
authorRafael J. Wysocki <rjw@sisk.pl>2008-12-08 00:50:22 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-08 13:49:45 +0100
commit3e1e9002aa8b32bd4c95ac6c8fad376b7a8127fb (patch)
treef9cee272743423033e78d283955aa7c493691a2d /arch/x86/kernel/head32.c
parent218d11a8b071b23b76c484fd5f72a4fe3306801e (diff)
x86: change static allocation of trampoline area
Impact: fix trampoline sizing bug, save space While debugging a suspend-to-RAM related issue it occured to me that if the trampoline code had grown past 4 KB, we would have been allocating too little memory for it, since the 4 KB size of the trampoline is hardcoded into arch/x86/kernel/e820.c . Change that by making the kernel compute the trampoline size and allocate as much memory as necessary. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/head32.c')
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index fa1d25dd83e3..ac108d1fe182 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -12,9 +12,12 @@
#include <asm/sections.h>
#include <asm/e820.h>
#include <asm/bios_ebda.h>
+#include <asm/trampoline.h>
void __init i386_start_kernel(void)
+ reserve_trampoline_memory();
reserve_early(__pa_symbol(&_text), __pa_symbol(&_end), "TEXT DATA BSS");

Privacy Policy