diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:13:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:13:13 -0400 |
| commit | 565b56cc9929fd4e682850df960f0766c8363383 (patch) | |
| tree | e720eaa6ad8a16c7bf8402dc76b3d65fb3f61f5a | |
| parent | fcaf15d788dc0c8354dbcf449e260cb303120b75 (diff) | |
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 8d80220932f8..d9dd3d677b72 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile | |||
| @@ -52,7 +52,7 @@ obj-$(CONFIG_SCx200) += scx200_32.o | |||
| 52 | # Note: kbuild does not track this dependency due to usage of .incbin | 52 | # Note: kbuild does not track this dependency due to usage of .incbin |
| 53 | $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so | 53 | $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so |
| 54 | targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so) | 54 | targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so) |
| 55 | targets += vsyscall-note.o vsyscall_32.lds | 55 | targets += vsyscall-note_32.o vsyscall_32.lds |
| 56 | 56 | ||
| 57 | # The DSO images are built using a special linker script. | 57 | # The DSO images are built using a special linker script. |
| 58 | quiet_cmd_syscall = SYSCALL $@ | 58 | quiet_cmd_syscall = SYSCALL $@ |
| @@ -68,7 +68,7 @@ SYSCFLAGS_vsyscall-int80_32.so = $(vsyscall-flags) | |||
| 68 | 68 | ||
| 69 | $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so: \ | 69 | $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so: \ |
| 70 | $(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \ | 70 | $(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \ |
| 71 | $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE | 71 | $(obj)/vsyscall-%.o $(obj)/vsyscall-note_32.o FORCE |
| 72 | $(call if_changed,syscall) | 72 | $(call if_changed,syscall) |
| 73 | 73 | ||
| 74 | # We also create a special relocatable object that should mirror the symbol | 74 | # 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 | |||
| 80 | 80 | ||
| 81 | SYSCFLAGS_vsyscall-syms.o = -r | 81 | SYSCFLAGS_vsyscall-syms.o = -r |
| 82 | $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \ | 82 | $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \ |
| 83 | $(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note.o FORCE | 83 | $(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note_32.o FORCE |
| 84 | $(call if_changed,syscall) | 84 | $(call if_changed,syscall) |
| 85 | 85 | ||
| 86 | k8-y += ../../x86_64/kernel/k8.o | 86 | 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 | |||
diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86_64/ia32/vsyscall-sigreturn.S index 1384367cdbe1..83e7fd683c3d 100644 --- a/arch/x86_64/ia32/vsyscall-sigreturn.S +++ b/arch/x86_64/ia32/vsyscall-sigreturn.S | |||
| @@ -139,5 +139,5 @@ __kernel_rt_sigreturn: | |||
| 139 | .align 4 | 139 | .align 4 |
| 140 | .LENDFDE3: | 140 | .LENDFDE3: |
| 141 | 141 | ||
| 142 | #include "../../i386/kernel/vsyscall-note.S" | 142 | #include "../../i386/kernel/vsyscall-note_32.S" |
| 143 | 143 | ||