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

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

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: ensure initial page tables are setup for SMP systems
  ARM: 5776/1: Check compiler version and EABI support when adding ARM unwind support.
  ARM: 5774/1: Fix Realview ARM1176PB board reboot
  ARM: Fix errata 411920 workarounds
  ARM: Fix sparsemem with SPARSEMEM_EXTREME enabled
  ARM: Use GFP_DMA only for masks _less_ than 32-bit
  ARM: integrator: allow Integrator to be built with highmem
  ARM: Fix signal restart issues with NX and OABI compat
parents 20107f84 4b46d641

arch/arm/include/asm/cacheflush.h

+5 −0
Original line number Diff line number Diff line
@@ -414,9 +414,14 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page 


static inline void __flush_icache_all(void)

{

#ifdef CONFIG_ARM_ERRATA_411920

	extern void v6_icache_inval_all(void);

	v6_icache_inval_all();

#else

	asm("mcr	p15, 0, %0, c7, c5, 0	@ invalidate I-cache\n"

	    :

	    : "r" (0));

#endif

}



#define ARCH_HAS_FLUSH_ANON_PAGE

arch/arm/kernel/signal.c

+17 −24
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/kernel/signal.c

 *

 *  Copyright (C) 1995-2002 Russell King

 *  Copyright (C) 1995-2009 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -29,6 +29,7 @@ 
 */

#define SWI_SYS_SIGRETURN	(0xef000000|(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE))

#define SWI_SYS_RT_SIGRETURN	(0xef000000|(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE))

#define SWI_SYS_RESTART		(0xef000000|__NR_restart_syscall|__NR_OABI_SYSCALL_BASE)



/*

 * With EABI, the syscall number has to be loaded into r7.
@@ -48,6 +49,18 @@ const unsigned long sigreturn_codes[7] = { 
	MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,

};



/*

 * Either we support OABI only, or we have EABI with the OABI

 * compat layer enabled.  In the later case we don't know if

 * user space is EABI or not, and if not we must not clobber r7.

 * Always using the OABI syscall solves that issue and works for

 * all those cases.

 */

const unsigned long syscall_restart_code[2] = {

	SWI_SYS_RESTART,	/* swi	__NR_restart_syscall */

	0xe49df004,		/* ldr	pc, [sp], #4 */

};



/*

 * atomically swap in the new signal mask, and wait for a signal.

 */
@@ -645,32 +658,12 @@ static void do_signal(struct pt_regs *regs, int syscall) 
				regs->ARM_pc -= 4;

#else

				u32 __user *usp;

				u32 swival = __NR_restart_syscall;



				regs->ARM_sp -= 12;

				regs->ARM_sp -= 4;

				usp = (u32 __user *)regs->ARM_sp;



				/*

				 * Either we supports OABI only, or we have

				 * EABI with the OABI compat layer enabled.

				 * In the later case we don't know if user

				 * space is EABI or not, and if not we must

				 * not clobber r7.  Always using the OABI

				 * syscall solves that issue and works for

				 * all those cases.

				 */

				swival = swival - __NR_SYSCALL_BASE + __NR_OABI_SYSCALL_BASE;



				put_user(regs->ARM_pc, &usp[0]);

				/* swi __NR_restart_syscall */

				put_user(0xef000000 | swival, &usp[1]);

				/* ldr	pc, [sp], #12 */

				put_user(0xe49df00c, &usp[2]);



				flush_icache_range((unsigned long)usp,

						   (unsigned long)(usp + 3));



				regs->ARM_pc = regs->ARM_sp + 4;

				put_user(regs->ARM_pc, usp);

				regs->ARM_pc = KERN_RESTART_CODE;

#endif

			}

		}

arch/arm/kernel/signal.h

+3 −1
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/kernel/signal.h

 *

 *  Copyright (C) 2005 Russell King.

 *  Copyright (C) 2005-2009 Russell King.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#define KERN_SIGRETURN_CODE	(CONFIG_VECTORS_BASE + 0x00000500)

#define KERN_RESTART_CODE	(KERN_SIGRETURN_CODE + sizeof(sigreturn_codes))



extern const unsigned long sigreturn_codes[7];

extern const unsigned long syscall_restart_code[2];

arch/arm/kernel/traps.c

+3 −1
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/kernel/traps.c

 *

 *  Copyright (C) 1995-2002 Russell King

 *  Copyright (C) 1995-2009 Russell King

 *  Fragments that appear the same as linux/arch/i386/kernel/traps.c (C) Linus Torvalds

 *

 * This program is free software; you can redistribute it and/or modify
@@ -751,6 +751,8 @@ void __init early_trap_init(void) 
	 */

	memcpy((void *)KERN_SIGRETURN_CODE, sigreturn_codes,

	       sizeof(sigreturn_codes));

	memcpy((void *)KERN_RESTART_CODE, syscall_restart_code,

	       sizeof(syscall_restart_code));



	flush_icache_range(vectors, vectors + PAGE_SIZE);

	modify_domain(DOMAIN_USER, DOMAIN_CLIENT);

arch/arm/kernel/unwind.c

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,15 @@ 
 * http://infocenter.arm.com/help/topic/com.arm.doc.subset.swdev.abi/index.html

 */



#if !defined (__ARM_EABI__)

#warning Your compiler does not have EABI support.

#warning    ARM unwind is known to compile only with EABI compilers.

#warning    Change compiler or disable ARM_UNWIND option.

#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)

#warning Your compiler is too buggy; it is known to not compile ARM unwind support.

#warning    Change compiler or disable ARM_UNWIND option.

#endif



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>