From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 May 2013 22:15:27 +0000 (-0700)
Subject: Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3d15b798eafd3b6b3cc25f20747008ab9401a57f;p=deliverable%2Flinux.git

Merge tag 'arm64-for-linus' of git://git./linux/kernel/git/cmarinas/linux-aarch64

Pull arm64 update from Catalin Marinas:

 - Since drivers/irqchip/irq-gic.c no longer has dependencies on arm32
   specifics (the 'gic' branch merged), it can be enabled on arm64.

 - Enable arm64 support for poweroff/restart (for code under
   drivers/power/reset/).

 - Fixes (dts file, exception handling, bitops)

* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  arm64: Treat the bitops index argument as an 'int'
  arm64: Ignore the 'write' ESR flag on cache maintenance faults
  arm64: dts: fix #address-cells for foundation-v8
  arm64: vexpress: Add support for poweroff/restart
  arm64: Enable support for the ARM GIC interrupt controller
---

3d15b798eafd3b6b3cc25f20747008ab9401a57f
diff --cc arch/arm64/kernel/process.c
index f4919721f7dd,bbefb6fdfee2..46f02c3b5015
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@@ -81,13 -81,9 +81,13 @@@ void soft_restart(unsigned long addr
  void (*pm_power_off)(void);
  EXPORT_SYMBOL_GPL(pm_power_off);
  
- void (*pm_restart)(const char *cmd);
- EXPORT_SYMBOL_GPL(pm_restart);
+ void (*arm_pm_restart)(char str, const char *cmd);
+ EXPORT_SYMBOL_GPL(arm_pm_restart);
  
 +void arch_cpu_idle_prepare(void)
 +{
 +	local_fiq_enable();
 +}
  
  /*
   * This is our default idle handler.