diff options
author | Roland McGrath <roland@redhat.com> | 2008-01-30 07:30:42 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:42 -0500 |
commit | f288f32dc51042fd3a493b85b226e63f1ad3edcc (patch) | |
tree | 1f36abace6f4263c36e3e5d2c359cc25fd8cf8e3 | |
parent | 85a93b95dcd24023e0590ba4852ebff29208491a (diff) |
x86 vDSO: vdso32 setup
This moves arch/x86/kernel/sysenter_32.c to arch/x86/vdso/vdso32-setup.c,
keeping all the code relating only to vDSO magic in the vdso/ subdirectory.
This is a pure renaming, but it paves the way to consolidating the code for
dealing with 32-bit vDSOs across CONFIG_X86_32 and CONFIG_IA32_EMULATION.
Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/kernel/Makefile_32 | 1 | ||||
-rw-r--r-- | arch/x86/vdso/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/vdso/vdso32-setup.c (renamed from arch/x86/kernel/sysenter_32.c) | 0 |
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32 index 0eef8226753b..2c9596b9349c 100644 --- a/arch/x86/kernel/Makefile_32 +++ b/arch/x86/kernel/Makefile_32 | |||
@@ -33,7 +33,6 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o | |||
33 | obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o | 33 | obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o |
34 | obj-$(CONFIG_KPROBES) += kprobes_32.o | 34 | obj-$(CONFIG_KPROBES) += kprobes_32.o |
35 | obj-$(CONFIG_MODULES) += module_32.o | 35 | obj-$(CONFIG_MODULES) += module_32.o |
36 | obj-y += sysenter_32.o | ||
37 | obj-$(CONFIG_ACPI_SRAT) += srat_32.o | 36 | obj-$(CONFIG_ACPI_SRAT) += srat_32.o |
38 | obj-$(CONFIG_EFI) += efi_32.o efi_stub_32.o | 37 | obj-$(CONFIG_EFI) += efi_32.o efi_stub_32.o |
39 | obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o | 38 | obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o |
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile index ca2aabf8ed39..1efe785979a2 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile | |||
@@ -15,7 +15,7 @@ vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vvar.o | |||
15 | 15 | ||
16 | # files to link into kernel | 16 | # files to link into kernel |
17 | obj-$(VDSO64-y) += vma.o vdso.o | 17 | obj-$(VDSO64-y) += vma.o vdso.o |
18 | obj-$(CONFIG_X86_32) += vdso32.o | 18 | obj-$(CONFIG_X86_32) += vdso32.o vdso32-setup.o |
19 | 19 | ||
20 | vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) | 20 | vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) |
21 | 21 | ||
diff --git a/arch/x86/kernel/sysenter_32.c b/arch/x86/vdso/vdso32-setup.c index 85c52d23ee40..85c52d23ee40 100644 --- a/arch/x86/kernel/sysenter_32.c +++ b/arch/x86/vdso/vdso32-setup.c | |||