Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fd7b05d authored by Nathan Lynch's avatar Nathan Lynch Committed by Mark Salyzyn
Browse files

UPSTREAM: ARM: 8332/1: add CONFIG_VDSO Kconfig and Makefile bits 



(cherry pick from commit e5b61deb3af465f11db7e5e11944ba00a33ece1f)

Allow users to enable the vdso in Kconfig; include the vdso in the
build if CONFIG_VDSO is enabled.  Add 'vdso_install' target.

Signed-off-by: default avatarNathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Bug: 20045882
Bug: 19198045
Change-Id: Iedb822a2a3b0169cbcbdbb4ba55d6c7da29ad2c6
parent 85c392b1

arch/arm/Makefile

100644 → 100755
+8 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) 
core-$(CONFIG_VFP)		+= arch/arm/vfp/

core-$(CONFIG_XEN)		+= arch/arm/xen/

core-$(CONFIG_KVM_ARM_HOST) 	+= arch/arm/kvm/

core-$(CONFIG_VDSO)		+= arch/arm/vdso/



# If we have a machine-specific directory, then include it in the build.

core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
@@ -320,6 +321,12 @@ dtbs dtbs_install: prepare scripts 
zImage-dtb: vmlinux scripts dtbs

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@



PHONY += vdso_install

vdso_install:

ifeq ($(CONFIG_VDSO),y)

	$(Q)$(MAKE) $(build)=arch/arm/vdso $@

endif



# We use MRPROPER_FILES and CLEAN_FILES now

archclean:

	$(Q)$(MAKE) $(clean)=$(boot)
@@ -344,4 +351,5 @@ define archhelp 
  echo  '                  Install using (your) ~/bin/$(INSTALLKERNEL) or'

  echo  '                  (distribution) /sbin/$(INSTALLKERNEL) or'

  echo  '                  install to $$(INSTALL_PATH) and run lilo'

  echo  '  vdso_install  - Install unstripped vdso.so to $$(INSTALL_MOD_PATH)/vdso'

endef

arch/arm/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_regs.o 
obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o perf_event_cpu.o

AFLAGS_iwmmxt.o			:= -Wa,-mcpu=iwmmxt

obj-$(CONFIG_ARM_CPU_TOPOLOGY)  += topology.o

obj-$(CONFIG_VDSO)		+= vdso.o



ifneq ($(CONFIG_ARCH_EBSA110),y)

  obj-y		+= io.o

arch/arm/mm/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -825,6 +825,20 @@ config KUSER_HELPERS 
	  Say N here only if you are absolutely certain that you do not

	  need these helpers; otherwise, the safe option is to say Y.



config VDSO

	bool "Enable VDSO for acceleration of some system calls"

	depends on AEABI && MMU

	default y if ARM_ARCH_TIMER

	select GENERIC_TIME_VSYSCALL

	help

	  Place in the process address space an ELF shared object

	  providing fast implementations of gettimeofday and

	  clock_gettime.  Systems that implement the ARM architected

	  timer will receive maximum benefit.



	  You must have glibc 2.22 or later for programs to seamlessly

	  take advantage of this.



config DMA_CACHE_RWFO

	bool "Enable read/write for ownership DMA cache maintenance"

	depends on CPU_V6K && SMP