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

Commit 6d039f8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "I've thought long and hard about what to say for this pull request,
  and I really can't work out anything sane to say to summarise much of
  these commits.  The problem is, for most of these are, yet again, lots
  of small bits scattered around the place without any real overall
  theme to them"

Most notable is probably the kuser page helper improvements.

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (22 commits)
  ARM: Add .text annotations where required after __CPUINIT removal
  ARM: 7803/1: Fix deadlock scenario with smp_send_stop()
  ARM: make vectors page inaccessible from userspace
  ARM: move signal handlers into a vdso-like page
  ARM: allow kuser helpers to be removed from the vector page
  ARM: update FIQ support for relocation of vectors
  ARM: use linker magic for vectors and vector stubs
  ARM: move vector stubs
  ARM: poison memory between kuser helpers
  ARM: poison the vectors page
  ARM: 7801/1: v6: prevent gcc 4.5 from reordering extended CP15 reads above is_smp() test
  ARM: 7800/1: ARMv7-M: Fix name of NVIC handler function
  ARM: Fix sorting of machine- initializers
  ARM: 7791/1: a.out: remove partial a.out support
  ARM: 7790/1: Fix deferred mm switch on VIVT processors
  ARM: 7789/1: Do not run dummy_flush_tlb_a15_erratum() on non-Cortex-A15
  ARM: 7787/1: virt: ensure visibility of __boot_cpu_mode
  ARM: 7788/1: elf: fix lpae hwcap feature reporting in proc/cpuinfo
  ARM: 7786/1: hyp: fix macro parameterisation
  ARM: 7785/1: mm: restrict early_alloc to section-aligned memory
  ...
parents efc68164 24195cad

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ config ARM 
	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	select HARDIRQS_SW_RESEND

	select HAVE_AOUT

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_SECCOMP_FILTER
@@ -218,7 +217,8 @@ config VECTORS_BASE 
	default DRAM_BASE if REMAP_VECTORS_TO_RAM

	default 0x00000000

	help

	  The base address of exception vectors.

	  The base address of exception vectors.  This must be two pages

	  in size.



config ARM_PATCH_PHYS_VIRT

	bool "Patch physical to virtual translations at runtime" if EMBEDDED

arch/arm/Kconfig.debug

+12 −2
Original line number Diff line number Diff line
@@ -804,9 +804,19 @@ config DEBUG_LL_INCLUDE 


config DEBUG_UNCOMPRESS

	bool

	default y if ARCH_MULTIPLATFORM && DEBUG_LL && \

		     !DEBUG_OMAP2PLUS_UART && \

	depends on ARCH_MULTIPLATFORM

	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \

		     !DEBUG_TEGRA_UART

	help

	  This option influences the normal decompressor output for

	  multiplatform kernels.  Normally, multiplatform kernels disable

	  decompressor output because it is not possible to know where to

	  send the decompressor output.



	  When this option is set, the selected DEBUG_LL output method

	  will be re-used for normal decompressor output on multiplatform

	  kernels.

	  



config UNCOMPRESS_INCLUDE

	string

arch/arm/Makefile

+9 −9
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ machine-$(CONFIG_ARCH_DAVINCI) += davinci 
machine-$(CONFIG_ARCH_DOVE)		+= dove

machine-$(CONFIG_ARCH_EBSA110)		+= ebsa110

machine-$(CONFIG_ARCH_EP93XX)		+= ep93xx

machine-$(CONFIG_ARCH_EXYNOS)		+= exynos

machine-$(CONFIG_ARCH_GEMINI)		+= gemini

machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank

machine-$(CONFIG_ARCH_INTEGRATOR)	+= integrator
@@ -160,15 +161,16 @@ machine-$(CONFIG_ARCH_IOP13XX) += iop13xx 
machine-$(CONFIG_ARCH_IOP32X)		+= iop32x

machine-$(CONFIG_ARCH_IOP33X)		+= iop33x

machine-$(CONFIG_ARCH_IXP4XX)		+= ixp4xx

machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone

machine-$(CONFIG_ARCH_KIRKWOOD)		+= kirkwood

machine-$(CONFIG_ARCH_KS8695)		+= ks8695

machine-$(CONFIG_ARCH_LPC32XX)		+= lpc32xx

machine-$(CONFIG_ARCH_MMP)		+= mmp

machine-$(CONFIG_ARCH_MSM)		+= msm

machine-$(CONFIG_ARCH_MV78XX0)		+= mv78xx0

machine-$(CONFIG_ARCH_MVEBU)		+= mvebu

machine-$(CONFIG_ARCH_MXC)		+= imx

machine-$(CONFIG_ARCH_MXS)		+= mxs

machine-$(CONFIG_ARCH_MVEBU)		+= mvebu

machine-$(CONFIG_ARCH_NETX)		+= netx

machine-$(CONFIG_ARCH_NOMADIK)		+= nomadik

machine-$(CONFIG_ARCH_NSPIRE)		+= nspire
@@ -176,7 +178,6 @@ machine-$(CONFIG_ARCH_OMAP1) += omap1 
machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2

machine-$(CONFIG_ARCH_ORION5X)		+= orion5x

machine-$(CONFIG_ARCH_PICOXCELL)	+= picoxcell

machine-$(CONFIG_ARCH_SIRF)		+= prima2

machine-$(CONFIG_ARCH_PXA)		+= pxa

machine-$(CONFIG_ARCH_REALVIEW)		+= realview

machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
@@ -186,25 +187,24 @@ machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx 
machine-$(CONFIG_ARCH_S5P64X0)		+= s5p64x0

machine-$(CONFIG_ARCH_S5PC100)		+= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210

machine-$(CONFIG_ARCH_EXYNOS)		+= exynos

machine-$(CONFIG_ARCH_SA1100)		+= sa1100

machine-$(CONFIG_ARCH_SHARK)		+= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile

machine-$(CONFIG_ARCH_SIRF)		+= prima2

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_ARCH_STI)		+= sti

machine-$(CONFIG_ARCH_SUNXI)		+= sunxi

machine-$(CONFIG_ARCH_TEGRA)		+= tegra

machine-$(CONFIG_ARCH_U300)		+= u300

machine-$(CONFIG_ARCH_U8500)		+= ux500

machine-$(CONFIG_ARCH_VERSATILE)	+= versatile

machine-$(CONFIG_ARCH_VEXPRESS)		+= vexpress

machine-$(CONFIG_ARCH_VIRT)		+= virt

machine-$(CONFIG_ARCH_VT8500)		+= vt8500

machine-$(CONFIG_ARCH_W90X900)		+= w90x900

machine-$(CONFIG_ARCH_ZYNQ)		+= zynq

machine-$(CONFIG_FOOTBRIDGE)		+= footbridge

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_PLAT_SPEAR)		+= spear

machine-$(CONFIG_ARCH_STI)		+= sti

machine-$(CONFIG_ARCH_VIRT)		+= virt

machine-$(CONFIG_ARCH_ZYNQ)		+= zynq

machine-$(CONFIG_ARCH_SUNXI)		+= sunxi

machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone



# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

arch/arm/include/asm/a.out-core.h

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
/* a.out coredump register dumper

 *

 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

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

 * modify it under the terms of the GNU General Public Licence

 * as published by the Free Software Foundation; either version

 * 2 of the Licence, or (at your option) any later version.

 */



#ifndef _ASM_A_OUT_CORE_H

#define _ASM_A_OUT_CORE_H



#ifdef __KERNEL__



#include <linux/user.h>

#include <linux/elfcore.h>



/*

 * fill in the user structure for an a.out core dump

 */

static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)

{

	struct task_struct *tsk = current;



	dump->magic = CMAGIC;

	dump->start_code = tsk->mm->start_code;

	dump->start_stack = regs->ARM_sp & ~(PAGE_SIZE - 1);



	dump->u_tsize = (tsk->mm->end_code - tsk->mm->start_code) >> PAGE_SHIFT;

	dump->u_dsize = (tsk->mm->brk - tsk->mm->start_data + PAGE_SIZE - 1) >> PAGE_SHIFT;

	dump->u_ssize = 0;



	memset(dump->u_debugreg, 0, sizeof(dump->u_debugreg));



	if (dump->start_stack < 0x04000000)

		dump->u_ssize = (0x04000000 - dump->start_stack) >> PAGE_SHIFT;



	dump->regs = *regs;

	dump->u_fpvalid = dump_fpu (regs, &dump->u_fp);

}



#endif /* __KERNEL__ */

#endif /* _ASM_A_OUT_CORE_H */

arch/arm/include/asm/cputype.h

+6 −1
Original line number Diff line number Diff line
@@ -89,13 +89,18 @@ extern unsigned int processor_id; 
		__val;							\

	})



/*

 * The memory clobber prevents gcc 4.5 from reordering the mrc before

 * any is_smp() tests, which can cause undefined instruction aborts on

 * ARM1136 r0 due to the missing extended CP15 registers.

 */

#define read_cpuid_ext(ext_reg)						\

	({								\

		unsigned int __val;					\

		asm("mrc	p15, 0, %0, c0, " ext_reg		\

		    : "=r" (__val)					\

		    :							\

		    : "cc");						\

		    : "memory");					\

		__val;							\

	})