diff options
| author | Zhenzhong Duan <zhenzhong.duan@oracle.com> | 2019-07-16 21:18:12 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-16 08:13:36 +0200 |
| commit | 52b0d2ee55cafcaa7cd4b12cb65fc7432b30dcf6 (patch) | |
| tree | 0ed86227b47a3b63a929b4c5ca4842f4899e5c60 | |
| parent | f935c9418992a865856418619ddd74114218ed01 (diff) | |
| download | linux-stable-52b0d2ee55cafcaa7cd4b12cb65fc7432b30dcf6.tar.gz linux-stable-52b0d2ee55cafcaa7cd4b12cb65fc7432b30dcf6.tar.bz2 linux-stable-52b0d2ee55cafcaa7cd4b12cb65fc7432b30dcf6.zip | |
x86, boot: Remove multiple copy of static function sanitize_boot_params()
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 <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
[nc: Fixed conflict around lack of 67b6662559f7f]
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/boot/compressed/misc.c | 1 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/misc.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 16df89c30c20..1e5b68228aff 100644 --- 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 <asm/bootparam_utils.h> /* WARNING!! * This code is compiled with -fPIC and it is relocated dynamically diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 4abb284a5b9c..bce182708814 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" |