Commit 12679a2d7e3bfbdc7586e3e86d1ca90c46659363
Exists in
master
and in
20 other branches
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
Pull more ARM updates from Russell King. This got a fair number of conflicts with the <asm/system.h> split, but also with some other sparse-irq and header file include cleanups. They all looked pretty trivial, though. * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (59 commits) ARM: fix Kconfig warning for HAVE_BPF_JIT ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds ARM: 7349/1: integrator: convert to sparse irqs ARM: 7259/3: net: JIT compiler for packet filters ARM: 7334/1: add jump label support ARM: 7333/2: jump label: detect %c support for ARM ARM: 7338/1: add support for early console output via semihosting ARM: use set_current_blocked() and block_sigmask() ARM: exec: remove redundant set_fs(USER_DS) ARM: 7332/1: extract out code patch function from kprobes ARM: 7331/1: extract out insn generation code from ftrace ARM: 7330/1: ftrace: use canonical Thumb-2 wide instruction format ARM: 7351/1: ftrace: remove useless memory checks ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path ARM: Versatile Express: add NO_IOPORT ARM: get rid of asm/irq.h in asm/prom.h ARM: 7319/1: Print debug info for SIGBUS in user faults ARM: 7318/1: gic: refactor irq_start assignment ARM: 7317/1: irq: avoid NULL check in for_each_irq_desc loop ARM: 7315/1: perf: add support for the Cortex-A7 PMU ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 159 changed files Side-by-side Diff
- arch/arm/Kconfig
- arch/arm/Kconfig.debug
- arch/arm/Makefile
- arch/arm/boot/compressed/.gitignore
- arch/arm/boot/compressed/Makefile
- arch/arm/boot/compressed/decompress.c
- arch/arm/boot/compressed/piggy.xzkern.S
- arch/arm/common/gic.c
- arch/arm/configs/integrator_defconfig
- arch/arm/include/asm/elf.h
- arch/arm/include/asm/hardware/cache-l2x0.h
- arch/arm/include/asm/hardware/it8152.h
- arch/arm/include/asm/irq.h
- arch/arm/include/asm/jump_label.h
- arch/arm/include/asm/mc146818rtc.h
- arch/arm/include/asm/memory.h
- arch/arm/include/asm/mmu_context.h
- arch/arm/include/asm/opcodes.h
- arch/arm/include/asm/page.h
- arch/arm/include/asm/perf_event.h
- arch/arm/include/asm/processor.h
- arch/arm/include/asm/prom.h
- arch/arm/include/asm/tlbflush.h
- arch/arm/include/asm/traps.h
- arch/arm/kernel/Makefile
- arch/arm/kernel/debug.S
- arch/arm/kernel/ftrace.c
- arch/arm/kernel/head.S
- arch/arm/kernel/insn.c
- arch/arm/kernel/insn.h
- arch/arm/kernel/irq.c
- arch/arm/kernel/jump_label.c
- arch/arm/kernel/kprobes.c
- arch/arm/kernel/machine_kexec.c
- arch/arm/kernel/patch.c
- arch/arm/kernel/patch.h
- arch/arm/kernel/perf_event.c
- arch/arm/kernel/perf_event_v7.c
- arch/arm/kernel/process.c
- arch/arm/kernel/sched_clock.c
- arch/arm/kernel/setup.c
- arch/arm/kernel/signal.c
- arch/arm/kernel/smp.c
- arch/arm/kernel/time.c
- arch/arm/kernel/traps.c
- arch/arm/mach-davinci/time.c
- arch/arm/mach-highbank/highbank.c
- arch/arm/mach-highbank/include/mach/irqs.h
- arch/arm/mach-integrator/core.c
- arch/arm/mach-integrator/include/mach/irqs.h
- arch/arm/mach-integrator/integrator_ap.c
- arch/arm/mach-integrator/integrator_cp.c
- arch/arm/mach-integrator/pci.c
- arch/arm/mach-integrator/pci_v3.c
- arch/arm/mach-mmp/aspenite.c
- arch/arm/mach-mmp/avengers_lite.c
- arch/arm/mach-mmp/brownstone.c
- arch/arm/mach-mmp/flint.c
- arch/arm/mach-mmp/gplugd.c
- arch/arm/mach-mmp/include/mach/irqs.h
- arch/arm/mach-mmp/irq-mmp2.c
- arch/arm/mach-mmp/jasper.c
- arch/arm/mach-mmp/tavorevb.c
- arch/arm/mach-mmp/teton_bga.c
- arch/arm/mach-mmp/ttc_dkb.c
- arch/arm/mach-msm/timer.c
- arch/arm/mach-picoxcell/include/mach/irqs.h
- arch/arm/mach-prima2/timer.c
- arch/arm/mach-pxa/capc7117.c
- arch/arm/mach-pxa/cm-x300.c
- arch/arm/mach-pxa/colibri-pxa270.c
- arch/arm/mach-pxa/colibri-pxa300.c
- arch/arm/mach-pxa/colibri-pxa320.c
- arch/arm/mach-pxa/corgi.c
- arch/arm/mach-pxa/csb726.c
- arch/arm/mach-pxa/devices.c
- arch/arm/mach-pxa/em-x270.c
- arch/arm/mach-pxa/gumstix.c
- arch/arm/mach-pxa/h5000.c
- arch/arm/mach-pxa/himalaya.c
- arch/arm/mach-pxa/icontrol.c
- arch/arm/mach-pxa/idp.c
- arch/arm/mach-pxa/include/mach/irqs.h
- arch/arm/mach-pxa/include/mach/mainstone.h
- arch/arm/mach-pxa/mioa701.c
- arch/arm/mach-pxa/mp900.c
- arch/arm/mach-pxa/palmld.c
- arch/arm/mach-pxa/palmt5.c
- arch/arm/mach-pxa/palmtc.c
- arch/arm/mach-pxa/palmte2.c
- arch/arm/mach-pxa/palmtreo.c
- arch/arm/mach-pxa/palmtx.c
- arch/arm/mach-pxa/palmz72.c
- arch/arm/mach-pxa/pxa3xx.c
- arch/arm/mach-pxa/raumfeld.c
- arch/arm/mach-pxa/saar.c
- arch/arm/mach-pxa/spitz.c
- arch/arm/mach-pxa/stargate2.c
- arch/arm/mach-pxa/tavorevb.c
- arch/arm/mach-pxa/time.c
- arch/arm/mach-pxa/trizeps4.c
- arch/arm/mach-pxa/viper.c
- arch/arm/mach-pxa/vpac270.c
- arch/arm/mach-pxa/xcep.c
- arch/arm/mach-pxa/z2.c
- arch/arm/mach-shmobile/Kconfig
- arch/arm/mach-shmobile/board-ag5evm.c
- arch/arm/mach-shmobile/board-bonito.c
- arch/arm/mach-shmobile/board-g3evm.c
- arch/arm/mach-shmobile/board-g4evm.c
- arch/arm/mach-shmobile/board-kota2.c
- arch/arm/mach-shmobile/board-mackerel.c
- arch/arm/mach-shmobile/board-marzen.c
- arch/arm/mach-shmobile/include/mach/irqs.h
- arch/arm/mach-shmobile/intc-r8a7740.c
- arch/arm/mach-shmobile/intc-sh7367.c
- arch/arm/mach-shmobile/intc-sh7372.c
- arch/arm/mach-shmobile/intc-sh7377.c
- arch/arm/mach-shmobile/intc-sh73a0.c
- arch/arm/mach-shmobile/setup-r8a7740.c
- arch/arm/mach-shmobile/setup-r8a7779.c
- arch/arm/mach-shmobile/setup-sh7367.c
- arch/arm/mach-shmobile/setup-sh7372.c
- arch/arm/mach-shmobile/setup-sh7377.c
- arch/arm/mach-shmobile/setup-sh73a0.c
- arch/arm/mach-vexpress/include/mach/io.h
- arch/arm/mm/cache-l2x0.c
- arch/arm/mm/copypage-v4mc.c
- arch/arm/mm/copypage-v6.c
- arch/arm/mm/copypage-xscale.c
- arch/arm/mm/dma-mapping.c
- arch/arm/mm/fault.c
- arch/arm/mm/flush.c
- arch/arm/mm/highmem.c
- arch/arm/mm/init.c
- arch/arm/mm/mm.h
- arch/arm/mm/mmu.c
- arch/arm/mm/vmregion.c
- arch/arm/mm/vmregion.h
- arch/arm/net/Makefile
- arch/arm/net/bpf_jit_32.c
- arch/arm/net/bpf_jit_32.h
- arch/arm/plat-nomadik/Kconfig
- arch/arm/plat-versatile/Kconfig
- arch/c6x/Kconfig
- arch/powerpc/Kconfig
- arch/sh/Kconfig
- arch/sh/include/asm/irq.h
- arch/x86/Kconfig
- drivers/clocksource/Kconfig
- drivers/gpio/gpio-pxa.c
- drivers/sh/intc/balancing.c
- drivers/sh/intc/core.c
- drivers/sh/intc/handle.c
- drivers/sh/intc/virq.c
- include/linux/sh_intc.h
- kernel/irq/Kconfig
- scripts/gcc-goto.sh
- sound/arm/pxa2xx-ac97-lib.c