Unverified Commit a290f510 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

RISC-V: Fix VDSO build for !MMU 



We don't have a VDSO for the !MMU configurations, so don't try to build
one.

Fixes: fde9c59a ("riscv: explicitly use symbol offsets for VDSO")
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 803930ee

arch/riscv/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -108,9 +108,11 @@ PHONY += vdso_install 
vdso_install:

	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@



ifeq ($(CONFIG_MMU),y)

prepare: vdso_prepare

vdso_prepare: prepare0

	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso include/generated/vdso-offsets.h

endif



ifneq ($(CONFIG_XIP_KERNEL),y)

ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy)

arch/riscv/include/asm/vdso.h

+9 −0
Original line number Diff line number Diff line
@@ -8,6 +8,13 @@ 
#ifndef _ASM_RISCV_VDSO_H

#define _ASM_RISCV_VDSO_H





/*

 * All systems with an MMU have a VDSO, but systems without an MMU don't

 * support shared libraries and therefor don't have one.

 */

#ifdef CONFIG_MMU



#include <linux/types.h>

#include <generated/vdso-offsets.h>
@@ -19,6 +26,8 @@ struct vdso_data { 
#define VDSO_SYMBOL(base, name)							\

	(void __user *)((unsigned long)(base) + __vdso_##name##_offset)



#endif /* CONFIG_MMU */



asmlinkage long sys_riscv_flush_icache(uintptr_t, uintptr_t, uintptr_t);



#endif /* _ASM_RISCV_VDSO_H */