Merge branches 'cleanup', 'fixes', 'misc', 'omap-barrier' and 'uaccess' into for...

diff --cc arch/arm/Kconfig
index a750c14,1c50210,1bcda7c,a750c14,e15d5ed..3458828
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
--- 5/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@ -1693,7 -1693,13 -1696,7 -1693,7 -1693,22 +1696,28 @@@@@@ config HIGHME
     config HIGHPTE
        bool "Allocate 2nd-level pagetables from highmem"
        depends on HIGHMEM
+ +++   help
+ +++     The VM uses one page of physical memory for each page table.
+ +++     For systems with a lot of processes, this can use a lot of
+ +++     precious low memory, eventually leading to low memory being
+ +++     consumed by page tables.  Setting this option will allow
+ +++     user-space 2nd level page tables to reside in high memory.
+ ++ 
++++ config CPU_SW_DOMAIN_PAN
++++    bool "Enable use of CPU domains to implement privileged no-access"
++++    depends on MMU && !ARM_LPAE
++++    default y
++++    help
++++      Increase kernel security by ensuring that normal kernel accesses
++++      are unable to access userspace addresses.  This can help prevent
++++      use-after-free bugs becoming an exploitable privilege escalation
++++      by ensuring that magic values (such as LIST_POISON) will always
++++      fault when dereferenced.
++++ 
++++      CPUs with low-vector mappings use a best-efforts implementation.
++++      Their lower 1MB needs to remain accessible for the vectors, but
++++      the remainder of userspace will become appropriately inaccessible.
 +   
     config HW_PERF_EVENTS
        bool "Enable hardware performance counter support for perf events"
        depends on PERF_EVENTS

diff --cc arch/arm/include/asm/assembler.h
Simple merge

diff --cc arch/arm/include/asm/thread_info.h
Simple merge

diff --cc arch/arm/include/asm/uaccess.h
index 4cf54eb,74b17d0,74b17d0,74b17d0,01bae13..8cc85a4
--- 1/arch/arm/include/asm/uaccess.h
--- 2/arch/arm/include/asm/uaccess.h
--- 3/arch/arm/include/asm/uaccess.h
--- 4/arch/arm/include/asm/uaccess.h
--- 5/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@@@@@ -379,11 -391,11 -391,11 -391,11 -429,12 +417,12 @@@@@@ do {                                                                      
        case 8: __put_user_asm_dword(__pu_val, __pu_addr, err); break;  \
        default: __put_user_bad();                                      \
        }                                                               \
++++    uaccess_restore(__ua_flags);                                    \
     } while (0)
     
 ----#define __put_user_asm_byte(x, __pu_addr, err)                     \
 ++++#define __put_user_asm(x, __pu_addr, err, instr)           \
        __asm__ __volatile__(                                   \
 ----   "1:     " TUSER(strb) " %1,[%2],#0\n"                   \
 ++++   "1:     " TUSER(instr) " %1, [%2], #0\n"                \
        "2:\n"                                                  \
        "       .pushsection .text.fixup,\"ax\"\n"              \
        "       .align  2\n"                                    \

diff --cc arch/arm/kernel/armksyms.c
Simple merge

diff --cc arch/arm/kernel/entry-armv.S
Simple merge

diff --cc arch/arm/kernel/entry-common.S
Simple merge

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/kernel/perf_event.c
Simple merge

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/lib/uaccess_with_memcpy.c
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm/mm/mmu.c
index 6ca7d9a,870838a,fb9e817,6ca7d9a,a016de2..7cd1514
--- 1/arch/arm/mm/mmu.c
--- 2/arch/arm/mm/mmu.c
--- 3/arch/arm/mm/mmu.c
--- 4/arch/arm/mm/mmu.c
--- 5/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@@@@ -1494,7 -1500,8 -1567,8 -1494,7 -1494,7 +1573,9 @@@@@@ void __init paging_init(const struct ma
        build_mem_type_table();
        prepare_page_table();
        map_lowmem();
+ +++   memblock_set_current_limit(arm_lowmem_limit);
        dma_contiguous_remap();
++ ++   early_fixmap_shutdown();
        devicemaps_init(mdesc);
        kmap_init();
        tcm_init();