diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 12:53:14 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 12:53:14 -0800 |
| commit | 6e9131cc43a672003a75483d9b9db5c51015ae5f (patch) | |
| tree | 23deb539a695272dc9f003b4ab094037ccc10f31 /arch/powerpc/include/asm/book3s/64/hash.h | |
| parent | tty: Remove ASYNC_CLOSING (diff) | |
| parent | Linux 4.5-rc2 (diff) | |
| download | linux-dev-6e9131cc43a672003a75483d9b9db5c51015ae5f.tar.xz linux-dev-6e9131cc43a672003a75483d9b9db5c51015ae5f.zip | |
Merge 4.5-rc2 into tty-next
We want the tty/serial fixes in here as well to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/include/asm/book3s/64/hash.h')
| -rw-r--r-- | arch/powerpc/include/asm/book3s/64/hash.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h index 06f17e778c27..8d1c8162f0c1 100644 --- a/arch/powerpc/include/asm/book3s/64/hash.h +++ b/arch/powerpc/include/asm/book3s/64/hash.h @@ -50,7 +50,9 @@ * set of bits not changed in pmd_modify. */ #define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \ - _PAGE_ACCESSED | _PAGE_THP_HUGE) + _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE | \ + _PAGE_SOFT_DIRTY) + #ifdef CONFIG_PPC_64K_PAGES #include <asm/book3s/64/hash-64k.h> |