diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:13:13 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:13:13 +0200 |
| commit | 565b56cc9929fd4e682850df960f0766c8363383 (patch) | |
| tree | e720eaa6ad8a16c7bf8402dc76b3d65fb3f61f5a | |
| parent | fcaf15d788dc0c8354dbcf449e260cb303120b75 (diff) | |
| download | op-kernel-dev-565b56cc9929fd4e682850df960f0766c8363383.zip op-kernel-dev-565b56cc9929fd4e682850df960f0766c8363383.tar.gz | |
i386: prepare shared kernel/vsyscall-note.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/i386/kernel/Makefile | 6 | ||||
| -rw-r--r-- | arch/i386/kernel/vsyscall-note_32.S (renamed from arch/i386/kernel/vsyscall-note.S) | 0 | ||||
| -rw-r--r-- | arch/x86_64/ia32/vsyscall-sigreturn.S | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 8d80220..d9dd3d6 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -52,7 +52,7 @@ obj-$(CONFIG_SCx200) += scx200_32.o # Note: kbuild does not track this dependency due to usage of .incbin $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so) -targets += vsyscall-note.o vsyscall_32.lds +targets += vsyscall-note_32.o vsyscall_32.lds # The DSO images are built using a special linker script. quiet_cmd_syscall = SYSCALL $@ @@ -68,7 +68,7 @@ SYSCFLAGS_vsyscall-int80_32.so = $(vsyscall-flags) $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so: \ $(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \ - $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE + $(obj)/vsyscall-%.o $(obj)/vsyscall-note_32.o FORCE $(call if_changed,syscall) # We also create a special relocatable object that should mirror the symbol @@ -80,7 +80,7 @@ $(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o SYSCFLAGS_vsyscall-syms.o = -r $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \ - $(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note.o FORCE + $(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note_32.o FORCE $(call if_changed,syscall) k8-y += ../../x86_64/kernel/k8.o diff --git a/arch/i386/kernel/vsyscall-note.S b/arch/i386/kernel/vsyscall-note_32.S index 07c0daf..07c0daf 100644 --- a/arch/i386/kernel/vsyscall-note.S +++ b/arch/i386/kernel/vsyscall-note_32.S diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86_64/ia32/vsyscall-sigreturn.S index 1384367..83e7fd6 100644 --- a/arch/x86_64/ia32/vsyscall-sigreturn.S +++ b/arch/x86_64/ia32/vsyscall-sigreturn.S @@ -139,5 +139,5 @@ __kernel_rt_sigreturn: .align 4 .LENDFDE3: -#include "../../i386/kernel/vsyscall-note.S" +#include "../../i386/kernel/vsyscall-note_32.S" |
