From: Greg Kroah-Hartman Date: Tue, 12 Mar 2019 12:10:57 +0000 (-0700) Subject: patch refreshes X-Git-Tag: v5.0.2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dabcb4c20ac2bc46f004e42821bdb86d6dbaf146;p=thirdparty%2Fkernel%2Fstable-queue.git patch refreshes --- diff --git a/queue-4.14/arm-8781-1-fix-thumb-2-syscall-return-for-binutils-2.patch b/queue-4.14/arm-8781-1-fix-thumb-2-syscall-return-for-binutils-2.patch index dafab6206d5..71a84c649b4 100644 --- a/queue-4.14/arm-8781-1-fix-thumb-2-syscall-return-for-binutils-2.patch +++ b/queue-4.14/arm-8781-1-fix-thumb-2-syscall-return-for-binutils-2.patch @@ -47,11 +47,9 @@ Signed-off-by: Vincent Whitchurch Signed-off-by: Russell King Signed-off-by: Sasha Levin --- - arch/arm/kernel/entry-common.S | 4 +++- + arch/arm/kernel/entry-common.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S -index 54c10503d71f..d7dc808a3d15 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -46,6 +46,7 @@ saved_pc .req lr @@ -79,6 +77,3 @@ index 54c10503d71f..d7dc808a3d15 100644 add r1, sp, #S_OFF 2: cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE) --- -2.19.1 - diff --git a/queue-4.4/revert-x86-platform-uv-use-efi_runtime_lock-to-seria.patch b/queue-4.4/revert-x86-platform-uv-use-efi_runtime_lock-to-seria.patch index ed78ae59c3b..6e79a6a747f 100644 --- a/queue-4.4/revert-x86-platform-uv-use-efi_runtime_lock-to-seria.patch +++ b/queue-4.4/revert-x86-platform-uv-use-efi_runtime_lock-to-seria.patch @@ -17,13 +17,11 @@ Hedi Berriche notes: Signed-off-by: Sasha Levin --- - arch/x86/include/asm/uv/bios.h | 8 +------- - arch/x86/platform/uv/bios_uv.c | 23 ++--------------------- - drivers/firmware/efi/runtime-wrappers.c | 7 ------- + arch/x86/include/asm/uv/bios.h | 8 +------- + arch/x86/platform/uv/bios_uv.c | 23 ++--------------------- + drivers/firmware/efi/runtime-wrappers.c | 7 ------- 3 files changed, 3 insertions(+), 35 deletions(-) -diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h -index 8b7594f2d48f..71605c7d5c5c 100644 --- a/arch/x86/include/asm/uv/bios.h +++ b/arch/x86/include/asm/uv/bios.h @@ -48,8 +48,7 @@ enum { @@ -46,8 +44,6 @@ index 8b7594f2d48f..71605c7d5c5c 100644 -extern struct semaphore __efi_uv_runtime_lock; - #endif /* _ASM_X86_UV_BIOS_H */ -diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c -index a45a1c5aabea..1584cbed0dce 100644 --- a/arch/x86/platform/uv/bios_uv.c +++ b/arch/x86/platform/uv/bios_uv.c @@ -28,8 +28,7 @@ @@ -60,7 +56,7 @@ index a45a1c5aabea..1584cbed0dce 100644 { struct uv_systab *tab = &uv_systab; s64 ret; -@@ -44,19 +43,6 @@ static s64 __uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, +@@ -44,19 +43,6 @@ static s64 __uv_bios_call(enum uv_bios_c a1, a2, a3, a4, a5); return ret; } @@ -80,7 +76,7 @@ index a45a1c5aabea..1584cbed0dce 100644 EXPORT_SYMBOL_GPL(uv_bios_call); s64 uv_bios_call_irqsave(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, -@@ -65,15 +51,10 @@ s64 uv_bios_call_irqsave(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, +@@ -65,15 +51,10 @@ s64 uv_bios_call_irqsave(enum uv_bios_cm unsigned long bios_flags; s64 ret; @@ -97,24 +93,19 @@ index a45a1c5aabea..1584cbed0dce 100644 return ret; } -diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c -index 906d0224f50d..228bbf910461 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c -@@ -87,13 +87,6 @@ static DEFINE_SPINLOCK(efi_runtime_lock); - * context through efi_pstore_write(). +@@ -88,13 +88,6 @@ static DEFINE_SPINLOCK(efi_runtime_lock) */ --/* + /* - * Expose the EFI runtime lock to the UV platform - */ -#ifdef CONFIG_X86_UV -extern struct semaphore __efi_uv_runtime_lock __alias(efi_runtime_lock); -#endif - - /* +-/* * As per commit ef68c8f87ed1 ("x86: Serialize EFI time accesses on rtc_lock"), * the EFI specification requires that callers of the time related runtime --- -2.19.1 - + * functions serialize with other CMOS accesses in the kernel, as the EFI time diff --git a/queue-4.9/arm-8781-1-fix-thumb-2-syscall-return-for-binutils-2.patch b/queue-4.9/arm-8781-1-fix-thumb-2-syscall-return-for-binutils-2.patch index b5ed72fb6e1..89bbf7afbfe 100644 --- a/queue-4.9/arm-8781-1-fix-thumb-2-syscall-return-for-binutils-2.patch +++ b/queue-4.9/arm-8781-1-fix-thumb-2-syscall-return-for-binutils-2.patch @@ -47,11 +47,9 @@ Signed-off-by: Vincent Whitchurch Signed-off-by: Russell King Signed-off-by: Sasha Levin --- - arch/arm/kernel/entry-common.S | 4 +++- + arch/arm/kernel/entry-common.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S -index 56be67ecf0fa..d69adfb3d79e 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -32,6 +32,7 @@ @@ -79,6 +77,3 @@ index 56be67ecf0fa..d69adfb3d79e 100644 add r1, sp, #S_OFF 2: cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE) --- -2.19.1 -