Skip to content

Commit 4854cf9

Browse files
committed
Merge tag 'mips-fixes_6.8_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Thomas Bogendoerfer: - fix boot issue on single core Lantiq Danube devices - fix boot issue on Loongson64 platforms - fix improper FPU setup - fix missing prototypes issues * tag 'mips-fixes_6.8_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: mips: Call lose_fpu(0) before initializing fcr31 in mips_set_personality_nan MIPS: loongson64: set nid for reserved memblock region Revert "MIPS: loongson64: set nid for reserved memblock region" MIPS: lantiq: register smp_ops on non-smp platforms MIPS: loongson64: set nid for reserved memblock region MIPS: reserve exception vector space ONLY ONCE MIPS: BCM63XX: Fix missing prototypes MIPS: sgi-ip32: Fix missing prototypes MIPS: sgi-ip30: Fix missing prototypes MIPS: fw arc: Fix missing prototypes MIPS: sgi-ip27: Fix missing prototypes MIPS: Alchemy: Fix missing prototypes MIPS: Cobalt: Fix missing prototypes
2 parents 648f575 + 59be5c3 commit 4854cf9

File tree

34 files changed

+83
-230
lines changed

34 files changed

+83
-230
lines changed

arch/mips/alchemy/common/prom.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include <linux/string.h>
4141

4242
#include <asm/bootinfo.h>
43+
#include <prom.h>
4344

4445
int prom_argc;
4546
char **prom_argv;

arch/mips/alchemy/common/setup.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@
3030
#include <linux/mm.h>
3131
#include <linux/dma-map-ops.h> /* for dma_default_coherent */
3232

33+
#include <asm/bootinfo.h>
3334
#include <asm/mipsregs.h>
3435

3536
#include <au1000.h>
3637

37-
extern void __init board_setup(void);
38-
extern void __init alchemy_set_lpj(void);
39-
4038
static bool alchemy_dma_coherent(void)
4139
{
4240
switch (alchemy_get_cputype()) {

arch/mips/bcm63xx/boards/board_bcm963xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ static struct ssb_sprom bcm63xx_sprom = {
702702
.boardflags_hi = 0x0000,
703703
};
704704

705-
int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
705+
static int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
706706
{
707707
if (bus->bustype == SSB_BUSTYPE_PCI) {
708708
memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));

arch/mips/bcm63xx/dev-rng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static struct platform_device bcm63xx_rng_device = {
2626
.resource = rng_resources,
2727
};
2828

29-
int __init bcm63xx_rng_register(void)
29+
static int __init bcm63xx_rng_register(void)
3030
{
3131
if (!BCMCPU_IS_6368())
3232
return -ENODEV;

arch/mips/bcm63xx/dev-uart.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/kernel.h>
1111
#include <linux/platform_device.h>
1212
#include <bcm63xx_cpu.h>
13+
#include <bcm63xx_dev_uart.h>
1314

1415
static struct resource uart0_resources[] = {
1516
{

arch/mips/bcm63xx/dev-wdt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static struct platform_device bcm63xx_wdt_device = {
3434
},
3535
};
3636

37-
int __init bcm63xx_wdt_register(void)
37+
static int __init bcm63xx_wdt_register(void)
3838
{
3939
wdt_resources[0].start = bcm63xx_regset_address(RSET_WDT);
4040
wdt_resources[0].end = wdt_resources[0].start;

arch/mips/bcm63xx/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static inline int enable_irq_for_cpu(int cpu, struct irq_data *d,
7272
*/
7373

7474
#define BUILD_IPIC_INTERNAL(width) \
75-
void __dispatch_internal_##width(int cpu) \
75+
static void __dispatch_internal_##width(int cpu) \
7676
{ \
7777
u32 pending[width / 32]; \
7878
unsigned int src, tgt; \

arch/mips/bcm63xx/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void __init plat_mem_setup(void)
159159
board_setup();
160160
}
161161

162-
int __init bcm63xx_register_devices(void)
162+
static int __init bcm63xx_register_devices(void)
163163
{
164164
/* register gpiochip */
165165
bcm63xx_gpio_init();

arch/mips/bcm63xx/timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ int bcm63xx_timer_set(int id, int monotonic, unsigned int countdown_us)
178178

179179
EXPORT_SYMBOL(bcm63xx_timer_set);
180180

181-
int bcm63xx_timer_init(void)
181+
static int bcm63xx_timer_init(void)
182182
{
183183
int ret, irq;
184184
u32 reg;

arch/mips/cobalt/setup.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323

2424
#include <cobalt.h>
2525

26-
extern void cobalt_machine_restart(char *command);
27-
extern void cobalt_machine_halt(void);
28-
2926
const char *get_system_type(void)
3027
{
3128
switch (cobalt_board_id) {

0 commit comments

Comments
 (0)