* [PATCH] riscv/vdso: Drop unneeded part due to merge issue
@ 2021-10-11 11:05 Kefeng Wang
2021-10-26 23:14 ` Palmer Dabbelt
0 siblings, 1 reply; 2+ messages in thread
From: Kefeng Wang @ 2021-10-11 11:05 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, palmerdabbelt, linux-riscv
Cc: Tong Tiangen, Kefeng Wang
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@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
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] riscv/vdso: Drop unneeded part due to merge issue
2021-10-11 11:05 [PATCH] riscv/vdso: Drop unneeded part due to merge issue Kefeng Wang
@ 2021-10-26 23:14 ` Palmer Dabbelt
0 siblings, 0 replies; 2+ messages in thread
From: Palmer Dabbelt @ 2021-10-26 23:14 UTC (permalink / raw)
To: wangkefeng.wang
Cc: Paul Walmsley, aou, linux-riscv, tongtiangen, wangkefeng.wang
On Mon, 11 Oct 2021 04:05:59 PDT (-0700), wangkefeng.wang@huawei.com wrote:
> 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@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 */
Thanks, this is on for-next.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-26 23:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-11 11:05 [PATCH] riscv/vdso: Drop unneeded part due to merge issue Kefeng Wang
2021-10-26 23:14 ` Palmer Dabbelt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.