diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:12:30 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:12:30 +0200 |
| commit | 24f5b95bb91a6edac5dfdc7ddcbd6cabe0b30430 (patch) | |
| tree | 1a0e1fb56f7f6138b8cc7e010675320063b227bf /arch/i386 | |
| parent | d4c3a41e9a1f72bb995a6fb89ad028eda9a14c3d (diff) | |
i386: prepare shared kernel/vsyscall-int80.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-int80_32.S (renamed from arch/i386/kernel/vsyscall-int80.S) | 0 | ||||
| -rw-r--r-- | arch/i386/kernel/vsyscall_32.S | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 38d2b469a891..84297d470df2 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -50,7 +50,7 @@ obj-$(CONFIG_SCx200) += scx200.o # 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_32.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so +$(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter.so targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so) targets += vsyscall-note.o vsyscall_32.lds @@ -64,9 +64,9 @@ export CPPFLAGS_vsyscall_32.lds += -P -C -U$(ARCH) vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \ $(call ld-option, -Wl$(comma)--hash-style=sysv) SYSCFLAGS_vsyscall-sysenter.so = $(vsyscall-flags) -SYSCFLAGS_vsyscall-int80.so = $(vsyscall-flags) +SYSCFLAGS_vsyscall-int80_32.so = $(vsyscall-flags) -$(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \ +$(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter.so: \ $(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \ $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE $(call if_changed,syscall) diff --git a/arch/i386/kernel/vsyscall-int80.S b/arch/i386/kernel/vsyscall-int80_32.S index 530d0525e5e2..530d0525e5e2 100644 --- a/arch/i386/kernel/vsyscall-int80.S +++ b/arch/i386/kernel/vsyscall-int80_32.S diff --git a/arch/i386/kernel/vsyscall_32.S b/arch/i386/kernel/vsyscall_32.S index b403890fe39b..033074479fca 100644 --- a/arch/i386/kernel/vsyscall_32.S +++ b/arch/i386/kernel/vsyscall_32.S @@ -4,12 +4,12 @@ __INITDATA .globl vsyscall_int80_start, vsyscall_int80_end vsyscall_int80_start: - .incbin "arch/i386/kernel/vsyscall-int80.so" + .incbin "arch/i386/kernel/vsyscall-int80_32.so" vsyscall_int80_end: .globl vsyscall_sysenter_start, vsyscall_sysenter_end vsyscall_sysenter_start: - .incbin "arch/i386/kernel/vsyscall-sysenter.so" + .incbin "arch/i386/kernel/vsyscall-sysenter_32.so" vsyscall_sysenter_end: __FINIT |