Skip to content

Commit 683b33f

Browse files
Kefeng Wangpalmer-dabbelt
authored andcommitted
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: 8edab02 ("Merge remote-tracking branch 'palmer/riscv-vdso-cleanup' into for-next") Signed-off-by: Kefeng Wang <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent f9ace4e commit 683b33f

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

arch/riscv/include/asm/vdso.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88
#ifndef _ASM_RISCV_VDSO_H
99
#define _ASM_RISCV_VDSO_H
1010

11-
12-
/*
13-
* All systems with an MMU have a VDSO, but systems without an MMU don't
14-
* support shared libraries and therefor don't have one.
15-
*/
16-
#ifdef CONFIG_MMU
17-
18-
#include <linux/types.h>
1911
/*
2012
* All systems with an MMU have a VDSO, but systems without an MMU don't
2113
* support shared libraries and therefor don't have one.
@@ -29,9 +21,6 @@
2921

3022
#define VDSO_SYMBOL(base, name) \
3123
(void __user *)((unsigned long)(base) + __vdso_##name##_offset)
32-
33-
#endif /* CONFIG_MMU */
34-
3524
#endif /* !__ASSEMBLY__ */
3625

3726
#endif /* CONFIG_MMU */

0 commit comments

Comments
 (0)