diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-17 08:36:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-17 08:36:21 -0800 |
| commit | c5f1ac5e9afb199638414be77cbc22eb68e14d97 (patch) | |
| tree | 16b4cee5abafd5dca28be54d0d15e4d643e56dc4 | |
| parent | Merge tag 'csky-for-linus-5.0-rc6' of git://github.com/c-sky/csky-linux (diff) | |
| parent | powerpc/64s: Fix possible corruption on big endian due to pgd/pud_present() (diff) | |
| download | linux-dev-c5f1ac5e9afb199638414be77cbc22eb68e14d97.tar.xz linux-dev-c5f1ac5e9afb199638414be77cbc22eb68e14d97.zip | |
Merge tag 'powerpc-5.0-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman:
"Just one fix, for pgd/pud_present() which were broken on big endian
since v4.20, leading to possible data corruption.
Thanks to: Aneesh Kumar K.V., Erhard F., Jan Kara"
* tag 'powerpc-5.0-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/64s: Fix possible corruption on big endian due to pgd/pud_present()
| -rw-r--r-- | arch/powerpc/include/asm/book3s/64/pgtable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index c9bfe526ca9d..d8c8d7c9df15 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -904,7 +904,7 @@ static inline int pud_none(pud_t pud) static inline int pud_present(pud_t pud) { - return (pud_raw(pud) & cpu_to_be64(_PAGE_PRESENT)); + return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PRESENT)); } extern struct page *pud_page(pud_t pud); @@ -951,7 +951,7 @@ static inline int pgd_none(pgd_t pgd) static inline int pgd_present(pgd_t pgd) { - return (pgd_raw(pgd) & cpu_to_be64(_PAGE_PRESENT)); + return !!(pgd_raw(pgd) & cpu_to_be64(_PAGE_PRESENT)); } static inline pte_t pgd_pte(pgd_t pgd) |