From: Mark Brown <broonie@linaro.org>
Date: Sun, 18 May 2014 14:03:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~127^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e835a464b6127329704a237cf8da142e4f6d1e8;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
	arch/arm64/Kconfig
---

1e835a464b6127329704a237cf8da142e4f6d1e8
diff --cc arch/arm64/Kconfig
index 73366a635c3b,61ef3f0de6ee..bd3a4e1f4ff6
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -12,9 -11,8 +12,10 @@@ config ARM6
  	select BUILDTIME_EXTABLE_SORT
  	select CLONE_BACKWARDS
  	select COMMON_CLK
 +	select CPU_PM if (SUSPEND || CPU_IDLE)
+ 	select DCACHE_WORD_ACCESS
  	select GENERIC_CLOCKEVENTS
 +	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
  	select GENERIC_IOMAP
  	select GENERIC_IRQ_PROBE
  	select GENERIC_IRQ_SHOW
@@@ -26,7 -26,7 +29,8 @@@
  	select HAVE_DEBUG_KMEMLEAK
  	select HAVE_DMA_API_DEBUG
  	select HAVE_DMA_ATTRS
 +	select HAVE_DMA_CONTIGUOUS
+ 	select HAVE_EFFICIENT_UNALIGNED_ACCESS
  	select HAVE_GENERIC_DMA_COHERENT
  	select HAVE_GENERIC_HARDIRQS
  	select HAVE_HW_BREAKPOINT if PERF_EVENTS