lkml.org 
[lkml]   [2023]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] m68k: use asm-generic/memory_model.h for both MMU and !MMU
    Date
    From: "Mike Rapoport (IBM)" <rppt@kernel.org>

    The MMU variant uses generic definitions of page_to_pfn() and
    pfn_to_page(), but !MMU defines them in include/asm/page_no.h for no
    good reason.

    Include asm-generic/memory_model.h in the common include/asm/page.h and
    drop redundant definitions.

    Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
    ---
    arch/m68k/include/asm/page.h | 6 +-----
    arch/m68k/include/asm/page_mm.h | 1 -
    arch/m68k/include/asm/page_no.h | 2 --
    3 files changed, 1 insertion(+), 8 deletions(-)

    diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h
    index 2f1c54e4725d..a5993ad83ed8 100644
    --- a/arch/m68k/include/asm/page.h
    +++ b/arch/m68k/include/asm/page.h
    @@ -62,11 +62,7 @@ extern unsigned long _ramend;
    #include <asm/page_no.h>
    #endif

    -#ifndef CONFIG_MMU
    -#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT))
    -#define __pfn_to_phys(pfn) PFN_PHYS(pfn)
    -#endif
    -
    #include <asm-generic/getorder.h>
    +#include <asm-generic/memory_model.h>

    #endif /* _M68K_PAGE_H */
    diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
    index a5b459bcb7d8..3903db2e8da7 100644
    --- a/arch/m68k/include/asm/page_mm.h
    +++ b/arch/m68k/include/asm/page_mm.h
    @@ -134,7 +134,6 @@ extern int m68k_virt_to_node_shift;
    })

    #define ARCH_PFN_OFFSET (m68k_memory[0].addr >> PAGE_SHIFT)
    -#include <asm-generic/memory_model.h>

    #define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory)
    #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
    diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h
    index c9d0d84158a4..0a8ccef777fd 100644
    --- a/arch/m68k/include/asm/page_no.h
    +++ b/arch/m68k/include/asm/page_no.h
    @@ -26,8 +26,6 @@ extern unsigned long memory_end;
    #define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT))
    #define page_to_virt(page) __va(((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET))

    -#define pfn_to_page(pfn) virt_to_page(pfn_to_virt(pfn))
    -#define page_to_pfn(page) virt_to_pfn(page_to_virt(page))
    #define pfn_valid(pfn) ((pfn) < max_mapnr)

    #define virt_addr_valid(kaddr) (((unsigned long)(kaddr) >= PAGE_OFFSET) && \
    --
    2.35.1
    \
     
     \ /
      Last update: 2023-03-26 23:55    [W:5.184 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site