From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jun 2015 19:20:00 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e8a0b37d28ace440776c0a4fe3c65f5832a9a7ee;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Pull ARM updates from Russell King:
 "Bigger items included in this update are:

   - A series of updates from Arnd for ARM randconfig build failures
   - Updates from Dmitry for StrongARM SA-1100 to move IRQ handling to
     drivers/irqchip/
   - Move ARMs SP804 timer to drivers/clocksource/
   - Perf updates from Mark Rutland in preparation to move the ARM perf
     code into drivers/ so it can be shared with ARM64.
   - MCPM updates from Nicolas
   - Add support for taking platform serial number from DT
   - Re-implement Keystone2 physical address space switch to conform to
     architecture requirements
   - Clean up ARMv7 LPAE code, which goes in hand with the Keystone2
     changes.
   - L2C cleanups to avoid unlocking caches if we're prevented by the
     secure support to unlock.
   - Avoid cleaning a potentially dirty cache containing stale data on
     CPU initialisation
   - Add ARM-only entry point for secondary startup (for machines that
     can only call into a Thumb kernel in ARM mode).  Same thing is also
     done for the resume entry point.
   - Provide arch_irqs_disabled via asm-generic
   - Enlarge ARMv7M vector table
   - Always use BFD linker for VDSO, as gold doesn't accept some of the
     options we need.
   - Fix an incorrect BSYM (for Thumb symbols) usage, and convert all
     BSYM compiler macros to a "badr" (for branch address).
   - Shut up compiler warnings provoked by our cmpxchg() implementation.
   - Ensure bad xchg sizes fail to link"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (75 commits)
  ARM: Fix build if CLKDEV_LOOKUP is not configured
  ARM: fix new BSYM() usage introduced via for-arm-soc branch
  ARM: 8383/1: nommu: avoid deprecated source register on mov
  ARM: 8391/1: l2c: add options to overwrite prefetching behavior
  ARM: 8390/1: irqflags: Get arch_irqs_disabled from asm-generic
  ARM: 8387/1: arm/mm/dma-mapping.c: Add arm_coherent_dma_mmap
  ARM: 8388/1: tcm: Don't crash when TCM banks are protected by TrustZone
  ARM: 8384/1: VDSO: force use of BFD linker
  ARM: 8385/1: VDSO: group link options
  ARM: cmpxchg: avoid warnings from macro-ized cmpxchg() implementations
  ARM: remove __bad_xchg definition
  ARM: 8369/1: ARMv7M: define size of vector table for Vybrid
  ARM: 8382/1: clocksource: make ARM_TIMER_SP804 depend on GENERIC_SCHED_CLOCK
  ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource
  ARM: 8365/1: introduce sp804_timer_disable and remove arm_timer.h inclusion
  ARM: 8364/1: fix BE32 module loading
  ARM: 8360/1: add secondary_startup_arm prototype in header file
  ARM: 8359/1: correct secondary_startup_arm mode
  ARM: proc-v7: sanitise and document registers around errata
  ARM: proc-v7: clean up MIDR access
  ...
---

e8a0b37d28ace440776c0a4fe3c65f5832a9a7ee
diff --cc drivers/clocksource/Makefile
index e268b5e1901c,5ca59f9b377f..f228354961ca
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -47,7 -45,7 +47,8 @@@ obj-$(CONFIG_MTK_TIMER)		+= mtk_timer.
  
  obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o
  obj-$(CONFIG_ARM_GLOBAL_TIMER)		+= arm_global_timer.o
 +obj-$(CONFIG_ARMV7M_SYSTICK)		+= armv7m_systick.o
+ obj-$(CONFIG_ARM_TIMER_SP804)		+= timer-sp804.o
  obj-$(CONFIG_CLKSRC_METAG_GENERIC)	+= metag_generic.o
  obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST)	+= dummy_timer.o
  obj-$(CONFIG_ARCH_KEYSTONE)		+= timer-keystone.o
diff --cc drivers/irqchip/Makefile
index f8efb7087760,49f372a168f9..5c9adf1f554d
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -47,5 -47,4 +47,6 @@@ obj-$(CONFIG_KEYSTONE_IRQ)		+= irq-keys
  obj-$(CONFIG_MIPS_GIC)			+= irq-mips-gic.o
  obj-$(CONFIG_ARCH_MEDIATEK)		+= irq-mtk-sysirq.o
  obj-$(CONFIG_ARCH_DIGICOLOR)		+= irq-digicolor.o
 +obj-$(CONFIG_RENESAS_H8300H_INTC)	+= irq-renesas-h8300h.o
 +obj-$(CONFIG_RENESAS_H8S_INTC)		+= irq-renesas-h8s.o
+ obj-$(CONFIG_ARCH_SA1100)		+= irq-sa11x0.o