lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 277/606] riscv: Add pgprot_writecombine/device and PAGE_SHARED defination if NOMMU
    Date
    From: Kefeng Wang <wangkefeng.wang@huawei.com>

    [ Upstream commit fa8174aa225fe3d53b37552e5066e6f0301dbabd ]

    Some drivers use PAGE_SHARED, pgprot_writecombine()/pgprot_device(),
    add the defination to fix build error if NOMMU.

    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
    Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/riscv/include/asm/mmio.h | 2 ++
    arch/riscv/include/asm/pgtable.h | 1 +
    2 files changed, 3 insertions(+)

    diff --git a/arch/riscv/include/asm/mmio.h b/arch/riscv/include/asm/mmio.h
    index a2c809df2733..56053c9838b2 100644
    --- a/arch/riscv/include/asm/mmio.h
    +++ b/arch/riscv/include/asm/mmio.h
    @@ -16,6 +16,8 @@

    #ifndef CONFIG_MMU
    #define pgprot_noncached(x) (x)
    +#define pgprot_writecombine(x) (x)
    +#define pgprot_device(x) (x)
    #endif /* CONFIG_MMU */

    /* Generic IO read/write. These perform native-endian accesses. */
    diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
    index 393f2014dfee..05b92987f500 100644
    --- a/arch/riscv/include/asm/pgtable.h
    +++ b/arch/riscv/include/asm/pgtable.h
    @@ -460,6 +460,7 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma,

    #else /* CONFIG_MMU */

    +#define PAGE_SHARED __pgprot(0)
    #define PAGE_KERNEL __pgprot(0)
    #define swapper_pg_dir NULL
    #define VMALLOC_START 0
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:02    [W:4.030 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site