Merge "ARM: fix nommu builds with 48be69a02 (ARM: move signal handlers into a vdso-like page)" (4f9af90e) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/include/asm/elf.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -130,8 +130,10 @@ struct mm_struct;
		extern unsigned long arch_randomize_brk(struct mm_struct *mm);
		#define arch_randomize_brk arch_randomize_brk

		#ifdef CONFIG_MMU
		#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
		struct linux_binprm;
		int arch_setup_additional_pages(struct linux_binprm *, int);
		#endif

		#endif

+4 −1

Original line number	Diff line number	Diff line
		@@ -398,6 +398,7 @@ setup_return(struct pt_regs regs, struct ksignal ksig,
		__put_user(sigreturn_codes[idx+1], rc+1))
		return 1;

		#ifdef CONFIG_MMU
		if (cpsr & MODE32_BIT) {
		struct mm_struct *mm = current->mm;

		@@ -408,7 +409,9 @@ setup_return(struct pt_regs regs, struct ksignal ksig,
		*/
		retcode = mm->context.sigpage + signal_return_offset +
		(idx << 2) + thumb;
		} else {
		} else
		#endif
		{
		/*
		* Ensure that the instruction cache sees
		* the return code written onto the stack.