Commit ff0ff780 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: lantiq: use export.h in favour of module.h
  MAINTAINERS: The MIPS git tree has moved.
  MIPS: Fix build error due to missing inclusion of <linux/export.h>.
  MIPS: ASID conflict after CPU hotplug
  MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c
  MIPS: errloongson2_clock: Fix build error by including linux/module.h
  STAGING: octeon-ethernet: Fix compile error caused by skb_frag_struct change
  MIPS: Hook up process_vm_readv and process_vm_writev system calls.
  MIPS: Kernel hangs occasionally during boot.
  MIPS: Octeon: Mark SMP-IPI interrupt as IRQF_NO_THREAD
  MIPS: BCM47xx: fix build with GENERIC_GPIO configuration
  MIPS: NXP: Remove unused source files.
  MIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check
parents b1914cb2 4af92e7a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4339,7 +4339,7 @@ MIPS 
M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-mips@linux-mips.org

W:	http://www.linux-mips.org/

T:	git git://git.linux-mips.org/pub/scm/linux.git

T:	git git://git.linux-mips.org/pub/scm/ralf/linux.git

Q:	http://patchwork.linux-mips.org/project/linux-mips/list/

S:	Supported

F:	Documentation/mips/

arch/mips/cavium-octeon/flash_setup.c

+2 −7
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 


static struct map_info flash_map;

static struct mtd_info *mymtd;

static int nr_parts;

static struct mtd_partition *parts;

static const char *part_probe_types[] = {

	"cmdlinepart",

#ifdef CONFIG_MTD_REDBOOT_PARTS
@@ -61,11 +59,8 @@ static int __init flash_init(void) 
		mymtd = do_map_probe("cfi_probe", &flash_map);

		if (mymtd) {

			mymtd->owner = THIS_MODULE;



			nr_parts = parse_mtd_partitions(mymtd,

							part_probe_types,

							&parts, 0);

			mtd_device_register(mymtd, parts, nr_parts);

			mtd_device_parse_register(mymtd, part_probe_types,

						  0, NULL, 0);

		} else {

			pr_err("Failed to register MTD device for flash\n");

		}

arch/mips/cavium-octeon/smp.c

+3 −2
Original line number Diff line number Diff line
@@ -207,8 +207,9 @@ void octeon_prepare_cpus(unsigned int max_cpus) 
	 * the other bits alone.

	 */

	cvmx_write_csr(CVMX_CIU_MBOX_CLRX(cvmx_get_core_num()), 0xffff);

	if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt, IRQF_DISABLED,

			"SMP-IPI", mailbox_interrupt)) {

	if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt,

			IRQF_PERCPU | IRQF_NO_THREAD, "SMP-IPI",

			mailbox_interrupt)) {

		panic("Cannot request_irq(OCTEON_IRQ_MBOX0)\n");

	}

}

arch/mips/emma/common/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void __init prom_init(void) 


	/* arg[0] is "g", the rest is boot parameters */

	for (i = 1; i < argc; i++) {

		if (strlen(arcs_cmdline) + strlen(arg[i] + 1)

		if (strlen(arcs_cmdline) + strlen(arg[i]) + 1

		    >= sizeof(arcs_cmdline))

			break;

		strcat(arcs_cmdline, arg[i]);

arch/mips/include/asm/mach-bcm47xx/gpio.h

+15 −3
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ static inline int gpio_get_value(unsigned gpio) 
	return -EINVAL;

}



#define gpio_get_value_cansleep	gpio_get_value



static inline void gpio_set_value(unsigned gpio, int value)

{

	switch (bcm47xx_bus_type) {
@@ -54,6 +56,19 @@ static inline void gpio_set_value(unsigned gpio, int value) 
	}

}



#define gpio_set_value_cansleep gpio_set_value



static inline int gpio_cansleep(unsigned gpio)

{

	return 0;

}



static inline int gpio_is_valid(unsigned gpio)

{

	return gpio < (BCM47XX_EXTIF_GPIO_LINES + BCM47XX_CHIPCO_GPIO_LINES);

}





static inline int gpio_direction_input(unsigned gpio)

{

	switch (bcm47xx_bus_type) {
@@ -137,7 +152,4 @@ static inline int gpio_polarity(unsigned gpio, int value) 
}





/* cansleep wrappers */

#include <asm-generic/gpio.h>



#endif /* __BCM47XX_GPIO_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE