summaryrefslogtreecommitdiff
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorPhilipp Kohlbecher <xt28@gmx.de>2008-08-06 15:25:26 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-11 21:35:30 +0200
commit59f09ba2b62e6f89beeb4c8fc2c83fe14321dda9 (patch)
tree752ea3cd0fb0021f786fa4da18a8ab04e8c3eb86 /arch/x86/boot
parent8aeb4022633f7d0eca5e13a9622bd73df92bbf2a (diff)
downloadlinux-3.10-59f09ba2b62e6f89beeb4c8fc2c83fe14321dda9.tar.gz
linux-3.10-59f09ba2b62e6f89beeb4c8fc2c83fe14321dda9.tar.bz2
linux-3.10-59f09ba2b62e6f89beeb4c8fc2c83fe14321dda9.zip
x86: fix comment in protected mode header
Comments in arch/x86/boot/compressed/head_32.S erroneously refer to the real mode pointer as the second and the heap area as the third argument to decompress_kernel(). In fact, these have been the first and second argument, respectively, since v2.6.20. This patch corrects the comments. It introduces no code changes. Signed-off-by: Philipp Kohlbecher <xt28@gmx.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/compressed/head_32.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index ba7736cf2ec..29c5fbf0839 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -137,14 +137,15 @@ relocated:
*/
movl output_len(%ebx), %eax
pushl %eax
+ # push arguments for decompress_kernel:
pushl %ebp # output address
movl input_len(%ebx), %eax
pushl %eax # input_len
leal input_data(%ebx), %eax
pushl %eax # input_data
leal boot_heap(%ebx), %eax
- pushl %eax # heap area as third argument
- pushl %esi # real mode pointer as second arg
+ pushl %eax # heap area
+ pushl %esi # real mode pointer
call decompress_kernel
addl $20, %esp
popl %ecx