riscv: mm: fix build errors caused by mk_pmd()
authorNanyong Sun <sunnanyong@huawei.com>
Thu, 17 Jun 2021 09:58:31 +0000 (17:58 +0800)
committerPalmer Dabbelt <palmerdabbelt@google.com>
Tue, 6 Jul 2021 01:42:31 +0000 (18:42 -0700)
commit9eb4fcff220790f4afadf59160f2c696e99f0a84
treeafab52c5f4e81ed972198468b4c1e8d9c182c14d
parent658e2c5125bbbc9b9b5eac23b3c35b87df3c30b8
riscv: mm: fix build errors caused by mk_pmd()

With "riscv: mm: add THP support on 64-bit", mk_pmd() function
introduce build errors,
1.build with CONFIG_ARCH_RV32I=y:
arch/riscv/include/asm/pgtable.h: In function 'mk_pmd':
arch/riscv/include/asm/pgtable.h:513:9: error: implicit declaration of function 'pfn_pmd';
 did you mean 'pfn_pgd'? [-Werror=implicit-function-declaration]

2.build with CONFIG_SPARSEMEM=y && CONFIG_SPARSEMEM_VMEMMAP=n
arch/riscv/include/asm/pgtable.h: In function 'mk_pmd':
include/asm-generic/memory_model.h:64:14: error: implicit declaration of function 'page_to_section';
 did you mean 'present_section'? [-Werror=implicit-function-declaration]

Move the definition of mk_pmd to pgtable-64.h to fix the first error.
Use macro definition instead of inline function for mk_pmd
to fix the second problem. It is similar to the mk_pte macro.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Nanyong Sun <sunnanyong@huawei.com>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
arch/riscv/include/asm/pgtable-64.h
arch/riscv/include/asm/pgtable.h