diff options
| author | Kefeng Wang <wangkefeng.wang@huawei.com> | 2021-10-11 13:05:59 +0200 |
|---|---|---|
| committer | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-10-27 00:49:41 +0200 |
| commit | 683b33f7e7ec0d827502dd0d8b947bdcfe2df6f1 (patch) | |
| tree | 368ad2c1cad807a05bef2b86df63f44ddf0b1e4c /arch/riscv | |
| parent | riscv: remove .text section size limitation for XIP (diff) | |
| download | linux-683b33f7e7ec0d827502dd0d8b947bdcfe2df6f1.tar.xz linux-683b33f7e7ec0d827502dd0d8b947bdcfe2df6f1.zip | |
riscv/vdso: Drop unneeded part due to merge issue
It seems that something is wrong when patch "riscv/vdso:
Refactor asm/vdso.h" is merged.
Let's fix the merge issue.
Fixes: 8edab02386c3 ("Merge remote-tracking branch 'palmer/riscv-vdso-cleanup' into for-next")
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Diffstat (limited to 'arch/riscv')
| -rw-r--r-- | arch/riscv/include/asm/vdso.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/riscv/include/asm/vdso.h b/arch/riscv/include/asm/vdso.h index e310b22fe3f3..bc6f75f3a199 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 */ |