OSDN Git Service

RISC-V: Fix building error when CONFIG_SPARSEMEM_MANUAL=y
authorGreentime Hu <greentime.hu@sifive.com>
Wed, 18 Sep 2019 10:38:24 +0000 (18:38 +0800)
committerPaul Walmsley <paul.walmsley@sifive.com>
Thu, 19 Sep 2019 12:44:34 +0000 (05:44 -0700)
commitb6f2b2e600a27b79801bae0bf73e3c34438dc0ae
tree87c87483705db0c28be72025c23720d4d336d19e
parentb45e0c30bc58fb6fcaa42f1d1d813cefb8ab4117
RISC-V: Fix building error when CONFIG_SPARSEMEM_MANUAL=y

Fix a build break by adjusting where VMALLOC_* and FIXADDR_* are
defined.  This fixes the definition of the MEMMAP_* macros.

  CC      init/main.o
In file included from ./include/linux/mm.h:99,
                 from ./include/linux/ring_buffer.h:5,
                 from ./include/linux/trace_events.h:6,
                 from ./include/trace/syscall.h:7,
                 from ./include/linux/syscalls.h:85,
                 from init/main.c:21:
./arch/riscv/include/asm/pgtable.h: In function ‘pmd_page’:
./arch/riscv/include/asm/pgtable.h:95:24: error: ‘VMALLOC_START’ undeclared (first use in this function); did you mean ‘VMEMMAP_START’?
 #define VMEMMAP_START (VMALLOC_START - VMEMMAP_SIZE)
                        ^~~~~~~~~~~~~

Fixes: d95f1a542c3d ("RISC-V: Implement sparsemem")
Signed-off-by: Greentime Hu <greentime.hu@sifive.com>
[paul.walmsley@sifive.com: minor patch description fix]
Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
arch/riscv/include/asm/pgtable.h