x86/mm/32: Fix -Wmissing prototypes warnings in init.c
PATCH 1/1 x86/mm/32: Fix -Wmissing prototypes warnings in 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.
--- arch/x86/include/asm/pgtable.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/x86/include/asm/pgtable.h +3 -4
@@ -1069,6 +1069,9 @@ extern int direct_gbpages;void init_mem_mapping (void );void early_alloc_pgt_buf (void );extern void memblock_find_dma_reserve (void ); +void __init poking_init (void ); +unsigned long init_memory_mapping (unsigned long start, +unsigned long end,pgprot_t prot);#ifdef CONFIG_X86_64 /* Realmode trampoline initialization. */
@@ -1079,10 +1082,6 @@ static inline void __meminit init_trampoline_default(void) trampoline_pgd_entry = init_top_pgt[pgd_index (__PAGE_OFFSET)]; } -void __init poking_init (void ); - -unsigned long init_memory_mapping (unsigned long start, -unsigned long end,pgprot_t prot);# ifdef CONFIG_RANDOMIZE_MEMORY void __meminit init_trampoline (void );
Signature · 1 line
2.20.1
[tip: x86/cleanups] x86/mm/32: Fix -Wmissing prototypes warnings for init.c
The following commit has been merged into the x86/cleanups branch of tip:
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 <[email protected]> AuthorDate: Sat, 06 Jun 2020 14:37:43 +02:00 Committer: Borislav Petkov <[email protected]> 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.
--- arch/x86/include/asm/pgtable.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
arch/x86/include/asm/pgtable.h +3 -6
@@ -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 */