Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull late MIPS fixes from Ralf Baechle: "This fixes a number of lose ends in the MIPS code and various bug fixes. Aside of dropping some patch that should not be in this pull request everything has sat in -next for quite a while and there are no known issues. The biggest patch in this patch set moves the allocation of an array that is aliased to a function (for runtime generated code) to assembler code. This avoids an issue with certain toolchains when building for microMIPS." * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (35 commits) MIPS: PCI: Move fixups from __init to __devinit. MIPS: Fix bug.h MIPS build regression MIPS: sync-r4k: remove redundant irq operation MIPS: smp: Warn on too early irq enable MIPS: call set_cpu_online() on cpu being brought up with irq disabled MIPS: call ->smp_finish() a little late MIPS: Yosemite: delay irq enable to ->smp_finish() MIPS: SMTC: delay irq enable to ->smp_finish() MIPS: BMIPS: delay irq enable to ->smp_finish() MIPS: Octeon: delay enable irq to ->smp_finish() MIPS: Oprofile: Fix build as a module. MIPS: BCM63XX: Fix BCM6368 IPSec clock bit MIPS: perf: Fix build error caused by unused counters_per_cpu_to_total() MIPS: Fix Magic SysRq L kernel crash. MIPS: BMIPS: Fix duplicate header inclusion. mips: mark const init data with __initconst instead of __initdata MIPS: cmpxchg.h: Add missing include MIPS: Malta may also be equipped with MIPS64 R2 processors. MIPS: Fix typo multipy -> multiply MIPS: Cavium: Fix duplicate ARCH_SPARSEMEM_ENABLE in kconfig. ...
Showing
- arch/mips/Kconfig 2 additions, 0 deletionsarch/mips/Kconfig
- arch/mips/bcm47xx/Kconfig 1 addition, 0 deletionsarch/mips/bcm47xx/Kconfig
- arch/mips/bcm63xx/dev-pcmcia.c 2 additions, 2 deletionsarch/mips/bcm63xx/dev-pcmcia.c
- arch/mips/cavium-octeon/Kconfig 0 additions, 4 deletionsarch/mips/cavium-octeon/Kconfig
- arch/mips/cavium-octeon/smp.c 1 addition, 1 deletionarch/mips/cavium-octeon/smp.c
- arch/mips/include/asm/cmpxchg.h 1 addition, 0 deletionsarch/mips/include/asm/cmpxchg.h
- arch/mips/include/asm/cpu.h 4 additions, 3 deletionsarch/mips/include/asm/cpu.h
- arch/mips/include/asm/gic.h 14 additions, 1 deletionarch/mips/include/asm/gic.h
- arch/mips/include/asm/inst.h 2 additions, 2 deletionsarch/mips/include/asm/inst.h
- arch/mips/include/asm/irq.h 1 addition, 0 deletionsarch/mips/include/asm/irq.h
- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h 1 addition, 1 deletionarch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- arch/mips/include/asm/mips-boards/maltaint.h 10 additions, 0 deletionsarch/mips/include/asm/mips-boards/maltaint.h
- arch/mips/include/asm/mipsmtregs.h 1 addition, 1 deletionarch/mips/include/asm/mipsmtregs.h
- arch/mips/include/asm/switch_to.h 4 additions, 2 deletionsarch/mips/include/asm/switch_to.h
- arch/mips/include/asm/thread_info.h 2 additions, 2 deletionsarch/mips/include/asm/thread_info.h
- arch/mips/kernel/cpu-probe.c 10 additions, 1 deletionarch/mips/kernel/cpu-probe.c
- arch/mips/kernel/mips_ksyms.c 7 additions, 1 deletionarch/mips/kernel/mips_ksyms.c
- arch/mips/kernel/octeon_switch.S 1 addition, 1 deletionarch/mips/kernel/octeon_switch.S
- arch/mips/kernel/perf_event_mipsxx.c 0 additions, 5 deletionsarch/mips/kernel/perf_event_mipsxx.c
- arch/mips/kernel/r2300_switch.S 3 additions, 12 deletionsarch/mips/kernel/r2300_switch.S
Loading
Please register or sign in to comment