From: Roland McGrath Date: Wed, 30 Jan 2008 12:30:42 +0000 (+0100) Subject: x86 vDSO: vdso32 setup X-Git-Tag: v2.6.25-rc1~1143^2~734 X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=f288f32dc51042fd3a493b85b226e63f1ad3edcc;p=linux-2.6-omap-h63xx.git 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 Cc: Andrew Morton Cc: Linus Torvalds Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32 index 0eef8226753..2c9596b9349 100644 --- a/arch/x86/kernel/Makefile_32 +++ b/arch/x86/kernel/Makefile_32 @@ -33,7 +33,6 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o obj-$(CONFIG_KPROBES) += kprobes_32.o obj-$(CONFIG_MODULES) += module_32.o -obj-y += sysenter_32.o obj-$(CONFIG_ACPI_SRAT) += srat_32.o obj-$(CONFIG_EFI) += efi_32.o efi_stub_32.o obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile index ca2aabf8ed3..1efe785979a 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 # files to link into kernel obj-$(VDSO64-y) += vma.o vdso.o -obj-$(CONFIG_X86_32) += vdso32.o +obj-$(CONFIG_X86_32) += vdso32.o vdso32-setup.o vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) diff --git a/arch/x86/kernel/sysenter_32.c b/arch/x86/vdso/vdso32-setup.c similarity index 100% rename from arch/x86/kernel/sysenter_32.c rename to arch/x86/vdso/vdso32-setup.c