浏览代码

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>
Ingo Molnar 10 年之前
父节点
当前提交
d603c8e184

+ 1 - 1
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>

+ 1 - 1
arch/x86/Kbuild

@@ -14,7 +14,7 @@ obj-y += kernel/
 obj-y += mm/
 
 obj-y += crypto/
-obj-y += vdso/
+
 obj-$(CONFIG_IA32_EMULATION) += ia32/
 
 obj-y += platform/

+ 1 - 1
arch/x86/Makefile

@@ -244,7 +244,7 @@ install:
 
 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

+ 2 - 0
arch/x86/entry/Makefile

@@ -3,5 +3,7 @@
 #
 obj-y				:= entry_$(BITS).o
 
+obj-y				+= vdso/
+
 obj-$(CONFIG_IA32_EMULATION)	+= ia32entry.o
 

+ 0 - 0
arch/x86/vdso/.gitignore → arch/x86/entry/vdso/.gitignore


+ 0 - 0
arch/x86/vdso/Makefile → arch/x86/entry/vdso/Makefile


+ 0 - 0
arch/x86/vdso/checkundef.sh → arch/x86/entry/vdso/checkundef.sh


+ 0 - 0
arch/x86/vdso/vclock_gettime.c → arch/x86/entry/vdso/vclock_gettime.c


+ 0 - 0
arch/x86/vdso/vdso-layout.lds.S → arch/x86/entry/vdso/vdso-layout.lds.S


+ 0 - 0
arch/x86/vdso/vdso-note.S → arch/x86/entry/vdso/vdso-note.S


+ 0 - 0
arch/x86/vdso/vdso.lds.S → arch/x86/entry/vdso/vdso.lds.S


+ 0 - 0
arch/x86/vdso/vdso2c.c → arch/x86/entry/vdso/vdso2c.c


+ 0 - 0
arch/x86/vdso/vdso2c.h → arch/x86/entry/vdso/vdso2c.h


+ 0 - 0
arch/x86/vdso/vdso32-setup.c → arch/x86/entry/vdso/vdso32-setup.c


+ 0 - 0
arch/x86/vdso/vdso32/.gitignore → arch/x86/entry/vdso/vdso32/.gitignore


+ 0 - 0
arch/x86/vdso/vdso32/int80.S → arch/x86/entry/vdso/vdso32/int80.S


+ 0 - 0
arch/x86/vdso/vdso32/note.S → arch/x86/entry/vdso/vdso32/note.S


+ 0 - 0
arch/x86/vdso/vdso32/sigreturn.S → arch/x86/entry/vdso/vdso32/sigreturn.S


+ 0 - 0
arch/x86/vdso/vdso32/syscall.S → arch/x86/entry/vdso/vdso32/syscall.S


+ 0 - 0
arch/x86/vdso/vdso32/sysenter.S → arch/x86/entry/vdso/vdso32/sysenter.S


+ 0 - 0
arch/x86/vdso/vdso32/vclock_gettime.c → arch/x86/entry/vdso/vdso32/vclock_gettime.c


+ 0 - 0
arch/x86/vdso/vdso32/vdso-fakesections.c → arch/x86/entry/vdso/vdso32/vdso-fakesections.c


+ 0 - 0
arch/x86/vdso/vdso32/vdso32.lds.S → arch/x86/entry/vdso/vdso32/vdso32.lds.S


+ 0 - 0
arch/x86/vdso/vdsox32.lds.S → arch/x86/entry/vdso/vdsox32.lds.S


+ 0 - 0
arch/x86/vdso/vgetcpu.c → arch/x86/entry/vdso/vgetcpu.c


+ 0 - 0
arch/x86/vdso/vma.c → arch/x86/entry/vdso/vma.c