| commit | d603c8e184d882cc3f55c599f4185bad956ee0a7 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Jun 03 18:05:44 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Jun 03 18:51:37 2015 +0200 |
| tree | 9af00f42ddd7fbdc1192e5708caaa3ef85103175 | |
| parent | 19a433f45135656d065bdf1bbe543796b194ba3a [diff] |
x86/asm/entry, x86/vdso: Move the vDSO code to arch/x86/entry/vdso/ Cc: Borislav Petkov <bp@alien8.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Brian Gerst <brgerst@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index b9b8162..1538562 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild
@@ -14,7 +14,7 @@ obj-y += mm/ obj-y += crypto/ -obj-y += vdso/ + obj-$(CONFIG_IA32_EMULATION) += ia32/ obj-y += platform/
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 43e8328..90b1c3b 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile
@@ -244,7 +244,7 @@ PHONY += vdso_install vdso_install: - $(Q)$(MAKE) $(build)=arch/x86/vdso $@ + $(Q)$(MAKE) $(build)=arch/x86/entry/vdso $@ archclean: $(Q)rm -rf $(objtree)/arch/i386
diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile index 4a62659..c975324 100644 --- a/arch/x86/entry/Makefile +++ b/arch/x86/entry/Makefile
@@ -3,5 +3,7 @@ # obj-y := entry_$(BITS).o +obj-y += vdso/ + obj-$(CONFIG_IA32_EMULATION) += ia32entry.o
diff --git a/arch/x86/vdso/.gitignore b/arch/x86/entry/vdso/.gitignore similarity index 100% rename from arch/x86/vdso/.gitignore rename to arch/x86/entry/vdso/.gitignore
diff --git a/arch/x86/vdso/Makefile b/arch/x86/entry/vdso/Makefile similarity index 100% rename from arch/x86/vdso/Makefile rename to arch/x86/entry/vdso/Makefile
diff --git a/arch/x86/vdso/checkundef.sh b/arch/x86/entry/vdso/checkundef.sh similarity index 100% rename from arch/x86/vdso/checkundef.sh rename to arch/x86/entry/vdso/checkundef.sh
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/entry/vdso/vclock_gettime.c similarity index 100% rename from arch/x86/vdso/vclock_gettime.c rename to arch/x86/entry/vdso/vclock_gettime.c
diff --git a/arch/x86/vdso/vdso-layout.lds.S b/arch/x86/entry/vdso/vdso-layout.lds.S similarity index 100% rename from arch/x86/vdso/vdso-layout.lds.S rename to arch/x86/entry/vdso/vdso-layout.lds.S
diff --git a/arch/x86/vdso/vdso-note.S b/arch/x86/entry/vdso/vdso-note.S similarity index 100% rename from arch/x86/vdso/vdso-note.S rename to arch/x86/entry/vdso/vdso-note.S
diff --git a/arch/x86/vdso/vdso.lds.S b/arch/x86/entry/vdso/vdso.lds.S similarity index 100% rename from arch/x86/vdso/vdso.lds.S rename to arch/x86/entry/vdso/vdso.lds.S
diff --git a/arch/x86/vdso/vdso2c.c b/arch/x86/entry/vdso/vdso2c.c similarity index 100% rename from arch/x86/vdso/vdso2c.c rename to arch/x86/entry/vdso/vdso2c.c
diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h similarity index 100% rename from arch/x86/vdso/vdso2c.h rename to arch/x86/entry/vdso/vdso2c.h
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/entry/vdso/vdso32-setup.c similarity index 100% rename from arch/x86/vdso/vdso32-setup.c rename to arch/x86/entry/vdso/vdso32-setup.c
diff --git a/arch/x86/vdso/vdso32/.gitignore b/arch/x86/entry/vdso/vdso32/.gitignore similarity index 100% rename from arch/x86/vdso/vdso32/.gitignore rename to arch/x86/entry/vdso/vdso32/.gitignore
diff --git a/arch/x86/vdso/vdso32/int80.S b/arch/x86/entry/vdso/vdso32/int80.S similarity index 100% rename from arch/x86/vdso/vdso32/int80.S rename to arch/x86/entry/vdso/vdso32/int80.S
diff --git a/arch/x86/vdso/vdso32/note.S b/arch/x86/entry/vdso/vdso32/note.S similarity index 100% rename from arch/x86/vdso/vdso32/note.S rename to arch/x86/entry/vdso/vdso32/note.S
diff --git a/arch/x86/vdso/vdso32/sigreturn.S b/arch/x86/entry/vdso/vdso32/sigreturn.S similarity index 100% rename from arch/x86/vdso/vdso32/sigreturn.S rename to arch/x86/entry/vdso/vdso32/sigreturn.S
diff --git a/arch/x86/vdso/vdso32/syscall.S b/arch/x86/entry/vdso/vdso32/syscall.S similarity index 100% rename from arch/x86/vdso/vdso32/syscall.S rename to arch/x86/entry/vdso/vdso32/syscall.S
diff --git a/arch/x86/vdso/vdso32/sysenter.S b/arch/x86/entry/vdso/vdso32/sysenter.S similarity index 100% rename from arch/x86/vdso/vdso32/sysenter.S rename to arch/x86/entry/vdso/vdso32/sysenter.S
diff --git a/arch/x86/vdso/vdso32/vclock_gettime.c b/arch/x86/entry/vdso/vdso32/vclock_gettime.c similarity index 100% rename from arch/x86/vdso/vdso32/vclock_gettime.c rename to arch/x86/entry/vdso/vdso32/vclock_gettime.c
diff --git a/arch/x86/vdso/vdso32/vdso-fakesections.c b/arch/x86/entry/vdso/vdso32/vdso-fakesections.c similarity index 100% rename from arch/x86/vdso/vdso32/vdso-fakesections.c rename to arch/x86/entry/vdso/vdso32/vdso-fakesections.c
diff --git a/arch/x86/vdso/vdso32/vdso32.lds.S b/arch/x86/entry/vdso/vdso32/vdso32.lds.S similarity index 100% rename from arch/x86/vdso/vdso32/vdso32.lds.S rename to arch/x86/entry/vdso/vdso32/vdso32.lds.S
diff --git a/arch/x86/vdso/vdsox32.lds.S b/arch/x86/entry/vdso/vdsox32.lds.S similarity index 100% rename from arch/x86/vdso/vdsox32.lds.S rename to arch/x86/entry/vdso/vdsox32.lds.S
diff --git a/arch/x86/vdso/vgetcpu.c b/arch/x86/entry/vdso/vgetcpu.c similarity index 100% rename from arch/x86/vdso/vgetcpu.c rename to arch/x86/entry/vdso/vgetcpu.c
diff --git a/arch/x86/vdso/vma.c b/arch/x86/entry/vdso/vma.c similarity index 100% rename from arch/x86/vdso/vma.c rename to arch/x86/entry/vdso/vma.c