Commit 4854cf9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 648f575d 59be5c35

arch/mips/alchemy/common/prom.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/string.h>



#include <asm/bootinfo.h>

#include <prom.h>



int prom_argc;

char **prom_argv;

arch/mips/alchemy/common/setup.c

+1 −3
Original line number Diff line number Diff line
@@ -30,13 +30,11 @@ 
#include <linux/mm.h>

#include <linux/dma-map-ops.h> /* for dma_default_coherent */



#include <asm/bootinfo.h>

#include <asm/mipsregs.h>



#include <au1000.h>



extern void __init board_setup(void);

extern void __init alchemy_set_lpj(void);



static bool alchemy_dma_coherent(void)

{

	switch (alchemy_get_cputype()) {

arch/mips/bcm63xx/boards/board_bcm963xx.c

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ static struct ssb_sprom bcm63xx_sprom = { 
	.boardflags_hi		= 0x0000,

};



int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)

static int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)

{

	if (bus->bustype == SSB_BUSTYPE_PCI) {

		memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));

arch/mips/bcm63xx/dev-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static struct platform_device bcm63xx_rng_device = { 
	.resource	= rng_resources,

};



int __init bcm63xx_rng_register(void)

static int __init bcm63xx_rng_register(void)

{

	if (!BCMCPU_IS_6368())

		return -ENODEV;

arch/mips/bcm63xx/dev-uart.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <bcm63xx_cpu.h>

#include <bcm63xx_dev_uart.h>



static struct resource uart0_resources[] = {

	{