| From b920da8656e44e295eb3f1920bb6b0c05902ae35 Mon Sep 17 00:00:00 2001 |
| From: Zhenzhong Duan <zhenzhong.duan@oracle.com> |
| Date: Tue, 16 Jul 2019 21:18:12 +0800 |
| Subject: x86, boot: Remove multiple copy of static function |
| sanitize_boot_params() |
| |
| [ Upstream commit 8c5477e8046ca139bac250386c08453da37ec1ae ] |
| |
| 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 <zhenzhong.duan@oracle.com> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Link: https://lkml.kernel.org/r/1563283092-1189-1-git-send-email-zhenzhong.duan@oracle.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/boot/compressed/misc.c | 1 + |
| arch/x86/boot/compressed/misc.h | 1 - |
| 2 files changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c |
| index d86e68d3c794f..1912b2671f107 100644 |
| --- a/arch/x86/boot/compressed/misc.c |
| +++ b/arch/x86/boot/compressed/misc.c |
| @@ -15,6 +15,7 @@ |
| #include "error.h" |
| #include "../string.h" |
| #include "../voffset.h" |
| +#include <asm/bootparam_utils.h> |
| |
| /* |
| * WARNING!! |
| diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h |
| index 2728e1b7e4a61..a8789aa647b47 100644 |
| --- a/arch/x86/boot/compressed/misc.h |
| +++ b/arch/x86/boot/compressed/misc.h |
| @@ -19,7 +19,6 @@ |
| #include <asm/page.h> |
| #include <asm/boot.h> |
| #include <asm/bootparam.h> |
| -#include <asm/bootparam_utils.h> |
| |
| #define BOOT_BOOT_H |
| #include "../ctype.h" |
| -- |
| 2.20.1 |
| |