diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2014-05-05 23:19:36 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-06 00:19:01 +0400 |
| commit | f40c330091c7aa9956ab66f97a3abc8a68b67240 (patch) | |
| tree | b0c03dce9bf67eb15c98980a7323ca35122d10df /arch/x86/vdso/vdso-layout.lds.S | |
| parent | 18d0a6fd227177fd243993179c90e454d0638b06 (diff) | |
| download | linux-f40c330091c7aa9956ab66f97a3abc8a68b67240.tar.xz | |
x86, vdso: Move the vvar and hpet mappings next to the 64-bit vDSO
This makes the 64-bit and x32 vdsos use the same mechanism as the
32-bit vdso. Most of the churn is deleting all the old fixmap code.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/8af87023f57f6bb96ec8d17fce3f88018195b49b.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/vdso/vdso-layout.lds.S')
| -rw-r--r-- | arch/x86/vdso/vdso-layout.lds.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/vdso/vdso-layout.lds.S b/arch/x86/vdso/vdso-layout.lds.S index e177c08bb4bc..2ec72f651ebf 100644 --- a/arch/x86/vdso/vdso-layout.lds.S +++ b/arch/x86/vdso/vdso-layout.lds.S @@ -47,7 +47,6 @@ SECTIONS .text : { *(.text*) } :text =0x90909090, -#ifdef BUILD_VDSO32 /* * The remainder of the vDSO consists of special pages that are * shared between the kernel and userspace. It needs to be at the @@ -69,7 +68,6 @@ SECTIONS hpet_page = .; . = . + PAGE_SIZE; -#endif . = ALIGN(PAGE_SIZE); end_mapping = .; |