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/MAINTAINERS b/MAINTAINERS
index f8e0afb708b4fe2a60f3f6a3b697bd1dd60753d4..68c0cc3654328d07d232ac5a2c7a014bb6990623 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10892,7 +10892,7 @@ M:      Andy Lutomirski <luto@amacapital.net>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
 S:     Maintained
-F:     arch/x86/vdso/
+F:     arch/x86/entry/vdso/
 
 XC2028/3028 TUNER DRIVER
 M:     Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --cc arch/x86/Kbuild
Simple merge

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/entry/Makefile
Simple merge

diff --cc arch/x86/entry/vdso/.gitignore
Simple merge

diff --cc arch/x86/entry/vdso/Makefile
Simple merge

diff --cc arch/x86/entry/vdso/checkundef.sh
Simple merge

diff --cc arch/x86/entry/vdso/vclock_gettime.c
Simple merge

diff --cc arch/x86/entry/vdso/vdso-layout.lds.S
Simple merge

diff --cc arch/x86/entry/vdso/vdso-note.S
Simple merge

diff --cc arch/x86/entry/vdso/vdso.lds.S
Simple merge

diff --cc arch/x86/entry/vdso/vdso2c.c
Simple merge

diff --cc arch/x86/entry/vdso/vdso2c.h
Simple merge

diff --cc arch/x86/entry/vdso/vdso32-setup.c
Simple merge

diff --cc arch/x86/entry/vdso/vdso32/.gitignore
Simple merge

diff --cc arch/x86/entry/vdso/vdso32/int80.S
Simple merge

diff --cc arch/x86/entry/vdso/vdso32/note.S
Simple merge

diff --cc arch/x86/entry/vdso/vdso32/sigreturn.S
Simple merge

diff --cc arch/x86/entry/vdso/vdso32/syscall.S
Simple merge

diff --cc arch/x86/entry/vdso/vdso32/sysenter.S
Simple merge

diff --cc arch/x86/entry/vdso/vdso32/vclock_gettime.c
Simple merge

diff --cc arch/x86/entry/vdso/vdso32/vdso-fakesections.c
Simple merge

diff --cc arch/x86/entry/vdso/vdso32/vdso32.lds.S
Simple merge

diff --cc arch/x86/entry/vdso/vdsox32.lds.S
Simple merge

diff --cc arch/x86/entry/vdso/vgetcpu.c
Simple merge

diff --cc arch/x86/entry/vdso/vma.c
Simple merge