public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mips: move cache declarations into header

Browse source 
Some of the cache functions are declared only for their callers, e.g.

arch/mips/mm/c-r3k.c:28:15: error: no previous prototype for 'r3k_cache_size' [-Werror=missing-prototypes]
arch/mips/mm/c-r3k.c:63:15: error: no previous prototype for 'r3k_cache_lsize' [-Werror=missing-prototypes]
arch/mips/mm/c-r4k.c:1703:6: error: no previous prototype for 'r4k_cache_init' [-Werror=missing-prototypes]
arch/mips/mm/sc-mips.c:255:5: error: no previous prototype for 'mips_sc_init' [-Werror=missing-prototypes]

Move all the declarations to asm/cache.h and asm/r4kcache.h where they
can be seen by the function definitions.

Link: https://lkml.kernel.org/r/20231204115710.2247097-13-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>
This commit is contained in:
Arnd Bergmann 2023-12-04 12:57:02 +01:00 • committed by Andrew Morton
parent ec47b986e5
commit 66445677f0
6 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/mips/include/asm/cache.h
View file

@ -17,5 +17,11 @@
#define __read_mostly __section(".data..read_mostly") #define __read_mostly __section(".data..read_mostly")
extern void cache_noop(void); extern void cache_noop(void);
extern void r3k_cache_init(void);
extern unsigned long r3k_cache_size(unsigned long);
extern unsigned long r3k_cache_lsize(unsigned long);
extern void r4k_cache_init(void);
extern void octeon_cache_init(void);
extern void au1x00_fixup_config_od(void);
#endif /* _ASM_CACHE_H */ #endif /* _ASM_CACHE_H */

4
arch/mips/include/asm/r4kcache.h
View file

@ -24,6 +24,10 @@
#include <asm/mmzone.h> #include <asm/mmzone.h>
#include <asm/unroll.h> #include <asm/unroll.h>
extern void r5k_sc_init(void);
extern void rm7k_sc_init(void);
extern int mips_sc_init(void);
extern void (*r4k_blast_dcache)(void); extern void (*r4k_blast_dcache)(void);
extern void (*r4k_blast_icache)(void); extern void (*r4k_blast_icache)(void);

1
arch/mips/kernel/cpu-probe.c
View file

@ -179,7 +179,6 @@ void __init check_bugs32(void)
static inline int cpu_has_confreg(void) static inline int cpu_has_confreg(void)
{ {
#ifdef CONFIG_CPU_R3000 #ifdef CONFIG_CPU_R3000
extern unsigned long r3k_cache_size(unsigned long);
unsigned long size1, size2; unsigned long size1, size2;
unsigned long cfg = read_c0_conf(); unsigned long cfg = read_c0_conf();

1
arch/mips/kernel/cpu-r3k-probe.c
View file

@ -42,7 +42,6 @@ void __init check_bugs32(void)
static inline int cpu_has_confreg(void) static inline int cpu_has_confreg(void)
{ {
#ifdef CONFIG_CPU_R3000 #ifdef CONFIG_CPU_R3000
extern unsigned long r3k_cache_size(unsigned long);
unsigned long size1, size2; unsigned long size1, size2;
unsigned long cfg = read_c0_conf(); unsigned long cfg = read_c0_conf();

4
arch/mips/mm/c-r4k.c
View file

@ -1485,10 +1485,6 @@ static void loongson3_sc_init(void)
return; return;
} }
extern int r5k_sc_init(void);
extern int rm7k_sc_init(void);
extern int mips_sc_init(void);
static void setup_scache(void) static void setup_scache(void)
{ {
struct cpuinfo_mips *c = &current_cpu_data; struct cpuinfo_mips *c = &current_cpu_data;

6
arch/mips/mm/cache.c
View file

@ -206,19 +206,13 @@ static inline void setup_protection_map(void)
void cpu_cache_init(void) void cpu_cache_init(void)
{ {
if (cpu_has_3k_cache) { if (cpu_has_3k_cache) {
extern void __weak r3k_cache_init(void);
r3k_cache_init(); r3k_cache_init();
} }
if (cpu_has_4k_cache) { if (cpu_has_4k_cache) {
extern void __weak r4k_cache_init(void);
r4k_cache_init(); r4k_cache_init();
} }
if (cpu_has_octeon_cache) { if (cpu_has_octeon_cache) {
extern void __weak octeon_cache_init(void);
octeon_cache_init(); octeon_cache_init();
} }