Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull second set of ARM changes from Russell King: "This is the remainder of the ARM changes for this merge window. Included in this request are: - fixes for kprobes for big-endian support - fix tracing in soft_restart - avoid phys address overflow in kdump code - fix reporting of read-only pmd bits in kernel page table dump - remove unnecessary (and possibly buggy) call to outer_flush_all() - fix a three sparse warnings (missing header file for function prototypes) - fix pj4 crashing single zImage (thanks to arm-soc merging changes which enables this with knowledge that the corresponding fix had not even been submitted for my tree before the merge window opened) - vfp macro cleanups - dump register state on undefined instruction userspace faults when debugging" * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: Dump the registers on undefined instruction userspace faults ARM: 8018/1: Add {inc,dec}_preempt_count asm macros ARM: 8017/1: Move asm macro get_thread_info to asm/assembler.h ARM: 8016/1: Check cpu id in pj4_cp0_init. ARM: 8015/1: Add cpu_is_pj4 to distinguish PJ4 because it has some differences with V7 ARM: add missing system_misc.h include to process.c ARM: 8009/1: dcscb.c: remove call to outer_flush_all() ARM: 8014/1: mm: fix reporting of read-only PMD bits ARM: 8012/1: kdump: Avoid overflow when converting pfn to physaddr ARM: 8010/1: avoid tracers in soft_restart ARM: kprobes-test: Workaround GAS .align bug ARM: kprobes-test: use <asm/opcodes.h> for Thumb instruction building ARM: kprobes-test: use <asm/opcodes.h> for ARM instruction building ARM: kprobes-test: use <asm/opcodes.h> for instruction accesses ARM: probes: fix instruction fetch order with <asm/opcodes.h>
Showing
- arch/arm/include/asm/assembler.h 42 additions, 0 deletionsarch/arm/include/asm/assembler.h
- arch/arm/include/asm/cputype.h 19 additions, 0 deletionsarch/arm/include/asm/cputype.h
- arch/arm/kernel/crash_dump.c 1 addition, 1 deletionarch/arm/kernel/crash_dump.c
- arch/arm/kernel/entry-header.S 0 additions, 11 deletionsarch/arm/kernel/entry-header.S
- arch/arm/kernel/kprobes-common.c 3 additions, 1 deletionarch/arm/kernel/kprobes-common.c
- arch/arm/kernel/kprobes-test-arm.c 302 additions, 301 deletionsarch/arm/kernel/kprobes-test-arm.c
- arch/arm/kernel/kprobes-test-thumb.c 224 additions, 223 deletionsarch/arm/kernel/kprobes-test-thumb.c
- arch/arm/kernel/kprobes-test.c 7 additions, 6 deletionsarch/arm/kernel/kprobes-test.c
- arch/arm/kernel/kprobes-test.h 1 addition, 1 deletionarch/arm/kernel/kprobes-test.h
- arch/arm/kernel/kprobes-thumb.c 12 additions, 8 deletionsarch/arm/kernel/kprobes-thumb.c
- arch/arm/kernel/kprobes.c 5 additions, 4 deletionsarch/arm/kernel/kprobes.c
- arch/arm/kernel/pj4-cp0.c 4 additions, 0 deletionsarch/arm/kernel/pj4-cp0.c
- arch/arm/kernel/probes.c 8 additions, 7 deletionsarch/arm/kernel/probes.c
- arch/arm/kernel/process.c 2 additions, 1 deletionarch/arm/kernel/process.c
- arch/arm/kernel/traps.c 1 addition, 0 deletionsarch/arm/kernel/traps.c
- arch/arm/mach-vexpress/dcscb.c 9 additions, 4 deletionsarch/arm/mach-vexpress/dcscb.c
- arch/arm/mm/dump.c 32 additions, 15 deletionsarch/arm/mm/dump.c
- arch/arm/vfp/entry.S 7 additions, 18 deletionsarch/arm/vfp/entry.S
- arch/arm/vfp/vfphw.S 6 additions, 13 deletionsarch/arm/vfp/vfphw.S
Loading
Please register or sign in to comment