lkml.org 
[lkml]   [2020]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V1 02/10] arch/xtensa: Move kmap build bug out of the way
    Date
    From: Ira Weiny <ira.weiny@intel.com>

    Move the kmap() build bug to kmap_init() to facilitate patches to lift
    kmap() to the core.

    Signed-off-by: Ira Weiny <ira.weiny@intel.com>
    ---
    arch/xtensa/include/asm/highmem.h | 5 -----
    arch/xtensa/mm/highmem.c | 5 +++++
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/xtensa/include/asm/highmem.h b/arch/xtensa/include/asm/highmem.h
    index 413848cc1e56..a9587c85be85 100644
    --- a/arch/xtensa/include/asm/highmem.h
    +++ b/arch/xtensa/include/asm/highmem.h
    @@ -68,11 +68,6 @@ void kunmap_high(struct page *page);

    static inline void *kmap(struct page *page)
    {
    - /* Check if this memory layout is broken because PKMAP overlaps
    - * page table.
    - */
    - BUILD_BUG_ON(PKMAP_BASE <
    - TLBTEMP_BASE_1 + TLBTEMP_SIZE);
    might_sleep();
    if (!PageHighMem(page))
    return page_address(page);
    diff --git a/arch/xtensa/mm/highmem.c b/arch/xtensa/mm/highmem.c
    index 184ceadccc1a..711641c4d214 100644
    --- a/arch/xtensa/mm/highmem.c
    +++ b/arch/xtensa/mm/highmem.c
    @@ -88,6 +88,11 @@ void __init kmap_init(void)
    {
    unsigned long kmap_vstart;

    + /* Check if this memory layout is broken because PKMAP overlaps
    + * page table.
    + */
    + BUILD_BUG_ON(PKMAP_BASE <
    + TLBTEMP_BASE_1 + TLBTEMP_SIZE);
    /* cache the first kmap pte */
    kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
    kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-04-30 22:39    [W:4.424 / U:24.752 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site