From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 2 May 2013 20:30:36 +0000 (+0100)
Subject: Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplu... 
X-Git-Tag: v3.10-rc1~106^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=946342d03ec4e8367bba7bb99e7155e97f69058a;p=linux-block.git

Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplug' into for-linus
---

946342d03ec4e8367bba7bb99e7155e97f69058a
diff --cc arch/arm/Kconfig
index 7caf8ddea046,13b739469c51,1cacda426a0e,13b739469c51,7dc4cabc34d7,1cacda426a0e..00bdfdbdd4a8
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@ -49,7 -49,6 -49,6 -49,6 -49,7 -49,6 +49,6 @@@@@@@ config AR
      	select HAVE_REGS_AND_STACK_ACCESS_API
      	select HAVE_SYSCALL_TRACEPOINTS
      	select HAVE_UID16
-     	select VIRT_TO_BUS
    - 	select HAVE_VIRT_TO_BUS
      	select KTIME_SCALAR
      	select PERF_USE_VMALLOC
      	select RTC_LIB
diff --cc arch/arm/Kconfig.debug
index ecfcdba2d17c,9b31f4311ea2,9b31f4311ea2,ecfcdba2d17c,7aa30e43cb8e,9b31f4311ea2..791fbeba40c6
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@@@@@ -492,9 -492,10 -492,10 -492,9 -492,9 -492,10 +492,10 @@@@@@@ config DEBUG_IMX_UART_POR
      						DEBUG_IMX31_UART || \
      						DEBUG_IMX35_UART || \
      						DEBUG_IMX51_UART || \
    - 						DEBUG_IMX50_IMX53_UART || \
    + 						DEBUG_IMX53_UART || \
      						DEBUG_IMX6Q_UART
      	default 1
+  ++ 	depends on ARCH_MXC
      	help
      	  Choose UART port on which kernel low-level debug messages
      	  should be output.
diff --cc arch/arm/kernel/entry-common.S
index 3248cde504ed,6f37ddfadbfa,fefd7f971437,3248cde504ed,469e82b3f757,fefd7f971437..bc5bc0a97131
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@@@@@@ -71,11 -69,10 -71,11 -71,11 -72,12 -71,11 +70,11 @@@@@@@ ENTRY(ret_to_user_from_irq
      	tst	r1, #_TIF_WORK_MASK
      	bne	work_pending
      no_work_pending:
- ----#if defined(CONFIG_IRQSOFF_TRACER)
      	asm_trace_hardirqs_on
- ----#endif
+ ++++
      	/* perform architecture specific actions before user return */
      	arch_ret_to_user r1, lr
++++ +	ct_user_enter save = 0
      
      	restore_user_regs fast = 0, offset = 0
      ENDPROC(ret_to_user_from_irq)
diff --cc arch/arm/kvm/coproc.c
index 94eee8befc83,4ea9a982269c,7bed7556077a,4ea9a982269c,4ea9a982269c,4ea9a982269c..8eea97be1ed5
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@@@@@@ -76,11 -76,11 -76,9 -76,11 -76,11 -76,11 +76,9 @@@@@@@ static bool access_dcsw(struct kvm_vcp
      			const struct coproc_params *p,
      			const struct coproc_reg *r)
      {
 -----	u32 val;
 +++++	unsigned long val;
      	int cpu;
      
-- ---	cpu = get_cpu();
-- ---
      	if (!p->is_write)
      		return read_from_write_only(vcpu, p);