diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-25 04:45:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-25 04:47:00 -0400 |
| commit | 704daf55c7297e727021063cb5d8ba1c55b84426 (patch) | |
| tree | 15e7b49c69f1ba742ec5fb3a009e51e1564d6a75 /arch/x86/kernel/head_32.S | |
| parent | b0c6fbe458183cc7e1cab17be6efcbe7e435bad3 (diff) | |
| parent | 123f3e1d76952759c0fc8b4fec55a3fc8084d56f (diff) | |
Merge branch 'x86/asm' into x86/urgent
Merge reason: The linker script cleanups are ready for upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/head_32.S')
| -rw-r--r-- | arch/x86/kernel/head_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index b766e8c7252d..0ad4302ba975 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
| @@ -79,7 +79,7 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE) | |||
| 79 | * any particular GDT layout, because we load our own as soon as we | 79 | * any particular GDT layout, because we load our own as soon as we |
| 80 | * can. | 80 | * can. |
| 81 | */ | 81 | */ |
| 82 | .section .text.head,"ax",@progbits | 82 | __HEAD |
| 83 | ENTRY(startup_32) | 83 | ENTRY(startup_32) |
| 84 | /* test KEEP_SEGMENTS flag to see if the bootloader is asking | 84 | /* test KEEP_SEGMENTS flag to see if the bootloader is asking |
| 85 | us to not reload segments */ | 85 | us to not reload segments */ |