diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /arch/um/kernel/uml.lds.S | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/um/kernel/uml.lds.S')
| -rw-r--r-- | arch/um/kernel/uml.lds.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S index bc59f97e34d0..307b9373676b 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S | |||
| @@ -37,7 +37,7 @@ SECTIONS | |||
| 37 | 37 | ||
| 38 | .text : | 38 | .text : |
| 39 | { | 39 | { |
| 40 | *(.text) | 40 | TEXT_TEXT |
| 41 | SCHED_TEXT | 41 | SCHED_TEXT |
| 42 | LOCK_TEXT | 42 | LOCK_TEXT |
| 43 | *(.fixup) | 43 | *(.fixup) |
| @@ -61,7 +61,7 @@ SECTIONS | |||
| 61 | *(.data.init_task) | 61 | *(.data.init_task) |
| 62 | . = ALIGN(KERNEL_STACK_SIZE); | 62 | . = ALIGN(KERNEL_STACK_SIZE); |
| 63 | *(.data.init_irqstack) | 63 | *(.data.init_irqstack) |
| 64 | *(.data) | 64 | DATA_DATA |
| 65 | *(.gnu.linkonce.d*) | 65 | *(.gnu.linkonce.d*) |
| 66 | CONSTRUCTORS | 66 | CONSTRUCTORS |
| 67 | } | 67 | } |