[tip: x86/cleanups] x86/mm/32: Fix -Wmissing prototypes warnings for init.c

[tip-bot2 for Benjamin Thiel]

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

Commit-ID:     56ce93700eb630a8d894f5a578f166888ae8cba6
Gitweb:        https://git.kernel.org/tip/56ce93700eb630a8d894f5a578f166888ae8cba6
Author:        Benjamin Thiel <b.thiel@xxxxxxxxx>
AuthorDate:    Sat, 06 Jun 2020 14:37:43 +02:00
Committer:     Borislav Petkov <bp@xxxxxxx>
CommitterDate: Thu, 18 Jun 2020 18:04:00 +02:00

x86/mm/32: Fix -Wmissing prototypes warnings for init.c

Fix:

  arch/x86/mm/init.c:503:21:
  warning: no previous prototype for âinit_memory_mappingâ [-Wmissing-prototypes]
  unsigned long __ref init_memory_mapping(unsigned long start,

  arch/x86/mm/init.c:745:13:
  warning: no previous prototype for âpoking_initâ [-Wmissing-prototypes]
  void __init poking_init(void)

Lift init_memory_mapping() and poking_init() out of the ifdef
CONFIG_X86_64 to make the functions visible on 32-bit too.

Signed-off-by: Benjamin Thiel <b.thiel@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20200606123743.3277-1-b.thiel@xxxxxxxxx
---
 arch/x86/include/asm/pgtable.h |  9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 76aa21e..b836138 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -999,15 +999,12 @@ extern int direct_gbpages;
 void init_mem_mapping(void);
 void early_alloc_pgt_buf(void);
 extern void memblock_find_dma_reserve(void);
-
-
-#ifdef CONFIG_X86_64
-extern pgd_t trampoline_pgd_entry;
-
 void __init poking_init(void);
-
 unsigned long init_memory_mapping(unsigned long start,
 				  unsigned long end, pgprot_t prot);
+
+#ifdef CONFIG_X86_64
+extern pgd_t trampoline_pgd_entry;
 #endif
 
 /* local pte updates need not use xchg for locking */