Merge tag 'powerpc-4.5-4' into next
Pull in our current fixes from 4.5, in particular the "Fix Multi hit ERAT" bug is causing folks some grief when testing next.
Showing
- arch/powerpc/Kconfig 2 additions, 2 deletionsarch/powerpc/Kconfig
- arch/powerpc/include/asm/book3s/64/pgtable.h 4 additions, 0 deletionsarch/powerpc/include/asm/book3s/64/pgtable.h
- arch/powerpc/include/asm/eeh.h 1 addition, 0 deletionsarch/powerpc/include/asm/eeh.h
- arch/powerpc/include/asm/trace.h 6 additions, 2 deletionsarch/powerpc/include/asm/trace.h
- arch/powerpc/kernel/eeh_driver.c 4 additions, 2 deletionsarch/powerpc/kernel/eeh_driver.c
- arch/powerpc/kernel/eeh_pe.c 1 addition, 1 deletionarch/powerpc/kernel/eeh_pe.c
- arch/powerpc/kernel/module_64.c 1 addition, 1 deletionarch/powerpc/kernel/module_64.c
- arch/powerpc/mm/hash64_64k.c 7 additions, 1 deletionarch/powerpc/mm/hash64_64k.c
- arch/powerpc/mm/hugepage-hash64.c 11 additions, 1 deletionarch/powerpc/mm/hugepage-hash64.c
- arch/powerpc/mm/pgtable_64.c 32 additions, 0 deletionsarch/powerpc/mm/pgtable_64.c
- arch/powerpc/platforms/powernv/eeh-powernv.c 4 additions, 1 deletionarch/powerpc/platforms/powernv/eeh-powernv.c
- arch/powerpc/platforms/powernv/pci-ioda.c 1 addition, 0 deletionsarch/powerpc/platforms/powernv/pci-ioda.c
- arch/powerpc/platforms/powernv/pci.c 26 additions, 0 deletionsarch/powerpc/platforms/powernv/pci.c
- arch/powerpc/platforms/powernv/pci.h 1 addition, 0 deletionsarch/powerpc/platforms/powernv/pci.h
- include/asm-generic/pgtable.h 8 additions, 0 deletionsinclude/asm-generic/pgtable.h
- mm/huge_memory.c 1 addition, 0 deletionsmm/huge_memory.c
Loading
Please register or sign in to comment