Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64

Linux Kernel / Linux Kernel - Linus Torvalds [linux-foundation.org] - 11 November 2013 01:32 EST

05ad391 Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64

Documentation/arm64/booting.txt | 45 ++++--
Documentation/arm64/memory.txt | 29 +++-
arch/arm64/Kconfig | 17 +-
arch/arm64/Makefile | 6 +
arch/arm64/configs/defconfig | 2 +-
arch/arm64/include/asm/assembler.h | 31 ++++
arch/arm64/include/asm/cmpxchg.h | 2 +
arch/arm64/include/asm/compat.h | 14 ++
arch/arm64/include/asm/cpu_ops.h | 59 +++++++
arch/arm64/include/asm/elf.h | 18 +++
arch/arm64/include/asm/io.h | 2 +-
arch/arm64/include/asm/irq.h | 1 +
arch/arm64/include/asm/memory.h | 11 +-
arch/arm64/include/asm/pgtable-2level-hwdef.h | 4 +-
arch/arm64/include/asm/pgtable.h | 2 +-
arch/arm64/include/asm/processor.h | 5 +
arch/arm64/include/asm/psci.h | 19 ---
arch/arm64/include/asm/ptrace.h | 1 +
arch/arm64/include/asm/smp.h | 15 +-
arch/arm64/include/asm/spinlock.h | 83 +++++++---
arch/arm64/include/asm/spinlock_types.h | 15 +-
arch/arm64/include/asm/syscall.h | 6 +
arch/arm64/include/asm/virt.h | 3 +-
arch/arm64/include/uapi/asm/byteorder.h | 4 +
arch/arm64/kernel/Makefile | 4 +-
arch/arm64/kernel/arm64ksyms.c | 1 +
arch/arm64/kernel/cpu_ops.c | 87 ++++++++++
arch/arm64/kernel/cputable.c | 2 +-
arch/arm64/kernel/entry.S | 22 +--
arch/arm64/kernel/head.S | 61 +++++--
arch/arm64/kernel/irq.c | 61 +++++++
arch/arm64/kernel/kuser32.S | 57 +++++--
arch/arm64/kernel/module.c | 5 +-
arch/arm64/kernel/perf_event.c | 7 +-
arch/arm64/kernel/process.c | 7 +
arch/arm64/kernel/psci.c | 87 +++++++++-
arch/arm64/kernel/setup.c | 9 +-
arch/arm64/kernel/signal32.c | 37 +----
arch/arm64/kernel/smp.c | 214 +++++++++++++------------
arch/arm64/kernel/smp_psci.c | 53 ------
arch/arm64/kernel/smp_spin_table.c | 97 ++++++++++-
arch/arm64/kernel/sys32.S | 22 +--
arch/arm64/kernel/vdso.c | 5 +-
arch/arm64/kernel/vmlinux.lds.S | 32 +---
arch/arm64/kvm/hyp-init.S | 5 +-
arch/arm64/kvm/hyp.S | 13 ++
arch/arm64/mm/ioremap.c | 20 ++-
arch/arm64/mm/proc.S | 4 +-
48 files changed, 936 insertions(+), 370 deletions(-)

Upstream: git.kernel.org


  • Share