diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-09-08 14:41:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-09-08 14:41:40 +1000 |
| commit | ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf (patch) | |
| tree | 3a54614d597b7b92ada36c5ea26dc994216b628b /arch/powerpc/mm/book3s64/hash_utils.c | |
| parent | 3393649977f9a8847c659e282ea290d4b703295c (diff) | |
| parent | f4d51dffc6c01a9e94650d95ce0104964f8ae822 (diff) | |
| download | linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.gz linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.bz2 linux-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.zip | |
Merge tag 'v5.9-rc4' into drm-next
Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'arch/powerpc/mm/book3s64/hash_utils.c')
| -rw-r--r-- | arch/powerpc/mm/book3s64/hash_utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c index 890a71c5293e..c663e7ba801f 100644 --- a/arch/powerpc/mm/book3s64/hash_utils.c +++ b/arch/powerpc/mm/book3s64/hash_utils.c @@ -232,6 +232,8 @@ unsigned long htab_convert_pte_flags(unsigned long pteflags) rflags |= HPTE_R_I; else if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_NON_IDEMPOTENT) rflags |= (HPTE_R_I | HPTE_R_G); + else if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_SAO) + rflags |= (HPTE_R_W | HPTE_R_I | HPTE_R_M); else /* * Add memory coherence if cache inhibited is not set |