Skip to content

Commit a812eee

Browse files
covanamKAGA-KOKO
authored andcommitted
vdso: Rename struct arch_vdso_data to arch_vdso_time_data
The struct arch_vdso_data is only about vdso time data. So rename it to arch_vdso_time_data to make it obvious. Non time-related data will be migrated out of these structs soon. Signed-off-by: Nam Cao <namcao@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Heiko Carstens <hca@linux.ibm.com> # s390 Link: https://lore.kernel.org/all/20241010-vdso-generic-base-v1-28-b64f0842d512@linutronix.de
1 parent 6142be7 commit a812eee

File tree

9 files changed

+26
-26
lines changed

9 files changed

+26
-26
lines changed

arch/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@ config HAVE_SPARSE_SYSCALL_NR
15301530
entries at 4000, 5000 and 6000 locations. This option turns on syscall
15311531
related optimizations for a given architecture.
15321532

1533-
config ARCH_HAS_VDSO_DATA
1533+
config ARCH_HAS_VDSO_TIME_DATA
15341534
bool
15351535

15361536
config HAVE_STATIC_CALL

arch/riscv/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ config RISCV
5050
select ARCH_HAS_SYSCALL_WRAPPER
5151
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
5252
select ARCH_HAS_UBSAN
53-
select ARCH_HAS_VDSO_DATA
53+
select ARCH_HAS_VDSO_TIME_DATA
5454
select ARCH_KEEP_MEMBLOCK if ACPI
5555
select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE if 64BIT && MMU
5656
select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
#ifndef __RISCV_ASM_VDSO_DATA_H
3-
#define __RISCV_ASM_VDSO_DATA_H
2+
#ifndef __RISCV_ASM_VDSO_TIME_DATA_H
3+
#define __RISCV_ASM_VDSO_TIME_DATA_H
44

55
#include <linux/types.h>
66
#include <vdso/datapage.h>
77
#include <asm/hwprobe.h>
88

9-
struct arch_vdso_data {
9+
struct arch_vdso_time_data {
1010
/* Stash static answers to the hwprobe queries when all CPUs are selected. */
1111
__u64 all_cpu_hwprobe_values[RISCV_HWPROBE_MAX_KEY + 1];
1212

1313
/* Boolean indicating all CPUs have the same static hwprobe values. */
1414
__u8 homogeneous_cpus;
1515
};
1616

17-
#endif /* __RISCV_ASM_VDSO_DATA_H */
17+
#endif /* __RISCV_ASM_VDSO_TIME_DATA_H */

arch/riscv/kernel/sys_hwprobe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ static int do_riscv_hwprobe(struct riscv_hwprobe __user *pairs,
402402
static int __init init_hwprobe_vdso_data(void)
403403
{
404404
struct vdso_data *vd = __arch_get_k_vdso_data();
405-
struct arch_vdso_data *avd = &vd->arch_data;
405+
struct arch_vdso_time_data *avd = &vd->arch_data;
406406
u64 id_bitsmash = 0;
407407
struct riscv_hwprobe pair;
408408
int key;

arch/riscv/kernel/vdso/hwprobe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ static int riscv_vdso_get_values(struct riscv_hwprobe *pairs, size_t pair_count,
1717
unsigned int flags)
1818
{
1919
const struct vdso_data *vd = __arch_get_vdso_data();
20-
const struct arch_vdso_data *avd = &vd->arch_data;
20+
const struct arch_vdso_time_data *avd = &vd->arch_data;
2121
bool all_cpus = !cpusetsize && !cpus;
2222
struct riscv_hwprobe *p = pairs;
2323
struct riscv_hwprobe *end = pairs + pair_count;
@@ -52,7 +52,7 @@ static int riscv_vdso_get_cpus(struct riscv_hwprobe *pairs, size_t pair_count,
5252
unsigned int flags)
5353
{
5454
const struct vdso_data *vd = __arch_get_vdso_data();
55-
const struct arch_vdso_data *avd = &vd->arch_data;
55+
const struct arch_vdso_time_data *avd = &vd->arch_data;
5656
struct riscv_hwprobe *p = pairs;
5757
struct riscv_hwprobe *end = pairs + pair_count;
5858
unsigned char *c = (unsigned char *)cpus;

arch/s390/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ config S390
8888
select ARCH_HAS_STRICT_MODULE_RWX
8989
select ARCH_HAS_SYSCALL_WRAPPER
9090
select ARCH_HAS_UBSAN
91-
select ARCH_HAS_VDSO_DATA
91+
select ARCH_HAS_VDSO_TIME_DATA
9292
select ARCH_HAVE_NMI_SAFE_CMPXCHG
9393
select ARCH_INLINE_READ_LOCK
9494
select ARCH_INLINE_READ_LOCK_BH

arch/s390/include/asm/vdso/data.h

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#ifndef __S390_ASM_VDSO_TIME_DATA_H
3+
#define __S390_ASM_VDSO_TIME_DATA_H
4+
5+
#include <linux/types.h>
6+
7+
struct arch_vdso_time_data {
8+
__s64 tod_steering_delta;
9+
__u64 tod_steering_end;
10+
};
11+
12+
#endif /* __S390_ASM_VDSO_TIME_DATA_H */

include/vdso/datapage.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#include <vdso/time32.h>
2020
#include <vdso/time64.h>
2121

22-
#ifdef CONFIG_ARCH_HAS_VDSO_DATA
23-
#include <asm/vdso/data.h>
22+
#ifdef CONFIG_ARCH_HAS_VDSO_TIME_DATA
23+
#include <asm/vdso/time_data.h>
2424
#else
25-
struct arch_vdso_data {};
25+
struct arch_vdso_time_data {};
2626
#endif
2727

2828
#define VDSO_BASES (CLOCK_TAI + 1)
@@ -114,7 +114,7 @@ struct vdso_data {
114114
u32 hrtimer_res;
115115
u32 __unused;
116116

117-
struct arch_vdso_data arch_data;
117+
struct arch_vdso_time_data arch_data;
118118
};
119119

120120
/**

0 commit comments

Comments
 (0)