From: Ard Biesheuvel <ardb@kernel.org>
Date: Tue, 21 Jul 2020 08:19:15 +0000 (+0100)
Subject: ARM: 8994/1: mm: drop kimage_voffset which was only used by KVM
X-Git-Tag: v5.9-rc1~129^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d44a399b5c3814292be8eb3c936be5d95a9a5d6;p=thirdparty%2Fkernel%2Fstable.git

ARM: 8994/1: mm: drop kimage_voffset which was only used by KVM

Now that KVM support has been removed from the 32-bit ARM port,
drop the export kimage_voffset symbol, which no longer has any
users.

Acked-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 628028bfbb923..6acbd59186761 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -74,8 +74,6 @@ struct cachepolicy {
 	pteval_t	pte;
 };
 
-unsigned long kimage_voffset __ro_after_init;
-
 static struct cachepolicy cache_policies[] __initdata = {
 	{
 		.policy		= "uncached",
@@ -1654,9 +1652,6 @@ void __init paging_init(const struct machine_desc *mdesc)
 
 	empty_zero_page = virt_to_page(zero_page);
 	__flush_dcache_page(NULL, empty_zero_page);
-
-	/* Compute the virt/idmap offset, mostly for the sake of KVM */
-	kimage_voffset = (unsigned long)&kimage_voffset - virt_to_idmap(&kimage_voffset);
 }
 
 void __init early_mm_init(const struct machine_desc *mdesc)