From fdfc97c38c46130dc4238da558bd3283fe23da48 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 12 Sep 2019 11:30:50 +0100 Subject: [PATCH] 4.4-stable patches added patches: x86-boot-remove-multiple-copy-of-static-function-sanitize_boot_params.patch --- queue-4.4/series | 1 + ...static-function-sanitize_boot_params.patch | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 queue-4.4/x86-boot-remove-multiple-copy-of-static-function-sanitize_boot_params.patch diff --git a/queue-4.4/series b/queue-4.4/series index 6c941bafe40..b824e8010c7 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -4,3 +4,4 @@ xfrm-clean-up-xfrm-protocol-checks.patch vhost-test-fix-build-for-vhost-test.patch scripts-decode_stacktrace-match-basepath-using-shell.patch clk-s2mps11-add-used-attribute-to-s2mps11_dt_match.patch +x86-boot-remove-multiple-copy-of-static-function-sanitize_boot_params.patch diff --git a/queue-4.4/x86-boot-remove-multiple-copy-of-static-function-sanitize_boot_params.patch b/queue-4.4/x86-boot-remove-multiple-copy-of-static-function-sanitize_boot_params.patch new file mode 100644 index 00000000000..48a2356d3b5 --- /dev/null +++ b/queue-4.4/x86-boot-remove-multiple-copy-of-static-function-sanitize_boot_params.patch @@ -0,0 +1,56 @@ +From 8c5477e8046ca139bac250386c08453da37ec1ae Mon Sep 17 00:00:00 2001 +From: Zhenzhong Duan +Date: Tue, 16 Jul 2019 21:18:12 +0800 +Subject: x86, boot: Remove multiple copy of static function sanitize_boot_params() + +From: Zhenzhong Duan + +commit 8c5477e8046ca139bac250386c08453da37ec1ae upstream. + +Kernel build warns: + 'sanitize_boot_params' defined but not used [-Wunused-function] + +at below files: + arch/x86/boot/compressed/cmdline.c + arch/x86/boot/compressed/error.c + arch/x86/boot/compressed/early_serial_console.c + arch/x86/boot/compressed/acpi.c + +That's becausethey each include misc.h which includes a definition of +sanitize_boot_params() via bootparam_utils.h. + +Remove the inclusion from misc.h and have the c file including +bootparam_utils.h directly. + +Signed-off-by: Zhenzhong Duan +Signed-off-by: Thomas Gleixner +Link: https://lkml.kernel.org/r/1563283092-1189-1-git-send-email-zhenzhong.duan@oracle.com +[nc: Fixed conflict around lack of 67b6662559f7f] +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/boot/compressed/misc.c | 1 + + arch/x86/boot/compressed/misc.h | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/boot/compressed/misc.c ++++ b/arch/x86/boot/compressed/misc.c +@@ -11,6 +11,7 @@ + + #include "misc.h" + #include "../string.h" ++#include + + /* WARNING!! + * This code is compiled with -fPIC and it is relocated dynamically +--- a/arch/x86/boot/compressed/misc.h ++++ b/arch/x86/boot/compressed/misc.h +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + #define BOOT_BOOT_H + #include "../ctype.h" -- 2.47.3