lkml.org 
[lkml]   [2020]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/mm] x86/mm: Use pgprotval_t in protval_4k_2_large() and protval_large_2_4k()
    The following commit has been merged into the x86/mm branch of tip:

    Commit-ID: 325518e9b743686f471e7a4ef617b57c91386795
    Gitweb: https://git.kernel.org/tip/325518e9b743686f471e7a4ef617b57c91386795
    Author: Christoph Hellwig <hch@lst.de>
    AuthorDate: Wed, 22 Apr 2020 18:53:08 +02:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Thu, 23 Apr 2020 11:38:42 +02:00

    x86/mm: Use pgprotval_t in protval_4k_2_large() and protval_large_2_4k()

    Use the proper type for "raw" page table values.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Link: https://lkml.kernel.org/r/20200422170116.GA28345@lst.de
    ---
    arch/x86/include/asm/pgtable_types.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
    index 567abdb..7b6ddcf 100644
    --- a/arch/x86/include/asm/pgtable_types.h
    +++ b/arch/x86/include/asm/pgtable_types.h
    @@ -478,7 +478,7 @@ static inline pteval_t pte_flags(pte_t pte)

    unsigned long cachemode2protval(enum page_cache_mode pcm);

    -static inline unsigned long protval_4k_2_large(unsigned long val)
    +static inline pgprotval_t protval_4k_2_large(pgprotval_t val)
    {
    return (val & ~(_PAGE_PAT | _PAGE_PAT_LARGE)) |
    ((val & _PAGE_PAT) << (_PAGE_BIT_PAT_LARGE - _PAGE_BIT_PAT));
    @@ -487,7 +487,7 @@ static inline pgprot_t pgprot_4k_2_large(pgprot_t pgprot)
    {
    return __pgprot(protval_4k_2_large(pgprot_val(pgprot)));
    }
    -static inline unsigned long protval_large_2_4k(unsigned long val)
    +static inline pgprotval_t protval_large_2_4k(pgprotval_t val)
    {
    return (val & ~(_PAGE_PAT | _PAGE_PAT_LARGE)) |
    ((val & _PAGE_PAT_LARGE) >>
    \
     
     \ /
      Last update: 2020-04-23 14:27    [W:3.086 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site