diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-06 02:24:50 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-08 20:16:22 -0400 |
| commit | bd2a36984c50bb546a7d04cb395fddcf98a1092c (patch) | |
| tree | f640a44c1dd62545a7b59712280ef4286d9ee373 | |
| parent | 283ab1c0bd462dd0b179393fb081a626f6687413 (diff) | |
x86, boot: use BP_scratch in arch/x86/boot/compressed/head_*.S
Use the BP_scratch symbol from asm-offsets.h instead of hard-coding
the location.
[ Impact: cleanup ]
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | arch/x86/boot/compressed/head_32.S | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/head_64.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S index 85bd3285706d..e3398f3d1b34 100644 --- a/arch/x86/boot/compressed/head_32.S +++ b/arch/x86/boot/compressed/head_32.S | |||
| @@ -53,7 +53,7 @@ ENTRY(startup_32) | |||
| 53 | * data at 0x1e4 (defined as a scratch field) are used as the stack | 53 | * data at 0x1e4 (defined as a scratch field) are used as the stack |
| 54 | * for this calculation. Only 4 bytes are needed. | 54 | * for this calculation. Only 4 bytes are needed. |
| 55 | */ | 55 | */ |
| 56 | leal (0x1e4+4)(%esi), %esp | 56 | leal (BP_scratch+4)(%esi), %esp |
| 57 | call 1f | 57 | call 1f |
| 58 | 1: popl %ebp | 58 | 1: popl %ebp |
| 59 | subl $1b, %ebp | 59 | subl $1b, %ebp |
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index ed4a82948002..06cc7e59352b 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S | |||
| @@ -56,7 +56,7 @@ ENTRY(startup_32) | |||
| 56 | * data at 0x1e4 (defined as a scratch field) are used as the stack | 56 | * data at 0x1e4 (defined as a scratch field) are used as the stack |
| 57 | * for this calculation. Only 4 bytes are needed. | 57 | * for this calculation. Only 4 bytes are needed. |
| 58 | */ | 58 | */ |
| 59 | leal (0x1e4+4)(%esi), %esp | 59 | leal (BP_scratch+4)(%esi), %esp |
| 60 | call 1f | 60 | call 1f |
| 61 | 1: popl %ebp | 61 | 1: popl %ebp |
| 62 | subl $1b, %ebp | 62 | subl $1b, %ebp |