From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Dec 2014 23:26:48 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Tag: v4.14-rc1~6315
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26ceb127f7bcf473db926c6a026b18ddd6f274e8;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull ARM updates from Russell King:
 "The major updates included in this update are:

   - Clang compatible stack pointer accesses by Behan Webster.
   - SA11x0 updates from Dmitry Eremin-Solenikov.
   - kgdb handling of breakpoints with read-only text/modules
   - Support for Privileged-no-execute feature on ARMv7 to prevent
     userspace code execution by the kernel.
   - AMBA primecell bus handling of irq-safe runtime PM
   - Unwinding support for memset/memzero/memmove/memcpy functions
   - VFP fixes for Krait CPUs and improvements in detecting the VFP
     architecture
   - A number of code cleanups (using pr_*, removing or reducing the
     severity of a couple of kernel messages, splitting ftrace asm code
     out to a separate file, etc.)
   - Add machine name to stack dump output"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (62 commits)
  ARM: 8247/2: pcmcia: sa1100: make use of device clock
  ARM: 8246/2: pcmcia: sa1111: provide device clock
  ARM: 8245/1: pcmcia: soc-common: enable/disable socket clocks
  ARM: 8244/1: fbdev: sa1100fb: make use of device clock
  ARM: 8243/1: sa1100: add a clock alias for sa1111 pcmcia device
  ARM: 8242/1: sa1100: add cpu clock
  ARM: 8221/1: PJ4: allow building in Thumb-2 mode
  ARM: 8234/1: sa1100: reorder IRQ handling code
  ARM: 8233/1: sa1100: switch to hwirq usage
  ARM: 8232/1: sa1100: merge GPIO multiplexer IRQ to "normal" irq domain
  ARM: 8231/1: sa1100: introduce irqdomains support
  ARM: 8230/1: sa1100: shift IRQs by one
  ARM: 8229/1: sa1100: replace irq numbers with names in irq driver
  ARM: 8228/1: sa1100: drop entry-macro.S
  ARM: 8227/1: sa1100: switch to MULTI_IRQ_HANDLER
  ARM: 8241/1: Update processor_modes for hyp and monitor mode
  ARM: 8240/1: MCPM: document mcpm_sync_init()
  ARM: 8239/1: Introduce {set,clear}_pte_bit
  ARM: 8238/1: mm: Refine set_memory_* functions
  ARM: 8237/1: fix flush_pfn_alias
  ...
---

26ceb127f7bcf473db926c6a026b18ddd6f274e8
diff --cc arch/arm/kernel/Makefile
index 8dcbed5,2ac3920..f290ac8
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -82,8 -83,9 +83,9 @@@ obj-$(CONFIG_CPU_MOHAWK)	+= xscale-cp0.
  obj-$(CONFIG_CPU_PJ4)		+= pj4-cp0.o
  obj-$(CONFIG_CPU_PJ4B)		+= pj4-cp0.o
  obj-$(CONFIG_IWMMXT)		+= iwmmxt.o
 -obj-$(CONFIG_PERF_EVENTS)	+= perf_regs.o
 +obj-$(CONFIG_PERF_EVENTS)	+= perf_regs.o perf_callchain.o
  obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o perf_event_cpu.o
+ CFLAGS_pj4-cp0.o		:= -marm
  AFLAGS_iwmmxt.o			:= -Wa,-mcpu=iwmmxt
  obj-$(CONFIG_ARM_CPU_TOPOLOGY)  += topology.o
  
diff --cc include/linux/pm_runtime.h
index eda4fee,44d74f0..30e84d4
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@@ -118,14 -128,12 +118,19 @@@ static inline void pm_runtime_mark_last
  	ACCESS_ONCE(dev->power.last_busy) = jiffies;
  }
  
+ static inline bool pm_runtime_is_irq_safe(struct device *dev)
+ {
+ 	return dev->power.irq_safe;
+ }
+ 
 -#else /* !CONFIG_PM_RUNTIME */
 +#else /* !CONFIG_PM */
 +
 +static inline bool queue_pm_work(struct work_struct *work) { return false; }
 +
 +static inline int pm_generic_runtime_suspend(struct device *dev) { return 0; }
 +static inline int pm_generic_runtime_resume(struct device *dev) { return 0; }
 +static inline int pm_runtime_force_suspend(struct device *dev) { return 0; }
 +static inline int pm_runtime_force_resume(struct device *dev) { return 0; }
  
  static inline int __pm_runtime_idle(struct device *dev, int rpmflags)
  {