Merge branches 'fixes' and 'misc' into for-next

diff --combined arch/arm/Kconfig
index 72ad724c67ae94cd6682ec15f3834966dd7028c0,639411f73ca9571f2e0d8b1c4531429e87d11eb1,5f4858011bff45ced518b88fa942e252f36ec584..823f90ea65c4458aa9e0f4096399e6c436cd8873
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@ -645,6 -645,7 -645,6 +645,7 @@@@ config ARCH_SHMOBILE_LEGAC
   
   config ARCH_RPC
        bool "RiscPC"
+ +     depends on MMU
        select ARCH_ACORN
        select ARCH_MAY_HAVE_PC_FDC
        select ARCH_SPARSEMEM_ENABLE
@@@@ -1410,7 -1411,7 -1410,6 +1411,6 @@@@ config HAVE_ARM_ARCH_TIME
   
   config HAVE_ARM_TWD
        bool
--      depends on SMP
        select CLKSRC_OF if OF
        help
          This options enables support for the ARM timer and watchdog unit
@@@@ -1470,6 -1471,6 -1469,8 +1470,8 @@@@ choic
   
        config VMSPLIT_3G
                bool "3G/1G user/kernel split"
++      config VMSPLIT_3G_OPT
++              bool "3G/1G user/kernel split (for full 1G low memory)"
        config VMSPLIT_2G
                bool "2G/2G user/kernel split"
        config VMSPLIT_1G
@@@@ -1481,6 -1482,6 -1482,7 +1483,7 @@@@ config PAGE_OFFSE
        default PHYS_OFFSET if !MMU
        default 0x40000000 if VMSPLIT_1G
        default 0x80000000 if VMSPLIT_2G
++      default 0xB0000000 if VMSPLIT_3G_OPT
        default 0xC0000000
   
   config NR_CPUS
@@@@ -1695,8 -1696,8 -1697,9 +1698,9 @@@@ config HIGHME
          If unsure, say n.
   
   config HIGHPTE
--      bool "Allocate 2nd-level pagetables from highmem"
++      bool "Allocate 2nd-level pagetables from highmem" if EXPERT
        depends on HIGHMEM
++      default y
        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

diff --combined arch/arm/include/asm/unistd.h
index 7cba573c2cc9541a23ff2e0675a701117f7cf269,7cba573c2cc9541a23ff2e0675a701117f7cf269,8f63daf3efa39c0a7bea3b490e21fcf6aecef6ab..7b84657fba3577ea3d29ecf1b93e3267feecbb59
--- 1/arch/arm/include/asm/unistd.h
--- 2/arch/arm/include/asm/unistd.h
--- 3/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@@@ -19,15 -19,15 -19,8 +19,8 @@@@
    * This may need to be greater than __NR_last_syscall+1 in order to
    * account for the padding in the syscall table
    */
  -#define __NR_syscalls  (388)
  +#define __NR_syscalls  (392)
   
-- /*
--  * *NOTE*: This is a ghost syscall private to the kernel.  Only the
--  * __kuser_cmpxchg code in entry-armv.S should be aware of its
--  * existence.  Don't ever use this from user code.
--  */
-- #define __ARM_NR_cmpxchg             (__ARM_NR_BASE+0x00fff0)
-- 
   #define __ARCH_WANT_STAT64
   #define __ARCH_WANT_SYS_GETHOSTNAME
   #define __ARCH_WANT_SYS_PAUSE