diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/i386/kernel/vmlinux.lds.S | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/i386/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/i386/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S index 761972f8cb6..13b9c62cbbb 100644 --- a/arch/i386/kernel/vmlinux.lds.S +++ b/arch/i386/kernel/vmlinux.lds.S | |||
| @@ -22,6 +22,7 @@ SECTIONS | |||
| 22 | *(.text) | 22 | *(.text) |
| 23 | SCHED_TEXT | 23 | SCHED_TEXT |
| 24 | LOCK_TEXT | 24 | LOCK_TEXT |
| 25 | KPROBES_TEXT | ||
| 25 | *(.fixup) | 26 | *(.fixup) |
| 26 | *(.gnu.warning) | 27 | *(.gnu.warning) |
| 27 | } = 0x9090 | 28 | } = 0x9090 |