diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-11 11:55:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-11 11:55:42 -0400 |
| commit | 940010c5a314a7bd9b498593bc6ba1718ac5aec5 (patch) | |
| tree | d141e08ced08c40c6a8e3ab2cdecde5ff14e560f /arch/x86/kernel/head_32.S | |
| parent | 8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/exit.c
Diffstat (limited to 'arch/x86/kernel/head_32.S')
| -rw-r--r-- | arch/x86/kernel/head_32.S | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 30683883e0cd..dc5ed4bdd88d 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
| @@ -608,13 +608,6 @@ ignore_int: | |||
| 608 | ENTRY(initial_code) | 608 | ENTRY(initial_code) |
| 609 | .long i386_start_kernel | 609 | .long i386_start_kernel |
| 610 | 610 | ||
| 611 | .section .text | ||
| 612 | /* | ||
| 613 | * Real beginning of normal "text" segment | ||
| 614 | */ | ||
| 615 | ENTRY(stext) | ||
| 616 | ENTRY(_stext) | ||
| 617 | |||
| 618 | /* | 611 | /* |
| 619 | * BSS section | 612 | * BSS section |
| 620 | */ | 613 | */ |