v2: Rebase onto 4.1.13 (to resolve conflicts between 4.1.6 and 4.1.13)
The following changes since commit 1f2ce4a2e7aea3a2123b17aff62a80553df31e21:
Linux 4.1.13 (2015-11-09 14:34:10 -0800)
are available in the git repository at:
https://git.linaro.org/people/david.brown/linux-lsk pan-4.1.13
for you to fetch changes up to f45972d0017cff35d576e10f1e276f9f3991bea6:
arm64: kernel: Add support for Privileged Access Never (2015-12-08 14:01:12 -0800)
---------------------------------------------------------------- Daniel Thompson (1): arm64: alternative: Provide if/else/endif assembler macros
James Morse (6): arm64: kernel: Move config_sctlr_el1 arm64: kernel: Add cpuid_feature_extract_field() for 4bit sign extension arm64: kernel: Add cpufeature 'enable' callback arm64: kernel: Add min_field_value and use '>=' for feature detection arm64: kernel: Add optional CONFIG_ parameter to ALTERNATIVE() arm64: kernel: Add support for Privileged Access Never
Marc Zyngier (3): arm64: alternative: Introduce feature for GICv3 CPU interface arm64: alternative: Merge alternative-asm.h into alternative.h arm64: alternative: Work around .inst assembler bugs
Suzuki K. Poulose (1): arm64: Generalise msr_s/mrs_s operations
Will Deacon (1): arm64: lib: use pair accessors for copy_*_user routines
arch/arm64/Kconfig | 14 ++++ arch/arm64/include/asm/alternative-asm.h | 29 -------- arch/arm64/include/asm/alternative.h | 109 +++++++++++++++++++++++++++++-- arch/arm64/include/asm/cpufeature.h | 17 ++++- arch/arm64/include/asm/cputype.h | 3 - arch/arm64/include/asm/futex.h | 8 +++ arch/arm64/include/asm/processor.h | 2 + arch/arm64/include/asm/sysreg.h | 40 ++++++++++-- arch/arm64/include/asm/uaccess.h | 11 ++++ arch/arm64/include/uapi/asm/ptrace.h | 1 + arch/arm64/kernel/armv8_deprecated.c | 17 ++--- arch/arm64/kernel/cpufeature.c | 50 ++++++++++++++ arch/arm64/kernel/entry.S | 2 +- arch/arm64/lib/clear_user.S | 8 +++ arch/arm64/lib/copy_from_user.S | 25 +++++-- arch/arm64/lib/copy_in_user.S | 25 +++++-- arch/arm64/lib/copy_to_user.S | 25 +++++-- arch/arm64/mm/cache.S | 2 +- arch/arm64/mm/fault.c | 16 +++++ 19 files changed, 332 insertions(+), 72 deletions(-) delete mode 100644 arch/arm64/include/asm/alternative-asm.h