It seems that something is wrong when patch "riscv/vdso:
Refactor asm/vdso.h" is merged.
Let's fix the merge issue.
Fixes: 8edab02386
("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>
28 lines
660 B
C
28 lines
660 B
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2012 ARM Limited
|
|
* Copyright (C) 2014 Regents of the University of California
|
|
* Copyright (C) 2017 SiFive
|
|
*/
|
|
|
|
#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
|
|
|
|
#define __VVAR_PAGES 2
|
|
|
|
#ifndef __ASSEMBLY__
|
|
#include <generated/vdso-offsets.h>
|
|
|
|
#define VDSO_SYMBOL(base, name) \
|
|
(void __user *)((unsigned long)(base) + __vdso_##name##_offset)
|
|
#endif /* !__ASSEMBLY__ */
|
|
|
|
#endif /* CONFIG_MMU */
|
|
|
|
#endif /* _ASM_RISCV_VDSO_H */
|