Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branches 'misc' and 'vdso' into for-next

Browse source
This commit is contained in:
Russell King 2015-04-23 21:05:16 +00:00
commit 6b7acae74f
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/kernel/head-nommu.S
View file

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

2
arch/arm/mm/Kconfig
View file

@ -827,7 +827,7 @@ config KUSER_HELPERS
config VDSO config VDSO
bool "Enable VDSO for acceleration of some system calls" 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 default y if ARM_ARCH_TIMER
select GENERIC_TIME_VSYSCALL select GENERIC_TIME_VSYSCALL
help help

2
arch/arm/vdso/.gitignore vendored
View file

@ -1 +1,3 @@
vdso.lds vdso.lds
vdso.so.raw
vdsomunge

4
arch/arm/vdso/Makefile
View file

@ -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 += -nostdlib -Wl,-soname=linux-vdso.so.1 -DDISABLE_BRANCH_PROFILING
ccflags-y += -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) ccflags-y += -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
obj-y += vdso.o obj-$(CONFIG_VDSO) += vdso.o
extra-y += vdso.lds extra-$(CONFIG_VDSO) += vdso.lds
CPPFLAGS_vdso.lds += -P -C -U$(ARCH) CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
CFLAGS_REMOVE_vdso.o = -pg CFLAGS_REMOVE_vdso.o = -pg