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 /arch/i386/kernel | |
| parent | i386: prepare shared kernel/machine_kexec.c (diff) | |
| download | linux-dev-565b56cc9929fd4e682850df960f0766c8363383.tar.xz linux-dev-565b56cc9929fd4e682850df960f0766c8363383.zip | |
i386: prepare shared kernel/vsyscall-note.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386/kernel')
| -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 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 8d80220932f8..d9dd3d677b72 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 07c0daf78237..07c0daf78237 100644 --- a/arch/i386/kernel/vsyscall-note.S +++ b/arch/i386/kernel/vsyscall-note_32.S |