diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /arch/i386/kernel/vsyscall.lds.S | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'arch/i386/kernel/vsyscall.lds.S')
| -rw-r--r-- | arch/i386/kernel/vsyscall.lds.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/vsyscall.lds.S b/arch/i386/kernel/vsyscall.lds.S index 98699ca6e52d..e26975fc68b6 100644 --- a/arch/i386/kernel/vsyscall.lds.S +++ b/arch/i386/kernel/vsyscall.lds.S | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | SECTIONS | 8 | SECTIONS |
| 9 | { | 9 | { |
| 10 | . = VSYSCALL_BASE + SIZEOF_HEADERS; | 10 | . = VDSO_PRELINK + SIZEOF_HEADERS; |
| 11 | 11 | ||
| 12 | .hash : { *(.hash) } :text | 12 | .hash : { *(.hash) } :text |
| 13 | .dynsym : { *(.dynsym) } | 13 | .dynsym : { *(.dynsym) } |
| @@ -20,7 +20,7 @@ SECTIONS | |||
| 20 | For the layouts to match, we need to skip more than enough | 20 | For the layouts to match, we need to skip more than enough |
| 21 | space for the dynamic symbol table et al. If this amount | 21 | space for the dynamic symbol table et al. If this amount |
| 22 | is insufficient, ld -shared will barf. Just increase it here. */ | 22 | is insufficient, ld -shared will barf. Just increase it here. */ |
| 23 | . = VSYSCALL_BASE + 0x400; | 23 | . = VDSO_PRELINK + 0x400; |
| 24 | 24 | ||
| 25 | .text : { *(.text) } :text =0x90909090 | 25 | .text : { *(.text) } :text =0x90909090 |
| 26 | .note : { *(.note.*) } :text :note | 26 | .note : { *(.note.*) } :text :note |