diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 21:23:18 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 21:23:18 -0400 |
| commit | c2f90e9536887fb76fb6a2aa239a70fc49beda10 (patch) | |
| tree | f87e6b29248c45a92ec6b4b8ffe675bb52e6104b /arch/x86/kernel | |
| parent | f3409f71a76838b1bc985f753eed787a3f17bc2c (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/head_32.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index f67e93441caf..a7010c3a377a 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
| @@ -456,9 +456,6 @@ is386: movl $2,%ecx # set MP | |||
| 456 | 1: | 456 | 1: |
| 457 | #endif /* CONFIG_SMP */ | 457 | #endif /* CONFIG_SMP */ |
| 458 | jmp *(initial_code) | 458 | jmp *(initial_code) |
| 459 | .align 4 | ||
| 460 | ENTRY(initial_code) | ||
| 461 | .long i386_start_kernel | ||
| 462 | 459 | ||
| 463 | /* | 460 | /* |
| 464 | * We depend on ET to be correct. This checks for 287/387. | 461 | * We depend on ET to be correct. This checks for 287/387. |
| @@ -601,6 +598,11 @@ ignore_int: | |||
| 601 | #endif | 598 | #endif |
| 602 | iret | 599 | iret |
| 603 | 600 | ||
| 601 | .section .cpuinit.data,"wa" | ||
| 602 | .align 4 | ||
| 603 | ENTRY(initial_code) | ||
| 604 | .long i386_start_kernel | ||
| 605 | |||
| 604 | .section .text | 606 | .section .text |
| 605 | /* | 607 | /* |
| 606 | * Real beginning of normal "text" segment | 608 | * Real beginning of normal "text" segment |