[merged mm-nonmm-stable] mips-fix-tlb_init-prototype.patch removed from -mm tree

[merged mm-nonmm-stable] mips-fix-tlb_init-prototype.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mips: fix tlb_init() prototype
has been removed from the -mm tree.  Its filename was
     mips-fix-tlb_init-prototype.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Arnd Bergmann <arnd@arndb.de>
Subject: mips: fix tlb_init() prototype
Date: Mon, 4 Dec 2023 12:57:01 +0100

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.

Link: https://lkml.kernel.org/r/20231204115710.2247097-12-arnd@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@rothwell.id.au>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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(-)

--- a/arch/mips/include/asm/setup.h~mips-fix-tlb_init-prototype
+++ a/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 */
--- a/arch/mips/kernel/traps.c~mips-fix-tlb_init-prototype
+++ a/arch/mips/kernel/traps.c
@@ -2157,8 +2157,6 @@ void *set_vi_handler(int n, vi_handler_t
 	return set_vi_srs_handler(n, addr, 0);
 }
 
-extern void tlb_init(void);
-
 /*
  * Timer interrupt
  */
--- a/arch/mips/mm/tlb-r3k.c~mips-fix-tlb_init-prototype
+++ a/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
--- a/arch/mips/mm/tlb-r4k.c~mips-fix-tlb_init-prototype
+++ a/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
_

Patches currently in -mm which might be from arnd@arndb.de are

kexec-fix-kexec_file-dependencies.patch
kexec-fix-kexec_file-dependencies-fix.patch
kexec-select-crypto-from-kexec_file-instead-of-depending-on-it.patch
makefileextrawarn-turn-on-missing-prototypes-globally.patch