diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 10:49:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 10:49:02 -0500 |
| commit | 97ebe8f55ae99059c0ad3d3be5c0417647f5e3e0 (patch) | |
| tree | fa87910a23cf2ba0f245e49c055fa7d646fce830 /arch/arm64/include/asm/Kbuild | |
| parent | d07e43d70eef15a44a2c328a913d8d633a90e088 (diff) | |
| parent | d19766ec52218007d45888860dd40a24bb7f6651 (diff) | |
Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull ARM64 updates from Catalin Marinas:
- Generic execve, kernel_thread, fork/vfork/clone.
- Preparatory patches for KVM support (initialising EL2 mode for later
installing KVM support, hypervisor stub).
- Signal handling corner case fix (alternative signal stack set up for
a SEGV handler, which is raised in response to RLIMIT_STACK being
reached).
- Sub-nanosecond timer error fix.
* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (30 commits)
arm64: Update the MAINTAINERS entry
arm64: compat for clock_adjtime(2) is miswired
arm64: move FP-SIMD save/restore code to a macro
arm64: hyp: initialize vttbr_el2 to zero
arm64: add hypervisor stub
arm64: record boot mode when entering the kernel
arm64: move vector entry macro to assembler.h
arm64: add AArch32 execution modes to ptrace.h
arm64: expand register mapping between AArch32 and AArch64
arm64: generic timer: use virtual counter instead of physical at EL0
arm64: vdso: defer shifting of nanosecond component of timespec
arm64: vdso: rework __do_get_tspec register allocation and return shift
arm64: vdso: check sequence counter even for coarse realtime operations
arm64: vdso: fix clocksource mask when extracting bottom 56 bits
ARM64: Remove incorrect Kconfig symbol HAVE_SPARSE_IRQ
Documentation: Fixes a word in Documentation/arm64/memory.txt
arm64: Make !dirty ptes read-only
arm64: Convert empty flush_cache_{mm,page} functions to static inline
arm64: signal: let the compiler inline compat_get_sigframe
arm64: signal: return struct rt_sigframe from get_sigframe
...
Conflicts:
arch/arm64/include/asm/unistd32.h
Diffstat (limited to 'arch/arm64/include/asm/Kbuild')
| -rw-r--r-- | arch/arm64/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild index 6e9ca462127f..14a9d5a2b85b 100644 --- a/arch/arm64/include/asm/Kbuild +++ b/arch/arm64/include/asm/Kbuild | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | generic-y += bug.h | 3 | generic-y += bug.h |
| 4 | generic-y += bugs.h | 4 | generic-y += bugs.h |
| 5 | generic-y += checksum.h | 5 | generic-y += checksum.h |
| 6 | generic-y += clkdev.h | ||
| 6 | generic-y += cputime.h | 7 | generic-y += cputime.h |
| 7 | generic-y += current.h | 8 | generic-y += current.h |
| 8 | generic-y += delay.h | 9 | generic-y += delay.h |