From 2b45f9735d275b0a6d65e5d25aa922032e7dbe47 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Mon, 4 Feb 2008 16:48:01 +0100 Subject: [PATCH] --- yaml --- r: 82866 b: refs/heads/master c: 94a8a7acbe4d9aa83d53597516cc71101ebd2f6d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/trampoline_32.S | 7 +------ trunk/arch/x86/kernel/trampoline_64.S | 3 --- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4159ff0ed0ee..7ed48d045bbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b4239346136f1432e52d14ea88f4b2662876f4a +refs/heads/master: 94a8a7acbe4d9aa83d53597516cc71101ebd2f6d diff --git a/trunk/arch/x86/kernel/trampoline_32.S b/trunk/arch/x86/kernel/trampoline_32.S index 9bcc1c6aca3d..64580679861e 100644 --- a/trunk/arch/x86/kernel/trampoline_32.S +++ b/trunk/arch/x86/kernel/trampoline_32.S @@ -11,12 +11,7 @@ * trampoline page to make our stack and everything else * is a mystery. * - * In fact we don't actually need a stack so we don't - * set one up. - * - * We jump into the boot/compressed/head.S code. So you'd - * better be running a compressed kernel image or you - * won't get very far. + * We jump into arch/x86/kernel/head_32.S. * * On entry to trampoline_data, the processor is in real mode * with 16-bit addressing and 16-bit data. CS has some value diff --git a/trunk/arch/x86/kernel/trampoline_64.S b/trunk/arch/x86/kernel/trampoline_64.S index e30b67c6a9f5..4aedd0bcee4c 100644 --- a/trunk/arch/x86/kernel/trampoline_64.S +++ b/trunk/arch/x86/kernel/trampoline_64.S @@ -10,9 +10,6 @@ * trampoline page to make our stack and everything else * is a mystery. * - * In fact we don't actually need a stack so we don't - * set one up. - * * On entry to trampoline_data, the processor is in real mode * with 16-bit addressing and 16-bit data. CS has some value * and IP is zero. Thus, data addresses need to be absolute