Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c2f51a7 authored Jan 30, 2008 by Roland McGrath Committed by Ingo Molnar Jan 30, 2008

x86 vDSO: arch/x86/vdso/vdso32

This moves the i386 vDSO sources into arch/x86/vdso/vdso32/, a
new directory.  This patch is a pure renaming, but paves the way
for consolidating the vDSO build logic.

Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 108b5451

arch/x86/ia32/vsyscall-sigreturn.S

+1 −2

Original line number	Diff line number	Diff line
		@@ -139,5 +139,4 @@ __kernel_rt_sigreturn:
		.align 4
		.LENDFDE3:

		#include "../../x86/kernel/vsyscall-note_32.S"

		#include "../vdso/vdso32/note.S"

arch/x86/kernel/Makefile_32

+3 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,9 @@ $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so
		targets += $(foreach F,int80 sysenter,vsyscall-$F_32.o vsyscall-$F_32.so)
		targets += vsyscall-note_32.o vsyscall_32.lds

		$(obj)/vsyscall-%_32.o: $(src)/../vdso/vdso32/%.S
		$(call if_changed_dep,as_o_S)

		# The DSO images are built using a special linker script.
		quiet_cmd_syscall = SYSCALL $@
		cmd_syscall = $(CC) -m elf_i386 -nostdlib $(SYSCFLAGS_$(@F)) \

arch/x86/kernel/vsyscall-int80_32.S→arch/x86/vdso/vdso32/int80.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,4 +50,4 @@ __kernel_vsyscall:
		/*
		* Get the common code for the sigreturn entry points.
		*/
		#include "vsyscall-sigreturn_32.S"
		#include "sigreturn.S"

arch/x86/kernel/vsyscall-note_32.S→arch/x86/vdso/vdso32/note.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ ELFNOTE_END
		* at boot time we set VDSO_NOTE_NONEGSEG_BIT if running under Xen.
		*/

		#include "../../x86/xen/vdso.h" /* Defines VDSO_NOTE_NONEGSEG_BIT. */
		#include "../../xen/vdso.h" /* Defines VDSO_NOTE_NONEGSEG_BIT. */

		.globl VDSO_NOTE_MASK
		ELFNOTE_START(GNU, 2, "a")

arch/x86/kernel/vsyscall-sigreturn_32.S→arch/x86/vdso/vdso32/sigreturn.S

+2 −2

File changed and moved.

Contains only whitespace changes.