Commit fb65d872 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "A few fixes for the recently merged development updates:

   - the update to convert a code branch in the procinfo structure
     forgot to update the nommu code.

   - VDSO only supported for V7 CPUs and later.

   - VDSO build creates files which should be ignored by git but are not.

   - ensure that make arch/arm/vdso/ doesn't build if it isn't enabled"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile
  ARM: 8343/1: VDSO: add build artifacts to .gitignore
  ARM: Fix nommu booting
  ARM: 8342/1: VDSO: depend on CPU_V7
parents 05f0c553 6b7acae7

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)

arch/arm/mm/Kconfig

+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

arch/arm/vdso/.gitignore

+2 −0
Original line number Diff line number Diff line 
vdso.lds

vdso.so.raw

vdsomunge

arch/arm/vdso/Makefile

+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

CRA Git | Maintained and supported by SUSTech CRA and CCSE