Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplu...
Russell King [Thu, 2 May 2013 20:30:36 +0000 (21:30 +0100)]
16 files changed:
1  2  3  4  5  6 
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/include/asm/tlbflush.h
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-common.S
arch/arm/kernel/entry-header.S
arch/arm/kernel/setup.c
arch/arm/kvm/arm.c
arch/arm/kvm/coproc.c
arch/arm/kvm/vgic.c
arch/arm/mm/Kconfig
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S
mm/mmap.c

@@@@@@@ -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
@@@@@@@ -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.
Simple merge
Simple merge
@@@@@@@ -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)
Simple merge
Simple merge
Simple merge
@@@@@@@ -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);
      
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/mmap.c
Simple merge