Commit a290f510 authored by Palmer Dabbelt's avatar Palmer Dabbelt

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
...@@ -108,9 +108,11 @@ PHONY += vdso_install ...@@ -108,9 +108,11 @@ PHONY += vdso_install
vdso_install: vdso_install:
$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@ $(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@
ifeq ($(CONFIG_MMU),y)
prepare: vdso_prepare prepare: vdso_prepare
vdso_prepare: prepare0 vdso_prepare: prepare0
$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso include/generated/vdso-offsets.h $(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso include/generated/vdso-offsets.h
endif
ifneq ($(CONFIG_XIP_KERNEL),y) ifneq ($(CONFIG_XIP_KERNEL),y)
ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy) ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy)
......
...@@ -8,6 +8,13 @@ ...@@ -8,6 +8,13 @@
#ifndef _ASM_RISCV_VDSO_H #ifndef _ASM_RISCV_VDSO_H
#define _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 <linux/types.h>
#include <generated/vdso-offsets.h> #include <generated/vdso-offsets.h>
...@@ -19,6 +26,8 @@ struct vdso_data { ...@@ -19,6 +26,8 @@ struct vdso_data {
#define VDSO_SYMBOL(base, name) \ #define VDSO_SYMBOL(base, name) \
(void __user *)((unsigned long)(base) + __vdso_##name##_offset) (void __user *)((unsigned long)(base) + __vdso_##name##_offset)
#endif /* CONFIG_MMU */
asmlinkage long sys_riscv_flush_icache(uintptr_t, uintptr_t, uintptr_t); asmlinkage long sys_riscv_flush_icache(uintptr_t, uintptr_t, uintptr_t);
#endif /* _ASM_RISCV_VDSO_H */ #endif /* _ASM_RISCV_VDSO_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment