Re: [PATCH V2 05/11] {x86,powerpc,microblaze}/kmap: Move preempt disable

Christoph Hellwig
2020-05-06T06:11:24Z

On Sun, May 03, 2020 at 06:09:06PM -0700, ira.weiny@intel.com wrote:
> From: Ira Weiny <ira.weiny@intel.com>
>
> During this kmap() conversion series we must maintain bisect-ability.
> To do this, kmap_atomic_prot() in x86, powerpc, and microblaze need to
> remain functional.
>
> Create a temporary inline version of kmap_atomic_prot within these
> architectures so we can rework their kmap_atomic() calls and then lift
> kmap_atomic_prot() to the core.
>
> Signed-off-by: Ira Weiny <ira.weiny@intel.com>
>
> ---
> Changes from V1:
> New patch
> ---
> arch/microblaze/include/asm/highmem.h | 11 ++++++++++-
> arch/microblaze/mm/highmem.c | 10 ++--------
> arch/powerpc/include/asm/highmem.h | 11 ++++++++++-
> arch/powerpc/mm/highmem.c | 9 ++-------
> arch/x86/include/asm/highmem.h | 11 ++++++++++-
> arch/x86/mm/highmem_32.c | 10 ++--------
> 6 files changed, 36 insertions(+), 26 deletions(-)
>
> diff --git a/arch/microblaze/include/asm/highmem.h b/arch/microblaze/include/asm/highmem.h
> index 0c94046f2d58..ec9954b091e1 100644
> --- a/arch/microblaze/include/asm/highmem.h
> +++ b/arch/microblaze/include/asm/highmem.h
> @@ -51,7 +51,16 @@ extern pte_t *pkmap_page_table;
> #define PKMAP_NR(virt) ((virt - PKMAP_BASE) >> PAGE_SHIFT)
> #define PKMAP_ADDR(nr) (PKMAP_BASE + ((nr) << PAGE_SHIFT))
>
> -extern void *kmap_atomic_prot(struct page *page, pgprot_t prot);
> +extern void *kmap_atomic_high_prot(struct page *page, pgprot_t prot);
> +void *kmap_atomic_prot(struct page *page, pgprot_t prot)

Shouldn't this be marked inline?

The rest looks fine:

Reviewed-by: Christoph Hellwig <hch@lst.de>