From: Greg Kroah-Hartman Date: Tue, 26 May 2020 10:05:27 +0000 (+0200) Subject: drop 2 sh time.h patches ffrom 5.4 that caused build errors. X-Git-Tag: v4.4.225~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c96af8f4aed1b5ce8fe499ed0337d3761d4ebc1;p=thirdparty%2Fkernel%2Fstable-queue.git drop 2 sh time.h patches ffrom 5.4 that caused build errors. --- diff --git a/queue-5.4/series b/queue-5.4/series index fdbd9a7b3f7..61b78563683 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -94,13 +94,11 @@ s390-kaslr-add-support-for-r_390_jmp_slot-relocation-type.patch device-dax-don-t-leak-kernel-memory-to-user-space-after-unloading-kmem.patch rapidio-fix-an-error-in-get_user_pages_fast-error-handling.patch kasan-disable-branch-tracing-for-core-runtime.patch -sh-include-linux-time_types.h-for-sockios.patch rxrpc-fix-the-excessive-initial-retransmission-timeout.patch rxrpc-fix-a-memory-leak-in-rxkad_verify_response.patch s390-kexec_file-fix-initrd-location-for-kdump-kernel.patch flow_dissector-drop-bpf-flow-dissector-prog-ref-on-netns-cleanup.patch x86-unwind-orc-fix-unwind_get_return_address_ptr-for-inactive-tasks.patch -y2038-sh-remove-timeval-timespec-usage-from-headers.patch iio-adc-stm32-adc-use-dma_request_chan-instead-dma_r.patch iio-adc-stm32-adc-fix-device-used-to-request-dma.patch iio-adc-stm32-dfsdm-use-dma_request_chan-instead-dma.patch diff --git a/queue-5.4/sh-include-linux-time_types.h-for-sockios.patch b/queue-5.4/sh-include-linux-time_types.h-for-sockios.patch deleted file mode 100644 index 9d9a08c25c8..00000000000 --- a/queue-5.4/sh-include-linux-time_types.h-for-sockios.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fc94cf2092c7c1267fa2deb8388d624f50eba808 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Fri, 22 May 2020 22:23:02 -0700 -Subject: sh: include linux/time_types.h for sockios - -From: Arnd Bergmann - -commit fc94cf2092c7c1267fa2deb8388d624f50eba808 upstream. - -Using the socket ioctls on arch/sh (and only there) causes build time -problems when __kernel_old_timeval/__kernel_old_timespec are not already -visible to the compiler. - -Add an explict include line for the header that defines these -structures. - -Fixes: 8c709f9a0693 ("y2038: sh: remove timeval/timespec usage from headers") -Fixes: 0768e17073dc ("net: socket: implement 64-bit timestamps") -Reported-by: John Paul Adrian Glaubitz -Signed-off-by: Arnd Bergmann -Signed-off-by: Andrew Morton -Tested-by: John Paul Adrian Glaubitz -Cc: Yoshinori Sato -Cc: Rich Felker -Cc: "David S. Miller" -Cc: John Paul Adrian Glaubitz -Cc: -Link: http://lkml.kernel.org/r/20200519131327.1836482-1-arnd@arndb.de -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - arch/sh/include/uapi/asm/sockios.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/sh/include/uapi/asm/sockios.h -+++ b/arch/sh/include/uapi/asm/sockios.h -@@ -2,6 +2,8 @@ - #ifndef __ASM_SH_SOCKIOS_H - #define __ASM_SH_SOCKIOS_H - -+#include -+ - /* Socket-level I/O control calls. */ - #define FIOGETOWN _IOR('f', 123, int) - #define FIOSETOWN _IOW('f', 124, int) diff --git a/queue-5.4/y2038-sh-remove-timeval-timespec-usage-from-headers.patch b/queue-5.4/y2038-sh-remove-timeval-timespec-usage-from-headers.patch deleted file mode 100644 index 051a0e19c4d..00000000000 --- a/queue-5.4/y2038-sh-remove-timeval-timespec-usage-from-headers.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8c709f9a06938f6dd743e0b968245d900fa4759e Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Sun, 15 Dec 2019 21:35:04 +0100 -Subject: y2038: sh: remove timeval/timespec usage from headers - -From: Arnd Bergmann - -commit 8c709f9a06938f6dd743e0b968245d900fa4759e upstream. - -This header file escaped my earlier cleanups for removing -the in-kernel usage of timeval and timespec structs. - -Replace them with the corresponding __kernel_old_* types. - -Acked-by: Rich Felker -Signed-off-by: Arnd Bergmann -Signed-off-by: Greg Kroah-Hartman - ---- - arch/sh/include/uapi/asm/sockios.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/sh/include/uapi/asm/sockios.h -+++ b/arch/sh/include/uapi/asm/sockios.h -@@ -12,7 +12,7 @@ - #define SIOCSPGRP _IOW('s', 8, pid_t) - #define SIOCGPGRP _IOR('s', 9, pid_t) - --#define SIOCGSTAMP_OLD _IOR('s', 100, struct timeval) /* Get stamp (timeval) */ --#define SIOCGSTAMPNS_OLD _IOR('s', 101, struct timespec) /* Get stamp (timespec) */ -+#define SIOCGSTAMP_OLD _IOR('s', 100, struct __kernel_old_timeval) /* Get stamp (timeval) */ -+#define SIOCGSTAMPNS_OLD _IOR('s', 101, struct __kernel_old_timespec) /* Get stamp (timespec) */ - - #endif /* __ASM_SH_SOCKIOS_H */