diff options
| author | Michael Ellerman | 2016-02-25 11:52:58 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2016-02-25 11:52:58 +0100 |
| commit | 2527083cb831024d22a03f68f54f6a46ecf5bf6c (patch) | |
| tree | 41de92d988a4deccb2d5087a964a51682f155e99 /arch/powerpc/Kconfig | |
| parent | powerpc: Fix BUG_ON() reporting in real mode (diff) | |
| parent | powerpc/mm/hash: Clear the invalid slot information correctly (diff) | |
| download | kernel-qcow2-linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.tar.gz kernel-qcow2-linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.tar.xz kernel-qcow2-linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.zip | |
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.
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index e4824fd04bb7..9faa18c4f3f7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -557,7 +557,7 @@ choice config PPC_4K_PAGES bool "4k page size" - select HAVE_ARCH_SOFT_DIRTY if CHECKPOINT_RESTORE && PPC_BOOK3S + select HAVE_ARCH_SOFT_DIRTY if PPC_BOOK3S_64 config PPC_16K_PAGES bool "16k page size" @@ -566,7 +566,7 @@ config PPC_16K_PAGES config PPC_64K_PAGES bool "64k page size" depends on !PPC_FSL_BOOK3E && (44x || PPC_STD_MMU_64 || PPC_BOOK3E_64) - select HAVE_ARCH_SOFT_DIRTY if CHECKPOINT_RESTORE && PPC_BOOK3S + select HAVE_ARCH_SOFT_DIRTY if PPC_BOOK3S_64 config PPC_256K_PAGES bool "256k page size" |