From 5902f550bad70c85507d7937d5155a337e5a4742 Mon Sep 17 00:00:00 2001 From: Philipp Kohlbecher Date: Wed, 6 Aug 2008 15:25:26 +0200 Subject: [PATCH] --- yaml --- r: 110349 b: refs/heads/master c: 59f09ba2b62e6f89beeb4c8fc2c83fe14321dda9 h: refs/heads/master i: 110347: 00fecfe4dc9431a20989b5204dd5a65bdaac295b v: v3 --- [refs] | 2 +- trunk/arch/x86/boot/compressed/head_32.S | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 568de49a1e95..072fdc78725e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8aeb4022633f7d0eca5e13a9622bd73df92bbf2a +refs/heads/master: 59f09ba2b62e6f89beeb4c8fc2c83fe14321dda9 diff --git a/trunk/arch/x86/boot/compressed/head_32.S b/trunk/arch/x86/boot/compressed/head_32.S index ba7736cf2ec7..29c5fbf08392 100644 --- a/trunk/arch/x86/boot/compressed/head_32.S +++ b/trunk/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