On Sun, May 30, 2021 at 7:08 AM Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx> wrote:
Em ... I'll separate it. Thx for reply.
On Tue, 25 May 2021 05:20:34 PDT (-0700), guoren@xxxxxxxxxx wrote:
> From: Guo Ren <guoren@xxxxxxxxxxxxxxxxx>
>
> These functions haven't been used, so just remove them. The patch
> has been tested with riscv, but I only use grep to check the
> microblaze's.
>
> Signed-off-by: Guo Ren <guoren@xxxxxxxxxxxxxxxxx>
> Cc: Arnd Bergmann <arnd@xxxxxxxx>
> Cc: Michal Simek <monstr@xxxxxxxxx>
> Cc: Christoph Hellwig <hch@xxxxxx>
> ---
> arch/microblaze/include/asm/page.h | 3 ---
> arch/riscv/include/asm/page.h | 10 ----------
> 2 files changed, 13 deletions(-)
>
> diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h
> index bf681f2..ce55097 100644
> --- a/arch/microblaze/include/asm/page.h
> +++ b/arch/microblaze/include/asm/page.h
> @@ -35,9 +35,6 @@
>
> #define ARCH_SLAB_MINALIGN L1_CACHE_BYTES
>
> -#define PAGE_UP(addr) (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
> -#define PAGE_DOWN(addr) ((addr)&(~((PAGE_SIZE)-1)))
> -
> /*
> * PAGE_OFFSET -- the first address of the first page of memory. With MMU
> * it is set to the kernel start address (aligned on a page boundary).
> diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h
> index 6a7761c..a1b888f 100644
> --- a/arch/riscv/include/asm/page.h
> +++ b/arch/riscv/include/asm/page.h
> @@ -37,16 +37,6 @@
>
> #ifndef __ASSEMBLY__
>
> -#define PAGE_UP(addr) (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
> -#define PAGE_DOWN(addr) ((addr)&(~((PAGE_SIZE)-1)))
> -
> -/* align addr on a size boundary - adjust address up/down if needed */
> -#define _ALIGN_UP(addr, size) (((addr)+((size)-1))&(~((size)-1)))
> -#define _ALIGN_DOWN(addr, size) ((addr)&(~((size)-1)))
> -
> -/* align addr on a size boundary - adjust address up if needed */
> -#define _ALIGN(addr, size) _ALIGN_UP(addr, size)
> -
> #define clear_page(pgaddr) memset((pgaddr), 0, PAGE_SIZE)
> #define copy_page(to, from) memcpy((to), (from), PAGE_SIZE)
Reviewed-by: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx>
Acked-by: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx>
It's generally easier if you split this sort of stuff up, as it'll be
easier to merge if we don't have to coordinate between the trees. I'm
happy to take this, but I'd prefer an Ack from one of the microblaze
folks first.