diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-15 16:59:00 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-15 16:59:00 -0700 |
commit | 08848e446bcd2130c26945be966446389d25bcc2 (patch) | |
tree | e31e6ec7a1d9e8f6bbf8cdee2692eb42f4869f47 /arch/um/kernel/uml.lds.S | |
parent | 46906c4415f88cebfad530917bada0835d651824 (diff) | |
parent | 38d84c3bd6dd22bdb1f797c87006931133d71aea (diff) |
Auto merge with /home/aegl/GIT/linus
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 163476a8cb1b..b03326d391c9 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S @@ -16,8 +16,8 @@ SECTIONS __binary_start = .; #ifdef MODE_TT - .remap_data : { arch/um/sys-SUBARCH/unmap_fin.o (.data .bss) } - .remap : { arch/um/sys-SUBARCH/unmap_fin.o (.text) } + .remap_data : { UNMAP_PATH (.data .bss) } + .remap : { UNMAP_PATH (.text) } . = ALIGN(4096); /* Init code and data */ #endif |