[PATCH] riscv/vdso: Drop unneeded part due to merge issue
Kefeng Wang
wangkefeng.wang at huawei.com
Mon Oct 11 04:05:59 PDT 2021
It seems that something is wrong when patch "riscv/vdso:
Refactor asm/vdso.h" is mereged.
Let's fix the merge issue.
Fixes: bb4a23c994ae ("riscv/vdso: Refactor asm/vdso.h")
Signed-off-by: Kefeng Wang <wangkefeng.wang at huawei.com>
---
arch/riscv/include/asm/vdso.h | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/arch/riscv/include/asm/vdso.h b/arch/riscv/include/asm/vdso.h
index 208e31bc5d1c..3e295212d746 100644
--- a/arch/riscv/include/asm/vdso.h
+++ b/arch/riscv/include/asm/vdso.h
@@ -8,14 +8,6 @@
#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>
/*
* All systems with an MMU have a VDSO, but systems without an MMU don't
* support shared libraries and therefor don't have one.
@@ -29,9 +21,6 @@
#define VDSO_SYMBOL(base, name) \
(void __user *)((unsigned long)(base) + __vdso_##name##_offset)
-
-#endif /* CONFIG_MMU */
-
#endif /* !__ASSEMBLY__ */
#endif /* CONFIG_MMU */
--
2.26.2
More information about the linux-riscv
mailing list