diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 09:12:13 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 09:12:13 (GMT) |
| commit | cde82b404831aecccf2a1828b2dc643e0ac0e7ce (patch) | |
| tree | 2bd60ad7abcc9689ffcab3c4617a9b5d2b6cd534 /arch/i386 | |
| parent | a60b778b5a813c6b3663db9244f5a886f0f91027 (diff) | |
| download | linux-fsl-qoriq-cde82b404831aecccf2a1828b2dc643e0ac0e7ce.tar.xz | |
i386: prepare shared kernel/vsyscall.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/Makefile | 6 | ||||
| -rw-r--r-- | arch/i386/kernel/vsyscall_32.S (renamed from arch/i386/kernel/vsyscall.S) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 1f82d76..f502c14 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -31,7 +31,7 @@ obj-$(CONFIG_X86_NUMAQ) += numaq.o obj-$(CONFIG_X86_SUMMIT_NUMA) += summit.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_MODULES) += module_32.o -obj-y += sysenter.o vsyscall.o +obj-y += sysenter.o vsyscall_32.o obj-$(CONFIG_ACPI_SRAT) += srat_32.o obj-$(CONFIG_EFI) += efi_32.o efi_stub_32.o obj-$(CONFIG_DOUBLEFAULT) += doublefault.o @@ -47,10 +47,10 @@ obj-y += pcspeaker.o obj-$(CONFIG_SCx200) += scx200.o -# vsyscall.o contains the vsyscall DSO images as __initdata. +# vsyscall_32.o contains the vsyscall DSO images as __initdata. # We must build both images before we can assemble it. # Note: kbuild does not track this dependency due to usage of .incbin -$(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so +$(obj)/vsyscall_32.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so) targets += vsyscall-note.o vsyscall_32.lds diff --git a/arch/i386/kernel/vsyscall.S b/arch/i386/kernel/vsyscall_32.S index b403890..b403890 100644 --- a/arch/i386/kernel/vsyscall.S +++ b/arch/i386/kernel/vsyscall_32.S |