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

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

Merge branch 'sh-latest' of git://github.com/pmundt/linux-sh 

* 'sh-latest' of git://github.com/pmundt/linux-sh:
  sh: Add default uImage rule for sh7757lcr
  sh: modify the asm/sh_eth.h to linux/sh_eth.h in sh7757lcr
  sh: userimask.c needs linux/stat.h
  sh: pfc: Add GPIO IRQ support
  sh: modify the asm/sh_eth.h to linux/sh_eth.h in some boards
  sh: pfc: Remove unused gpio_in_use member
  sh: add parameters for EHCI and RIIC in clock-sh7757.c
  sh: kexec: Add PHYSICAL_START
  SH: irq: Remove IRQF_DISABLED
  sh: pfc: get_config_reg() shift clean up
  sh: intc: Add IRQ trigger bit field check
  sh: drop unused Kconfig symbol
  sh: Fix implicit declaration of function numa_node_id
  sh: kexec: Register crashk_res
  sh: ecovec: add renesas_usbhs DMAEngine support
parents 3f8ddb03 e857bfd4

arch/sh/Kconfig

+12 −5
Original line number Diff line number Diff line
@@ -101,10 +101,6 @@ config GENERIC_LOCKBREAK 
	def_bool y

	depends on SMP && PREEMPT



config SYS_SUPPORTS_PM

	bool

	depends on !SMP



config ARCH_SUSPEND_POSSIBLE

	def_bool n
@@ -649,7 +645,7 @@ config CRASH_DUMP 
	  a specially reserved region and then later executed after

	  a crash by kdump/kexec. The crash dump kernel must be compiled

	  to a memory address not used by the main kernel using

	  MEMORY_START.

	  PHYSICAL_START.



	  For more details see Documentation/kdump/kdump.txt
@@ -660,6 +656,17 @@ config KEXEC_JUMP 
	  Jump between original kernel and kexeced kernel and invoke

	  code via KEXEC



config PHYSICAL_START

	hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)

	default MEMORY_START

	---help---

	  This gives the physical address where the kernel is loaded

	  and is ordinarily the same as MEMORY_START.



	  Different values are primarily used in the case of kexec on panic

	  where the fail safe kernel needs to run at a different address

	  than the panic-ed kernel.



config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	depends on PROC_FS

arch/sh/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ defaultimage-$(CONFIG_SH_RSK) := uImage 
defaultimage-$(CONFIG_SH_URQUELL)		:= uImage

defaultimage-$(CONFIG_SH_MIGOR)			:= uImage

defaultimage-$(CONFIG_SH_AP325RXA)		:= uImage

defaultimage-$(CONFIG_SH_SH7757LCR)		:= uImage

defaultimage-$(CONFIG_SH_7724_SOLUTION_ENGINE)	:= uImage

defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE)	:= vmlinux

defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE)	:= vmlinux

arch/sh/boards/board-espt.c

+1 −1
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
#include <linux/interrupt.h>

#include <linux/mtd/physmap.h>

#include <linux/io.h>

#include <linux/sh_eth.h>

#include <asm/machvec.h>

#include <asm/sizes.h>

#include <asm/sh_eth.h>



/* NOR Flash */

static struct mtd_partition espt_nor_flash_partitions[] = {

arch/sh/boards/board-secureedge5410.c

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ static int __init eraseconfig_init(void) 
	printk("SnapGear: EraseConfig init\n");



	/* Setup "EraseConfig" switch on external IRQ 0 */

	if (request_irq(irq, eraseconfig_interrupt, IRQF_DISABLED,

				"Erase Config", NULL))

	if (request_irq(irq, eraseconfig_interrupt, 0, "Erase Config", NULL))

		printk("SnapGear: failed to register IRQ%d for Reset witch\n",

				irq);

	else

arch/sh/boards/board-sh7757lcr.c

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include <linux/mmc/host.h>

#include <linux/mmc/sh_mmcif.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/sh_eth.h>

#include <cpu/sh7757.h>

#include <asm/sh_eth.h>

#include <asm/heartbeat.h>



static struct resource heartbeat_resource = {