Unverified Commit 683b33f7 authored by Kefeng Wang's avatar Kefeng Wang Committed by Palmer Dabbelt
Browse files

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: 8edab023 ("Merge remote-tracking branch 'palmer/riscv-vdso-cleanup' into for-next")
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent f9ace4ed

arch/riscv/include/asm/vdso.h

+0 −11
Original line number Diff line number Diff line
@@ -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 */