Commit 8fac2f96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:
 "Low priority fixes and updates for ARM:

   - add some missing includes

   - efficiency improvements in system call entry code when tracing is
     enabled

   - ensure ARMv6+ is always built as EABI

   - export save_stack_trace_tsk()

   - fix fatal signal handling during mm fault

   - build translation table base address register from scratch

   - appropriately align the .data section to a word boundary where we
     rely on that data being word aligned"

* 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8691/1: Export save_stack_trace_tsk()
  ARM: 8692/1: mm: abort uaccess retries upon fatal signal
  ARM: 8690/1: lpae: build TTB control register value from scratch in v7_ttb_setup
  ARM: align .data section
  ARM: always enable AEABI for ARMv6+
  ARM: avoid saving and restoring registers unnecessarily
  ARM: move PC value into r9
  ARM: obtain thread info structure later
  ARM: use aliases for registers in entry-common
  ARM: 8689/1: scu: add missing errno include
  ARM: 8688/1: pm: add missing types include
parents 260d1658 e558bdc2

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1531,7 +1531,6 @@ config THUMB2_KERNEL 
	bool "Compile the kernel in Thumb-2 mode" if !CPU_THUMBONLY

	depends on (CPU_V7 || CPU_V7M) && !CPU_V6 && !CPU_V6K

	default y if CPU_THUMBONLY

	select AEABI

	select ARM_ASM_UNIFIED

	select ARM_UNWIND

	help
@@ -1594,7 +1593,8 @@ config ARM_PATCH_IDIV 
	  code to do integer division.



config AEABI

	bool "Use the ARM EABI to compile the kernel"

	bool "Use the ARM EABI to compile the kernel" if !CPU_V7 && !CPU_V7M && !CPU_V6 && !CPU_V6K

	default CPU_V7 || CPU_V7M || CPU_V6 || CPU_V6K

	help

	  This option allows for the kernel to be compiled using the latest

	  ARM ABI (aka EABI).  This is only useful if you are using a user

arch/arm/include/asm/smp_scu.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#ifndef __ASSEMBLER__



#include <linux/errno.h>

#include <asm/cputype.h>



static inline bool scu_a9_has_base(void)

arch/arm/include/asm/suspend.h

+2 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ARM_SUSPEND_H

#define __ASM_ARM_SUSPEND_H



#include <linux/types.h>



struct sleep_save_sp {

	u32 *save_ptr_stash;

	u32 save_ptr_stash_phys;

arch/arm/include/debug/omap2plus.S

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#define UART_OFFSET(addr)	((addr) & 0x00ffffff)



		.pushsection .data

		.align	2

omap_uart_phys:	.word	0

omap_uart_virt:	.word	0

omap_uart_lsr:	.word	0

arch/arm/kernel/entry-armv.S

+2 −0
Original line number Diff line number Diff line
@@ -721,6 +721,7 @@ do_fpe: 
 */



	.pushsection .data

	.align	2

ENTRY(fp_enter)

	.word	no_fp

	.popsection
@@ -1224,6 +1225,7 @@ vector_addrexcptn: 
	W(b)	vector_fiq



	.data

	.align	2



	.globl	cr_alignment

cr_alignment:

CRA Git | Maintained and supported by SUSTech CRA and CCSE