[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <158539459459.28353.12622409151371734072.tip-bot2@tip-bot2>
Date: Sat, 28 Mar 2020 11:23:14 -0000
From: "tip-bot2 for Joerg Roedel" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Joerg Roedel <jroedel@...e.de>, Borislav Petkov <bp@...e.de>,
x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org>
Subject: [tip: x86/boot] x86/boot/compressed: Fix debug_puthex() parameter type
The following commit has been merged into the x86/boot branch of tip:
Commit-ID: c90beea22a2bece4b0bbb39789bf835504421594
Gitweb: https://git.kernel.org/tip/c90beea22a2bece4b0bbb39789bf835504421594
Author: Joerg Roedel <jroedel@...e.de>
AuthorDate: Thu, 19 Mar 2020 10:13:07 +01:00
Committer: Borislav Petkov <bp@...e.de>
CommitterDate: Sat, 28 Mar 2020 12:14:26 +01:00
x86/boot/compressed: Fix debug_puthex() parameter type
In the CONFIG_X86_VERBOSE_BOOTUP=Y case, the debug_puthex() macro just
turns into __puthex(), which takes 'unsigned long' as parameter.
But in the CONFIG_X86_VERBOSE_BOOTUP=N case, it is a function which
takes 'unsigned char *', causing compile warnings when the function is
used. Fix the parameter type to get rid of the warnings.
Signed-off-by: Joerg Roedel <jroedel@...e.de>
Signed-off-by: Borislav Petkov <bp@...e.de>
Link: https://lkml.kernel.org/r/20200319091407.1481-11-joro@8bytes.org
---
arch/x86/boot/compressed/misc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index c818139..726e264 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -59,7 +59,7 @@ void __puthex(unsigned long value);
static inline void debug_putstr(const char *s)
{ }
-static inline void debug_puthex(const char *s)
+static inline void debug_puthex(unsigned long value)
{ }
#define debug_putaddr(x) /* */
Powered by blists - more mailing lists