From: "tip-bot2 for Benjamin Thiel" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Benjamin Thiel <b.thiel@posteo.de>, Borislav Petkov <bp@suse.de>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/cleanups] x86/mm/32: Fix -Wmissing prototypes warnings for init.c
Date: Thu, 18 Jun 2020 19:03:43 -0000 [thread overview]
Message-ID: <159250702393.16989.14264328319814076252.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200606123743.3277-1-b.thiel@posteo.de>
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 */
prev parent reply other threads:[~2020-06-18 19:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159250702393.16989.14264328319814076252.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=b.thiel@posteo.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).