diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:43:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:43:21 -0400 |
| commit | acbaa41a780490c791492c41144c774c04875af1 (patch) | |
| tree | 31f1f046875eb071e2aed031e5d9d1584742314f /arch/x86/boot/compressed/head_32.S | |
| parent | 8d89adf44cf750e49691ba5b744b2ad77a05e997 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/quirks
Conflicts:
arch/x86/kernel/early-quirks.c
Diffstat (limited to 'arch/x86/boot/compressed/head_32.S')
| -rw-r--r-- | arch/x86/boot/compressed/head_32.S | 5 |
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 ba7736cf2ec7..29c5fbf08392 100644 --- a/arch/x86/boot/compressed/head_32.S +++ b/arch/x86/boot/compressed/head_32.S | |||
| @@ -137,14 +137,15 @@ relocated: | |||
| 137 | */ | 137 | */ |
| 138 | movl output_len(%ebx), %eax | 138 | movl output_len(%ebx), %eax |
| 139 | pushl %eax | 139 | pushl %eax |
| 140 | # push arguments for decompress_kernel: | ||
| 140 | pushl %ebp # output address | 141 | pushl %ebp # output address |
| 141 | movl input_len(%ebx), %eax | 142 | movl input_len(%ebx), %eax |
| 142 | pushl %eax # input_len | 143 | pushl %eax # input_len |
| 143 | leal input_data(%ebx), %eax | 144 | leal input_data(%ebx), %eax |
| 144 | pushl %eax # input_data | 145 | pushl %eax # input_data |
| 145 | leal boot_heap(%ebx), %eax | 146 | leal boot_heap(%ebx), %eax |
| 146 | pushl %eax # heap area as third argument | 147 | pushl %eax # heap area |
| 147 | pushl %esi # real mode pointer as second arg | 148 | pushl %esi # real mode pointer |
| 148 | call decompress_kernel | 149 | call decompress_kernel |
| 149 | addl $20, %esp | 150 | addl $20, %esp |
| 150 | popl %ecx | 151 | popl %ecx |