From: Greg Kroah-Hartman Date: Tue, 17 Dec 2019 18:52:08 +0000 (+0100) Subject: fix up powerpc-fix-vdso-clock_getres.patch for 4.4 and 4.9 X-Git-Tag: v5.4.4~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f69939d119a634a6f95e1a8341b30218f64c6cd4;p=thirdparty%2Fkernel%2Fstable-queue.git fix up powerpc-fix-vdso-clock_getres.patch for 4.4 and 4.9 --- diff --git a/queue-4.4/powerpc-fix-vdso-clock_getres.patch b/queue-4.4/powerpc-fix-vdso-clock_getres.patch index 03902505360..348a914e277 100644 --- a/queue-4.4/powerpc-fix-vdso-clock_getres.patch +++ b/queue-4.4/powerpc-fix-vdso-clock_getres.patch @@ -29,16 +29,15 @@ Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/a55eca3a5e85233838c2349783bcb5164dae1d09.1575273217.git.christophe.leroy@c-s.fr Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - arch/powerpc/include/asm/vdso_datapage.h | 2 ++ - arch/powerpc/kernel/asm-offsets.c | 2 +- - arch/powerpc/kernel/time.c | 1 + - arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- - arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++-- + arch/powerpc/include/asm/vdso_datapage.h | 2 ++ + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- + arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++-- 5 files changed, 14 insertions(+), 5 deletions(-) -diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h -index b73a8199f161c..5c2e1a28a9819 100644 --- a/arch/powerpc/include/asm/vdso_datapage.h +++ b/arch/powerpc/include/asm/vdso_datapage.h @@ -86,6 +86,7 @@ struct vdso_data { @@ -57,15 +56,13 @@ index b73a8199f161c..5c2e1a28a9819 100644 __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ __u32 dcache_block_size; /* L1 d-cache block size */ __u32 icache_block_size; /* L1 i-cache block size */ -diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c -index de3c29c515034..ca46b572474ab 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -398,6 +398,7 @@ int main(void) DEFINE(WTOM_CLOCK_NSEC, offsetof(struct vdso_data, wtom_clock_nsec)); DEFINE(STAMP_XTIME, offsetof(struct vdso_data, stamp_xtime)); DEFINE(STAMP_SEC_FRAC, offsetof(struct vdso_data, stamp_sec_fraction)); -+ DEFINE(CLOCK_HRTIMER_RES, offsetof(vdso_data, hrtimer_res)); ++ DEFINE(CLOCK_HRTIMER_RES, offsetof(struct vdso_data, hrtimer_res)); DEFINE(CFG_ICACHE_BLOCKSZ, offsetof(struct vdso_data, icache_block_size)); DEFINE(CFG_DCACHE_BLOCKSZ, offsetof(struct vdso_data, dcache_block_size)); DEFINE(CFG_ICACHE_LOGBLOCKSZ, offsetof(struct vdso_data, icache_log_block_size)); @@ -77,11 +74,9 @@ index de3c29c515034..ca46b572474ab 100644 #ifdef CONFIG_BUG DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry)); -diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c -index 9baba9576e998..2e9cae5f8d174 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c -@@ -829,6 +829,7 @@ void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm, +@@ -829,6 +829,7 @@ void update_vsyscall_old(struct timespec vdso_data->wtom_clock_nsec = wtm->tv_nsec; vdso_data->stamp_xtime = *wall_time; vdso_data->stamp_sec_fraction = frac_sec; @@ -89,8 +84,6 @@ index 9baba9576e998..2e9cae5f8d174 100644 smp_wmb(); ++(vdso_data->tb_update_count); } -diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S -index 7b341b86216c2..9b24466570c84 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -160,12 +160,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) @@ -111,8 +104,6 @@ index 7b341b86216c2..9b24466570c84 100644 stw r3,TSPC32_TV_SEC(r4) stw r5,TSPC32_TV_NSEC(r4) blr -diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S -index 09b2a49f6dd53..c973378e1f2bc 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S @@ -145,12 +145,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) @@ -133,6 +124,3 @@ index 09b2a49f6dd53..c973378e1f2bc 100644 std r3,TSPC64_TV_SEC(r4) std r5,TSPC64_TV_NSEC(r4) blr --- -2.20.1 - diff --git a/queue-4.9/powerpc-fix-vdso-clock_getres.patch b/queue-4.9/powerpc-fix-vdso-clock_getres.patch index 521011a19f7..ec0413ff05b 100644 --- a/queue-4.9/powerpc-fix-vdso-clock_getres.patch +++ b/queue-4.9/powerpc-fix-vdso-clock_getres.patch @@ -29,16 +29,15 @@ Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/a55eca3a5e85233838c2349783bcb5164dae1d09.1575273217.git.christophe.leroy@c-s.fr Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - arch/powerpc/include/asm/vdso_datapage.h | 2 ++ - arch/powerpc/kernel/asm-offsets.c | 2 +- - arch/powerpc/kernel/time.c | 1 + - arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- - arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++-- + arch/powerpc/include/asm/vdso_datapage.h | 2 ++ + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- + arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++-- 5 files changed, 14 insertions(+), 5 deletions(-) -diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h -index 1afe90ade595e..674c03350cd11 100644 --- a/arch/powerpc/include/asm/vdso_datapage.h +++ b/arch/powerpc/include/asm/vdso_datapage.h @@ -86,6 +86,7 @@ struct vdso_data { @@ -57,15 +56,13 @@ index 1afe90ade595e..674c03350cd11 100644 __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ __u32 dcache_block_size; /* L1 d-cache block size */ __u32 icache_block_size; /* L1 i-cache block size */ -diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c -index 14fbbd9035ca7..5e55893d147c3 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -383,6 +383,7 @@ int main(void) DEFINE(WTOM_CLOCK_NSEC, offsetof(struct vdso_data, wtom_clock_nsec)); DEFINE(STAMP_XTIME, offsetof(struct vdso_data, stamp_xtime)); DEFINE(STAMP_SEC_FRAC, offsetof(struct vdso_data, stamp_sec_fraction)); -+ DEFINE(CLOCK_HRTIMER_RES, offsetof(vdso_data, hrtimer_res)); ++ DEFINE(CLOCK_HRTIMER_RES, offsetof(struct vdso_data, hrtimer_res)); DEFINE(CFG_ICACHE_BLOCKSZ, offsetof(struct vdso_data, icache_block_size)); DEFINE(CFG_DCACHE_BLOCKSZ, offsetof(struct vdso_data, dcache_block_size)); DEFINE(CFG_ICACHE_LOGBLOCKSZ, offsetof(struct vdso_data, icache_log_block_size)); @@ -77,11 +74,9 @@ index 14fbbd9035ca7..5e55893d147c3 100644 #ifdef CONFIG_BUG DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry)); -diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c -index ab7b661b6da3a..3c6258a1656b4 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c -@@ -862,6 +862,7 @@ void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm, +@@ -862,6 +862,7 @@ void update_vsyscall_old(struct timespec vdso_data->wtom_clock_nsec = wtm->tv_nsec; vdso_data->stamp_xtime = *wall_time; vdso_data->stamp_sec_fraction = frac_sec; @@ -89,8 +84,6 @@ index ab7b661b6da3a..3c6258a1656b4 100644 smp_wmb(); ++(vdso_data->tb_update_count); } -diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S -index 7b341b86216c2..9b24466570c84 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -160,12 +160,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) @@ -111,8 +104,6 @@ index 7b341b86216c2..9b24466570c84 100644 stw r3,TSPC32_TV_SEC(r4) stw r5,TSPC32_TV_NSEC(r4) blr -diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S -index 09b2a49f6dd53..c973378e1f2bc 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S @@ -145,12 +145,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) @@ -133,6 +124,3 @@ index 09b2a49f6dd53..c973378e1f2bc 100644 std r3,TSPC64_TV_SEC(r4) std r5,TSPC64_TV_NSEC(r4) blr --- -2.20.1 -