From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Jan 2016 01:55:20 +0000 (-0800)
Subject: Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: Ubuntu-4.10.0-19.21~4087
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5083c54264d21bf9b8a4766068f51581854d772c;p=mirror_ubuntu-artful-kernel.git

Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC cleanups from Olof Johansson:
 "A smallish number of general cleanup commits this release cycle.  Some
  of these are minor tweaks:

   - shmobile change of binding for their GIC (using arm,pl390 now)
   - ARCH_RENESAS introduction
   - Misc other renesas updates

  There's also a couple of treewide commits from Masahiro Yamada
  cleaning up const/__initconst for SMP operation structs and a switch
  to using "depends on" instead of if-constructs on most of the Kconfig
  platform targets"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  staging: board: armadillo800eva: Use "arm,pl390"
  staging: board: kzm9d: Use "arm,pl390"
  ARM: shmobile: r8a7778 dtsi: Use "arm,pl390" for GIC
  ARM: shmobile: emev2 dtsi: Use "arm,pl390" for GIC
  ARM: shmobile: r8a7740 dtsi: Use "arm,pl390" for GIC
  ARM: shmobile: r7s72100 dtsi: Use "arm,pl390" for GIC
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures
  ARM: mvebu: remove unused mach/gpio.h
  ARM: shmobile: Remove legacy mach/irqs.h
  ARM: shmobile: Introduce ARCH_RENESAS
  MAINTAINERS: Remove link to oss.renesas.com which is closed
---

5083c54264d21bf9b8a4766068f51581854d772c
diff --cc MAINTAINERS
index 5affae6e99b8,1beb9d0d3a8b..610cf0c6e9ab
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1531,9 -1516,8 +1531,8 @@@ F:	drivers/media/platform/s5p-jpeg
  ARM/SHMOBILE ARM ARCHITECTURE
  M:	Simon Horman <horms@verge.net.au>
  M:	Magnus Damm <magnus.damm@gmail.com>
 -L:	linux-sh@vger.kernel.org
 -Q:	http://patchwork.kernel.org/project/linux-sh/list/
 +L:	linux-renesas-soc@vger.kernel.org
- W:	http://oss.renesas.com
 +Q:	http://patchwork.kernel.org/project/linux-renesas-soc/list/
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:	Supported
  F:	arch/arm/boot/dts/emev2*
diff --cc arch/arm/Kconfig
index 6a889afa6a2c,e803304f4afa..0ada645209af
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -806,10 -796,10 +806,11 @@@ config ARCH_MULTI_CPU_AUT
  endmenu
  
  config ARCH_VIRT
- 	bool "Dummy Virtual Machine" if ARCH_MULTI_V7
+ 	bool "Dummy Virtual Machine"
+ 	depends on ARCH_MULTI_V7
  	select ARM_AMBA
  	select ARM_GIC
 +	select ARM_GIC_V2M if PCI_MSI
  	select ARM_GIC_V3
  	select ARM_PSCI
  	select HAVE_ARM_ARCH_TIMER
diff --cc arch/arm/include/asm/psci.h
index b4c6d99364f1,97735a8ff451..e1b825dfab23
--- a/arch/arm/include/asm/psci.h
+++ b/arch/arm/include/asm/psci.h
@@@ -14,9 -14,9 +14,9 @@@
  #ifndef __ASM_ARM_PSCI_H
  #define __ASM_ARM_PSCI_H
  
- extern struct smp_operations psci_smp_ops;
+ extern const struct smp_operations psci_smp_ops;
  
 -#ifdef CONFIG_ARM_PSCI
 +#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI)
  bool psci_smp_available(void);
  #else
  static inline bool psci_smp_available(void) { return false; }