Re: [PATCH 3/3] lib/vdso: remove struct arch_vdso_data from vdso data struct

2021-03-25 Thread Thomas Gleixner 
On Thu, Mar 25 2021 at 18:55, Thomas Gleixner wrote:
> On Tue, Mar 23 2021 at 22:58, Heiko Carstens wrote:
>> Since commit d60d7de3e16d ("lib/vdso: Allow to add architecture-specific
>> vdso data") it is possible to provide arch specific VDSO data.
>>
>> This was only added for s390, which doesn't make use this anymore.
>> Therefore remove it again.
>>
>> Signed-off-by: Heiko Carstens 
>
> Please route that with the rest of the fixes.
>
> Reviewed-by: Thomas Gleixner 

Ah, you decided for the simpler variant. Fine with me.

Re: [PATCH 3/3] lib/vdso: remove struct arch_vdso_data from vdso data struct

2021-03-25 Thread Thomas Gleixner 
On Tue, Mar 23 2021 at 22:58, Heiko Carstens wrote:
> Since commit d60d7de3e16d ("lib/vdso: Allow to add architecture-specific
> vdso data") it is possible to provide arch specific VDSO data.
>
> This was only added for s390, which doesn't make use this anymore.
> Therefore remove it again.
>
> Signed-off-by: Heiko Carstens 

Please route that with the rest of the fixes.

Reviewed-by: Thomas Gleixner

[PATCH 3/3] lib/vdso: remove struct arch_vdso_data from vdso data struct

2021-03-23 Thread Heiko Carstens 
Since commit d60d7de3e16d ("lib/vdso: Allow to add architecture-specific
vdso data") it is possible to provide arch specific VDSO data.

This was only added for s390, which doesn't make use this anymore.
Therefore remove it again.

Signed-off-by: Heiko Carstens 
---
 arch/Kconfig|  3 ---
 include/vdso/datapage.h | 10 --
 2 files changed, 13 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index ecfd3520b676..35c7114f7ea3 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1147,9 +1147,6 @@ config HAVE_SPARSE_SYSCALL_NR
  entries at 4000, 5000 and 6000 locations. This option turns on syscall
  related optimizations for a given architecture.
 
-config ARCH_HAS_VDSO_DATA
-   bool
-
 config HAVE_STATIC_CALL
bool
 
diff --git a/include/vdso/datapage.h b/include/vdso/datapage.h
index 73eb622e7663..ee810cae4e1e 100644
--- a/include/vdso/datapage.h
+++ b/include/vdso/datapage.h
@@ -19,12 +19,6 @@
 #include 
 #include 
 
-#ifdef CONFIG_ARCH_HAS_VDSO_DATA
-#include 
-#else
-struct arch_vdso_data {};
-#endif
-
 #define VDSO_BASES (CLOCK_TAI + 1)
 #define VDSO_HRES  (BIT(CLOCK_REALTIME)| \
 BIT(CLOCK_MONOTONIC)   | \
@@ -70,8 +64,6 @@ struct vdso_timestamp {
  * @tz_dsttime:type of DST correction
  * @hrtimer_res:   hrtimer resolution
  * @__unused:  unused
- * @arch_data: architecture specific data (optional, defaults
- * to an empty struct)
  *
  * vdso_data will be accessed by 64 bit and compat code at the same time
  * so we should be careful before modifying this structure.
@@ -105,8 +97,6 @@ struct vdso_data {
s32 tz_dsttime;
u32 hrtimer_res;
u32 __unused;
-
-   struct arch_vdso_data   arch_data;
 };
 
 /*
-- 
2.25.1