Merge remote-tracking branch 'origin/android-3.10' into android-goldfish-3.10

Mostly to fix a bug where the kernel would not report the stack pointer
of 32-bit processes when running on an ARM64 kernel.

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/include/asm/ptrace.h
	arch/arm64/kernel/fpsimd.c

Signed-off-by: David 'Digit' Turner <digit@android.com>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
index 41bd1f3b920f709ae07102e179f786e7803fc4c8,3ee27d34a0208cbdfbe0281d328e2e19ad691ed0..7e5272fe1645c39b80ed57f331d0a135dc3c4b14
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -9,14 -7,11 +9,15 @@@ config ARM6
        select ARM_AMBA
        select ARM_ARCH_TIMER
        select ARM_GIC
 +      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_CPU_AUTOPROBE
 +      select GENERIC_EARLY_IOREMAP
        select GENERIC_IOMAP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW

diff --cc arch/arm64/Makefile
Simple merge

diff --cc arch/arm64/include/asm/Kbuild
Simple merge

diff --cc arch/arm64/include/asm/ptrace.h
Simple merge

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

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc arch/arm64/kernel/fpsimd.c
index 522df9c7f3a4288cf5c8e5bb07f564304bd6ab15,0f27578a7039de75f7fedebe695cd256b5e5fed1..83d1254f524ac37ef86fd5a2d24674f2e11359f0
--- 1/arch/arm64/kernel/fpsimd.c
--- 2/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@@ -22,6 -21,6 +22,7 @@@
  #include <linux/init.h>
  #include <linux/sched.h>
  #include <linux/signal.h>
++#include <linux/hardirq.h>
  
  #include <asm/fpsimd.h>
  #include <asm/cputype.h>
@@@ -164,8 -311,6 +313,8 @@@ static int __init fpsimd_init(void
        else
                elf_hwcap |= HWCAP_ASIMD;
  
 +      fpsimd_pm_init();
 +
        return 0;
  }
--late_initcall(fpsimd_init);
++late_initcall(fpsimd_init);

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

diff --cc arch/arm64/kernel/ptrace.c
Simple merge

diff --cc arch/arm64/kernel/signal.c
Simple merge

diff --cc arch/arm64/kernel/signal32.c
Simple merge

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc drivers/base/Kconfig
Simple merge