Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Do not use -msym32 option for modules.
  [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors.
  [MIPS] Ocelot G: Fix : "CURRENTLY_UNUSED" is not defined warning.
  [MIPS] Fix warning about init_initrd() call if !CONFIG_BLK_DEV_INITRD.
  [MIPS] IP27: Allow SMP ;-)  Another changeset messed up by patch.
  [MIPS] Fix merge screwup by patch(1)
  Revert "[MIPS] Make SPARSEMEM selectable on QEMU."
parents 096e5bda 236d333c

arch/mips/Kconfig

+3 −6
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ config MOMENCO_OCELOT_C 
	select SWAP_IO_SPACE

	select SYS_HAS_CPU_RM7000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if BROKEN

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	help

	  The Ocelot is a MIPS-based Single Board Computer (SBC) made by
@@ -425,9 +425,8 @@ config MOMENCO_OCELOT_G 
	select SWAP_IO_SPACE

	select SYS_HAS_CPU_RM7000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if BROKEN

	select SYS_SUPPORTS_BIG_ENDIAN

	select ARCH_SPARSEMEM_ENABLE

	help

	  The Ocelot is a MIPS-based Single Board Computer (SBC) made by

	  Momentum Computer <http://www.momenco.com/>.
@@ -560,6 +559,7 @@ config SGI_IP27 
	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_SMP

	help

	  This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics

	  workstations.  To compile a Linux kernel that runs on these, say Y
@@ -1631,9 +1631,6 @@ config ARCH_DISCONTIGMEM_ENABLE 
	  or have huge holes in the physical address space for other reasons.

	  See <file:Documentation/vm/numa> for more.



config ARCH_SPARSEMEM_ENABLE

	bool



config ARCH_SPARSEMEM_ENABLE

	bool

	select SPARSEMEM_STATIC

arch/mips/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -63,7 +63,9 @@ cflags-y += -mabi=64 
ifdef CONFIG_BUILD_ELF64

cflags-y		+= $(call cc-option,-mno-explicit-relocs)

else

cflags-y		+= $(call cc-option,-msym32)

# -msym32 can not be used for modules since they are loaded into XKSEG

CFLAGS_MODULE		+= $(call cc-option,-mno-explicit-relocs)

CFLAGS_KERNEL		+= $(call cc-option,-msym32)

endif

endif

arch/mips/kernel/setup.c

+5 −1
Original line number Diff line number Diff line
@@ -223,7 +223,11 @@ static void __init finalize_initrd(void) 


#else  /* !CONFIG_BLK_DEV_INITRD */



#define init_initrd()		0

static unsigned long __init init_initrd(void)

{

	return 0;

}



#define finalize_initrd()	do {} while (0)



#endif

arch/mips/momentum/ocelot_g/gt-irq.c

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ unsigned long bus_clock; 
 * be handled and ack'ed differently than other MIPS interrupts.

 */



#if CURRENTLY_UNUSED

#if 0



struct tq_struct irq_handlers[MAX_CAUSE_REGS][MAX_CAUSE_REG_WIDTH];

void hook_irq_handler(int int_cause, int bit_num, void *isr_ptr);
@@ -95,7 +95,7 @@ int disable_galileo_irq(int int_cause, int bit_num) 
		return 0;

	return 1;

}

#endif				/*  UNUSED  */

#endif /* 0 */



/*

 * Interrupt handler for interrupts coming from the Galileo chip via P0_INT#.
@@ -196,7 +196,7 @@ void gt64240_time_init(void) 


void gt64240_irq_init(void)

{

#if CURRENTLY_UNUSED

#if 0

	int i, j;



	/* Reset irq handlers pointers to NULL */
@@ -208,5 +208,5 @@ void gt64240_irq_init(void) 
			irq_handlers[i][j].data = NULL;

		}

	}

#endif

#endif /* 0 */

}

include/asm-mips/system.h

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old, 
{

	__u64 retval;



	if (cpu_has_llsc) {

	if (cpu_has_llsc && R10000_LLSC_WAR) {

		__asm__ __volatile__(

		"	.set	push					\n"

		"	.set	noat					\n"