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

Commit c848791f authored by Russell King's avatar Russell King
Browse files

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

Conflicts:
	arch/arm/mm/proc-macros.S
parents 79403cda e5b61deb 6c5c2a01

arch/arm/Makefile

+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: prepare scripts 
dtbs_install:

	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts



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/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line 




generic-y += auxvec.h

generic-y += bitsperlong.h

generic-y += cputime.h

generic-y += current.h

arch/arm/include/asm/auxvec.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include <uapi/asm/auxvec.h>

arch/arm/include/asm/elf.h

+10 −1
Original line number Diff line number Diff line 
#ifndef __ASMARM_ELF_H

#define __ASMARM_ELF_H



#include <asm/auxvec.h>

#include <asm/hwcap.h>

#include <asm/vdso_datapage.h>



/*

 * ELF register definitions..
@@ -115,7 +117,7 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs); 
   the loader.  We need to make sure that it is out of the way of the program

   that it will "exec", and that there is sufficient room for the brk.  */



#define ELF_ET_DYN_BASE	(2 * TASK_SIZE / 3)

#define ELF_ET_DYN_BASE	(TASK_SIZE / 3 * 2)



/* When the program starts, a1 contains a pointer to a function to be 

   registered with atexit, as per the SVR4 ABI.  A value of 0 means we
@@ -130,6 +132,13 @@ extern unsigned long arch_randomize_brk(struct mm_struct *mm); 
#define arch_randomize_brk arch_randomize_brk



#ifdef CONFIG_MMU

#ifdef CONFIG_VDSO

#define ARCH_DLINFO						\

do {								\

	NEW_AUX_ENT(AT_SYSINFO_EHDR,				\

		    (elf_addr_t)current->mm->context.vdso);	\

} while (0)

#endif

#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1

struct linux_binprm;

int arch_setup_additional_pages(struct linux_binprm *, int);

arch/arm/include/asm/mmu.h

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ typedef struct { 
#endif

	unsigned int	vmalloc_seq;

	unsigned long	sigpage;

#ifdef CONFIG_VDSO

	unsigned long	vdso;

#endif

} mm_context_t;



#ifdef CONFIG_CPU_HAS_ASID