diff options
author | Benjamin Thiel <b.thiel@posteo.de> | 2020-06-06 14:37:43 +0200 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2020-06-18 18:04:00 +0200 |
commit | 56ce93700eb630a8d894f5a578f166888ae8cba6 (patch) | |
tree | cde1a4c431a9bff25763d049c9c4ac4b6c07d58d /arch/x86/include/asm/pgtable.h | |
parent | 2accfa69050c2a0d6fc6106f609208b3e9622b26 (diff) | |
download | linux-stable-56ce93700eb630a8d894f5a578f166888ae8cba6.tar.gz linux-stable-56ce93700eb630a8d894f5a578f166888ae8cba6.tar.bz2 linux-stable-56ce93700eb630a8d894f5a578f166888ae8cba6.zip |
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@posteo.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200606123743.3277-1-b.thiel@posteo.de
Diffstat (limited to 'arch/x86/include/asm/pgtable.h')
-rw-r--r-- | arch/x86/include/asm/pgtable.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 76aa21e8128d..b836138ce852 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 */ |