Skip to content

Commit 7e43005

Browse files
author
Fox Snowpatch
committed
From patchwork series 427501
https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=427501
1 parent f85c105 commit 7e43005

File tree

16 files changed

+3
-34
lines changed

16 files changed

+3
-34
lines changed

‎arch/arm/include/asm/vdso/vsyscall.h

-4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@
44

55
#ifndef __ASSEMBLY__
66

7-
#include <linux/timekeeper_internal.h>
87
#include <vdso/datapage.h>
98
#include <asm/cacheflush.h>
109

1110
extern struct vdso_data *vdso_data;
1211
extern bool cntvct_ok;
1312

14-
/*
15-
* Update the vDSO data page to keep in sync with kernel timekeeping.
16-
*/
1713
static __always_inline
1814
struct vdso_data *__arm_get_k_vdso_data(void)
1915
{

‎arch/arm/kernel/vdso.c

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/of.h>
1515
#include <linux/printk.h>
1616
#include <linux/slab.h>
17-
#include <linux/timekeeper_internal.h>
1817
#include <linux/vmalloc.h>
1918
#include <asm/arch_timer.h>
2019
#include <asm/barrier.h>

‎arch/arm64/include/asm/vdso/vsyscall.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#ifndef __ASSEMBLY__
88

9-
#include <linux/timekeeper_internal.h>
109
#include <vdso/datapage.h>
1110

1211
enum vvar_pages {
@@ -37,7 +36,7 @@ struct vdso_rng_data *__arm64_get_k_vdso_rnd_data(void)
3736
#define __arch_get_k_vdso_rng_data __arm64_get_k_vdso_rnd_data
3837

3938
static __always_inline
40-
void __arm64_update_vsyscall(struct vdso_data *vdata, struct timekeeper *tk)
39+
void __arm64_update_vsyscall(struct vdso_data *vdata)
4140
{
4241
vdata[CS_HRES_COARSE].mask = VDSO_PRECISION_MASK;
4342
vdata[CS_RAW].mask = VDSO_PRECISION_MASK;

‎arch/arm64/kernel/vdso.c

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/signal.h>
2020
#include <linux/slab.h>
2121
#include <linux/time_namespace.h>
22-
#include <linux/timekeeper_internal.h>
2322
#include <linux/vmalloc.h>
2423
#include <vdso/datapage.h>
2524
#include <vdso/helpers.h>

‎arch/loongarch/include/asm/vdso/vsyscall.h

-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44

55
#ifndef __ASSEMBLY__
66

7-
#include <linux/timekeeper_internal.h>
87
#include <vdso/datapage.h>
98

109
extern struct vdso_data *vdso_data;
1110
extern struct vdso_rng_data *vdso_rng_data;
1211

13-
/*
14-
* Update the vDSO data page to keep in sync with kernel timekeeping.
15-
*/
1612
static __always_inline
1713
struct vdso_data *__loongarch_get_k_vdso_data(void)
1814
{

‎arch/loongarch/kernel/vdso.c

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/sched.h>
1616
#include <linux/slab.h>
1717
#include <linux/time_namespace.h>
18-
#include <linux/timekeeper_internal.h>
1918

2019
#include <asm/page.h>
2120
#include <asm/vdso.h>

‎arch/mips/include/asm/vdso/vsyscall.h

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#ifndef __ASSEMBLY__
66

7-
#include <linux/timekeeper_internal.h>
87
#include <vdso/datapage.h>
98

109
extern struct vdso_data *vdso_data;

‎arch/mips/kernel/vdso.c

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/random.h>
1515
#include <linux/sched.h>
1616
#include <linux/slab.h>
17-
#include <linux/timekeeper_internal.h>
1817

1918
#include <asm/abi.h>
2019
#include <asm/mips-cps.h>

‎arch/powerpc/include/asm/vdso/vsyscall.h

-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44

55
#ifndef __ASSEMBLY__
66

7-
#include <linux/timekeeper_internal.h>
87
#include <asm/vdso_datapage.h>
98

10-
/*
11-
* Update the vDSO data page to keep in sync with kernel timekeeping.
12-
*/
139
static __always_inline
1410
struct vdso_data *__arch_get_k_vdso_data(void)
1511
{

‎arch/powerpc/kernel/time.c

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
/* powerpc clocksource/clockevent code */
7676

7777
#include <linux/clockchips.h>
78-
#include <linux/timekeeper_internal.h>
7978

8079
static u64 timebase_read(struct clocksource *);
8180
static struct clocksource clocksource_timebase = {

‎arch/riscv/include/asm/vdso/vsyscall.h

-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@
44

55
#ifndef __ASSEMBLY__
66

7-
#include <linux/timekeeper_internal.h>
87
#include <vdso/datapage.h>
98

109
extern struct vdso_data *vdso_data;
1110

12-
/*
13-
* Update the vDSO data page to keep in sync with kernel timekeeping.
14-
*/
1511
static __always_inline struct vdso_data *__riscv_get_k_vdso_data(void)
1612
{
1713
return vdso_data;

‎arch/s390/include/asm/vdso/vsyscall.h

-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#ifndef __ASSEMBLY__
88

99
#include <linux/hrtimer.h>
10-
#include <linux/timekeeper_internal.h>
1110
#include <vdso/datapage.h>
1211
#include <asm/vdso.h>
1312

@@ -17,10 +16,6 @@ enum vvar_pages {
1716
VVAR_NR_PAGES
1817
};
1918

20-
/*
21-
* Update the vDSO data page to keep in sync with kernel timekeeping.
22-
*/
23-
2419
static __always_inline struct vdso_data *__s390_get_k_vdso_data(void)
2520
{
2621
return vdso_data;

‎arch/s390/kernel/time.c

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <linux/profile.h>
3737
#include <linux/timex.h>
3838
#include <linux/notifier.h>
39-
#include <linux/timekeeper_internal.h>
4039
#include <linux/clockchips.h>
4140
#include <linux/gfp.h>
4241
#include <linux/kprobes.h>

‎arch/x86/include/asm/vdso/vsyscall.h

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#ifndef __ASSEMBLY__
66

7-
#include <linux/timekeeper_internal.h>
87
#include <vdso/datapage.h>
98
#include <asm/vgtod.h>
109
#include <asm/vvar.h>

‎include/asm-generic/vdso/vsyscall.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ static __always_inline struct vdso_data *__arch_get_k_vdso_data(void)
1212
#endif /* __arch_get_k_vdso_data */
1313

1414
#ifndef __arch_update_vsyscall
15-
static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata,
16-
struct timekeeper *tk)
15+
static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata)
1716
{
1817
}
1918
#endif /* __arch_update_vsyscall */

‎kernel/time/vsyscall.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void update_vsyscall(struct timekeeper *tk)
119119
if (clock_mode != VDSO_CLOCKMODE_NONE)
120120
update_vdso_data(vdata, tk);
121121

122-
__arch_update_vsyscall(vdata, tk);
122+
__arch_update_vsyscall(vdata);
123123

124124
vdso_write_end(vdata);
125125

0 commit comments

Comments
 (0)