Merge branches 'misc' and 'vdso' into for-next (6b7acae7) · Commits · 戴 / test

arch/arm/kernel/head-nommu.S

+6 −6

Original line number	Diff line number	Diff line
		@@ -80,9 +80,9 @@ ENTRY(stext)
		ldr r13, =__mmap_switched @ address to jump to after
		@ initialising sctlr
		adr lr, BSYM(1f) @ return (PIC) address
		ARM( add pc, r10, #PROCINFO_INITFUNC )
		THUMB( add r12, r10, #PROCINFO_INITFUNC )
		THUMB( ret r12 )
		ldr r12, [r10, #PROCINFO_INITFUNC]
		add r12, r12, r10
		ret r12
		1: b __after_proc_init
		ENDPROC(stext)

		@@ -117,9 +117,9 @@ ENTRY(secondary_startup)

		adr lr, BSYM(__after_proc_init) @ return address
		mov r13, r12 @ __secondary_switched address
		ARM( add pc, r10, #PROCINFO_INITFUNC )
		THUMB( add r12, r10, #PROCINFO_INITFUNC )
		THUMB( ret r12 )
		ldr r12, [r10, #PROCINFO_INITFUNC]
		add r12, r12, r10
		ret r12
		ENDPROC(secondary_startup)

		ENTRY(__secondary_switched)

+1 −1

Original line number	Diff line number	Diff line
		@@ -827,7 +827,7 @@ config KUSER_HELPERS

		config VDSO
		bool "Enable VDSO for acceleration of some system calls"
		depends on AEABI && MMU
		depends on AEABI && MMU && CPU_V7
		default y if ARM_ARCH_TIMER
		select GENERIC_TIME_VSYSCALL
		help

+2 −0

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@ ccflags-y := -shared -fPIC -fno-common -fno-builtin -fno-stack-protector
		ccflags-y += -nostdlib -Wl,-soname=linux-vdso.so.1 -DDISABLE_BRANCH_PROFILING
		ccflags-y += -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)

		obj-y += vdso.o
		extra-y += vdso.lds
		obj-$(CONFIG_VDSO) += vdso.o
		extra-$(CONFIG_VDSO) += vdso.lds
		CPPFLAGS_vdso.lds += -P -C -U$(ARCH)

		CFLAGS_REMOVE_vdso.o = -pg