* [PATCH] x86/mm/32: Fix -Wmissing prototypes warnings in init.c
@ 2020-06-06 12:37 Benjamin Thiel
2020-06-18 19:03 ` [tip: x86/cleanups] x86/mm/32: Fix -Wmissing prototypes warnings for init.c tip-bot2 for Benjamin Thiel
0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Thiel @ 2020-06-06 12:37 UTC (permalink / raw)
To: x86 ML; +Cc: LKML, Benjamin Thiel
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>
---
arch/x86/include/asm/pgtable.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index f51d8997ed00..741029e867f8 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -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);
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/cleanups] x86/mm/32: Fix -Wmissing prototypes warnings for init.c
2020-06-06 12:37 [PATCH] x86/mm/32: Fix -Wmissing prototypes warnings in init.c Benjamin Thiel
@ 2020-06-18 19:03 ` tip-bot2 for Benjamin Thiel
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Benjamin Thiel @ 2020-06-18 19:03 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Benjamin Thiel, Borislav Petkov, x86, LKML
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@posteo.de>
AuthorDate: Sat, 06 Jun 2020 14:37:43 +02:00
Committer: Borislav Petkov <bp@suse.de>
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@posteo.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200606123743.3277-1-b.thiel@posteo.de
---
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 */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-18 19:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-06 12:37 [PATCH] x86/mm/32: Fix -Wmissing prototypes warnings in init.c Benjamin Thiel
2020-06-18 19:03 ` [tip: x86/cleanups] x86/mm/32: Fix -Wmissing prototypes warnings for init.c tip-bot2 for Benjamin Thiel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).