From: Arnd Bergmann <arnd@kernel.org>
To: linux-mips@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Stephen Rothwell" <sfr@rothwell.id.au>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Thomas Bogendoerfer" <tsbogend@alpha.franken.de>
Subject: [PATCH 11/20] mips: fix tlb_init() prototype
Date: Mon, 4 Dec 2023 12:57:01 +0100 [thread overview]
Message-ID: <20231204115710.2247097-12-arnd@kernel.org> (raw)
In-Reply-To: <20231204115710.2247097-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb.de>
There are two definitions for tlb_init(), but no global declaration:
arch/mips/mm/tlb-r4k.c:552:6: error: no previous prototype for 'tlb_init' [-Werror=missing-prototypes]
arch/mips/mm/tlb-r3k.c:244:6: error: no previous prototype for 'tlb_init' [-Werror=missing-prototypes]
Move the declaration to asm/setup.h and included it as needed.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mips/include/asm/setup.h | 1 +
arch/mips/kernel/traps.c | 2 --
arch/mips/mm/tlb-r3k.c | 1 +
arch/mips/mm/tlb-r4k.c | 1 +
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h
index 8c56b862fd9c..4dce41138bad 100644
--- a/arch/mips/include/asm/setup.h
+++ b/arch/mips/include/asm/setup.h
@@ -27,5 +27,6 @@ extern unsigned long ebase;
extern unsigned int hwrena;
extern void per_cpu_trap_init(bool);
extern void cpu_cache_init(void);
+extern void tlb_init(void);
#endif /* __SETUP_H */
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 246c6a6b0261..c58c0c3c5b40 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -2157,8 +2157,6 @@ void *set_vi_handler(int n, vi_handler_t addr)
return set_vi_srs_handler(n, addr, 0);
}
-extern void tlb_init(void);
-
/*
* Timer interrupt
*/
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c
index 1fb2cf8c8bfa..f6db65410c65 100644
--- a/arch/mips/mm/tlb-r3k.c
+++ b/arch/mips/mm/tlb-r3k.c
@@ -23,6 +23,7 @@
#include <asm/io.h>
#include <asm/bootinfo.h>
#include <asm/cpu.h>
+#include <asm/setup.h>
#include <asm/tlbex.h>
#undef DEBUG_TLB
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index a542b255019a..44411b20c7ec 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -24,6 +24,7 @@
#include <asm/tlb.h>
#include <asm/tlbex.h>
#include <asm/tlbmisc.h>
+#include <asm/setup.h>
/*
* LOONGSON-2 has a 4 entry itlb which is a subset of jtlb, LOONGSON-3 has
--
2.39.2
next prev parent reply other threads:[~2023-12-04 11:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-04 11:56 [PATCH 00/20] mips: address -Wmissing-prototypes warnings Arnd Bergmann
2023-12-04 11:56 ` [PATCH 01/20] mips: decompress: fix add missing prototypes Arnd Bergmann
2023-12-04 11:56 ` [PATCH 02/20] mips: add asm/syscalls.h header Arnd Bergmann
2023-12-04 11:56 ` [PATCH 03/20] mips: add missing declarations for trap handlers Arnd Bergmann
2023-12-04 11:56 ` [PATCH 04/20] mips: rs870e: stop exporting local functions Arnd Bergmann
2023-12-04 11:56 ` [PATCH 05/20] mips: signal: move sigcontext declarations to header Arnd Bergmann
2023-12-04 11:56 ` [PATCH 06/20] mips: mark local function static if possible Arnd Bergmann
2023-12-04 11:56 ` [PATCH 07/20] mips: move build_tlb_refill_handler() prototype Arnd Bergmann
2023-12-04 11:56 ` [PATCH 08/20] mips: move jump_label_apply_nops() declaration to header Arnd Bergmann
2023-12-04 11:56 ` [PATCH 09/20] mips: unhide uasm_in_compat_space_p() declaration Arnd Bergmann
2023-12-04 11:57 ` [PATCH 10/20] mips: fix setup_zero_pages() prototype Arnd Bergmann
2023-12-04 11:57 ` Arnd Bergmann [this message]
2023-12-04 11:57 ` [PATCH 12/20] mips: move cache declarations into header Arnd Bergmann
2023-12-04 11:57 ` [PATCH 13/20] mips: add missing declarations Arnd Bergmann
2023-12-04 11:57 ` [PATCH 14/20] mips: spram: fix missing prototype warning for spram_config Arnd Bergmann
2023-12-04 11:57 ` [PATCH 15/20] mips: mt: include asm/mips_mt.h Arnd Bergmann
2023-12-04 11:57 ` [PATCH 16/20] mips: remove extraneous asm-generic/iomap.h include Arnd Bergmann
2023-12-04 11:57 ` [PATCH 17/20] mips: suspend: include linux/suspend.h as needed Arnd Bergmann
2023-12-04 11:57 ` [PATCH 18/20] mips: hide conditionally unused functions Arnd Bergmann
2023-12-04 11:57 ` [PATCH 19/20] mips: smp: fix setup_profiling_timer() prototype Arnd Bergmann
2023-12-04 11:57 ` [PATCH 20/20] mips: kexec: include linux/reboot.h Arnd Bergmann
2023-12-05 11:00 ` [PATCH 00/20] mips: address -Wmissing-prototypes warnings Thomas Bogendoerfer
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=20231204115710.2247097-12-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=sfr@rothwell.id.au \
--cc=tsbogend@alpha.franken.de \
/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