[tip: x86/tdx] x86/kaslr: Fix build warning in KASLR code in boot stub

From: tip-bot2 for Kirill A. Shutemov
Date: Mon Apr 11 2022 - 03:50:01 EST


The following commit has been merged into the x86/tdx branch of tip:

Commit-ID: adb5680b8dfdd09756f13450bfc1ed874d895935
Gitweb: https://git.kernel.org/tip/adb5680b8dfdd09756f13450bfc1ed874d895935
Author: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
AuthorDate: Sun, 10 Apr 2022 23:00:25 +03:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Mon, 11 Apr 2022 09:41:12 +02:00

x86/kaslr: Fix build warning in KASLR code in boot stub

lib/kaslr.c is used by both the main kernel and the boot stub. It
includes asm/io.h which is supposed to be used in the main kernel. It
leads to build warnings like this with clang 13:

warning: implicit declaration of function 'outl' is invalid in C99 [-Wimplicit-function-declaration]

Replace <asm/io.h> with <asm/shared/io.h> which is suitable for both
cases.

Fixes: 1e8f93e18379 ("x86: Consolidate port I/O helpers")
Reported-by: Borislav Petkov <bp@xxxxxxx>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lore.kernel.org/r/20220410200025.3stf4jjvwfe5oxew@xxxxxxxxxxxxxxxxx
---
arch/x86/lib/kaslr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/lib/kaslr.c b/arch/x86/lib/kaslr.c
index 2b3eb8c..a58f451 100644
--- a/arch/x86/lib/kaslr.c
+++ b/arch/x86/lib/kaslr.c
@@ -11,7 +11,7 @@
#include <asm/msr.h>
#include <asm/archrandom.h>
#include <asm/e820/api.h>
-#include <asm/io.h>
+#include <asm/shared/io.h>

/*
* When built for the regular kernel, several functions need to be stubbed out