Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (23 commits) [POWERPC] Remove leftover printk in isa-bridge.c [POWERPC] Remove duplicate #include [POWERPC] Initialize lockdep earlier [POWERPC] Document when printk is useable [POWERPC] Fix bogus paca->_current initialization [POWERPC] Fix of_i2c include for module compilation [POWERPC] Make default cputable entries reflect selected CPU family [POWERPC] spufs: lockdep annotations for spufs_dir_close [POWERPC] spufs: don't requeue victim contex in find_victim if it's not in spu_run [POWERPC] 4xx: Fix PCI mem in sequoia DTS [POWERPC] 4xx: Add endpoint support to 4xx PCIe driver [POWERPC] 4xx: Fix problem with new TLB storage attibute fields on 440x6 core [POWERPC] spufs: spu_create should send inotify IM_CREATE event [POWERPC] spufs: handle faults while the context switch pending flag is set [POWERPC] spufs: fix concurrent delivery of class 0 & 1 exceptions [POWERPC] spufs: try to route SPU interrupts to local node [POWERPC] spufs: set SPU_CONTEXT_SWITCH_PENDING before synchronising SPU irqs [POWERPC] spufs: don't acquire state_mutex interruptible while performing callback [POWERPC] spufs: update master runcntl with context lock held [POWERPC] spufs: fix post-stopped update of MFC_CNTL register ...
Showing
- arch/powerpc/boot/dts/sequoia.dts 7 additions, 2 deletionsarch/powerpc/boot/dts/sequoia.dts
- arch/powerpc/kernel/btext.c 0 additions, 1 deletionarch/powerpc/kernel/btext.c
- arch/powerpc/kernel/cputable.c 43 additions, 10 deletionsarch/powerpc/kernel/cputable.c
- arch/powerpc/kernel/head_44x.S 8 additions, 1 deletionarch/powerpc/kernel/head_44x.S
- arch/powerpc/kernel/head_64.S 0 additions, 4 deletionsarch/powerpc/kernel/head_64.S
- arch/powerpc/kernel/isa-bridge.c 0 additions, 3 deletionsarch/powerpc/kernel/isa-bridge.c
- arch/powerpc/kernel/setup_64.c 7 additions, 3 deletionsarch/powerpc/kernel/setup_64.c
- arch/powerpc/platforms/cell/interrupt.c 51 additions, 2 deletionsarch/powerpc/platforms/cell/interrupt.c
- arch/powerpc/platforms/cell/spu_base.c 22 additions, 9 deletionsarch/powerpc/platforms/cell/spu_base.c
- arch/powerpc/platforms/cell/spu_priv1_mmio.c 14 additions, 2 deletionsarch/powerpc/platforms/cell/spu_priv1_mmio.c
- arch/powerpc/platforms/cell/spufs/fault.c 11 additions, 6 deletionsarch/powerpc/platforms/cell/spufs/fault.c
- arch/powerpc/platforms/cell/spufs/inode.c 7 additions, 3 deletionsarch/powerpc/platforms/cell/spufs/inode.c
- arch/powerpc/platforms/cell/spufs/run.c 23 additions, 15 deletionsarch/powerpc/platforms/cell/spufs/run.c
- arch/powerpc/platforms/cell/spufs/sched.c 5 additions, 2 deletionsarch/powerpc/platforms/cell/spufs/sched.c
- arch/powerpc/platforms/cell/spufs/spufs.h 2 additions, 1 deletionarch/powerpc/platforms/cell/spufs/spufs.h
- arch/powerpc/platforms/cell/spufs/switch.c 49 additions, 22 deletionsarch/powerpc/platforms/cell/spufs/switch.c
- arch/powerpc/sysdev/ppc4xx_pci.c 131 additions, 49 deletionsarch/powerpc/sysdev/ppc4xx_pci.c
- arch/powerpc/xmon/xmon.c 4 additions, 2 deletionsarch/powerpc/xmon/xmon.c
- include/asm-powerpc/pgtable-ppc32.h 7 additions, 0 deletionsinclude/asm-powerpc/pgtable-ppc32.h
- include/asm-powerpc/spu.h 6 additions, 3 deletionsinclude/asm-powerpc/spu.h
Loading
Please register or sign in to comment