Commit 0d9ccfe1 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: Loongson: Switch from flatmem to sparsemem
  MIPS: Loongson: Disallow 4kB pages
  MIPS: Add missing definition for MADV_HWPOISON.
  MIPS: Fix build error if __xchg() is not getting inlined.
  MIPS: IP22/IP28 Disable early printk to fix boot problems on some systems.
parents f13a48bd f133f22d

arch/mips/Kconfig

+18 −3
Original line number Original line Diff line number Diff line
@@ -358,7 +358,14 @@ config SGI_IP22 
	select SWAP_IO_SPACE

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_R5000

	select SYS_HAS_CPU_R5000

	select SYS_HAS_EARLY_PRINTK

	#

	# Disable EARLY_PRINTK for now since it leads to overwritten prom

	# memory during early boot on some machines.

	#

	# See http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20091119164009.GA15038%40deprecation.cyrius.com

	# for a more details discussion

	#

	# select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN
@@ -410,7 +417,14 @@ config SGI_IP28 
	select SGI_HAS_ZILOG

	select SGI_HAS_ZILOG

	select SWAP_IO_SPACE

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_R10000

	select SYS_HAS_CPU_R10000

	select SYS_HAS_EARLY_PRINTK

	#

	# Disable EARLY_PRINTK for now since it leads to overwritten prom

	# memory during early boot on some machines.

	#

	# See http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20091119164009.GA15038%40deprecation.cyrius.com

	# for a more details discussion

	#

	# select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

      help

      help
@@ -1439,6 +1453,7 @@ choice 




config PAGE_SIZE_4KB

config PAGE_SIZE_4KB

	bool "4kB"

	bool "4kB"

	depends on !CPU_LOONGSON2

	help

	help

	 This option select the standard 4kB Linux page size.  On some

	 This option select the standard 4kB Linux page size.  On some

	 R3000-family processors this is the only available page size.  Using

	 R3000-family processors this is the only available page size.  Using
@@ -1763,7 +1778,7 @@ config SYS_SUPPORTS_SMARTMIPS 




config ARCH_FLATMEM_ENABLE

config ARCH_FLATMEM_ENABLE

	def_bool y

	def_bool y

	depends on !NUMA

	depends on !NUMA && !CPU_LOONGSON2





config ARCH_DISCONTIGMEM_ENABLE

config ARCH_DISCONTIGMEM_ENABLE

	bool

	bool

arch/mips/include/asm/mman.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ 




#define MADV_MERGEABLE   12		/* KSM may merge identical pages */

#define MADV_MERGEABLE   12		/* KSM may merge identical pages */

#define MADV_UNMERGEABLE 13		/* KSM may not merge identical pages */

#define MADV_UNMERGEABLE 13		/* KSM may not merge identical pages */

#define MADV_HWPOISON    100		/* poison a page for testing */





/* compatibility flags */

/* compatibility flags */

#define MAP_FILE	0

#define MAP_FILE	0

arch/mips/include/asm/system.h

+9 −6
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#ifndef _ASM_SYSTEM_H

#ifndef _ASM_SYSTEM_H

#define _ASM_SYSTEM_H

#define _ASM_SYSTEM_H





#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/irqflags.h>

#include <linux/irqflags.h>
@@ -193,10 +194,6 @@ extern __u64 __xchg_u64_unsupported_on_32bit_kernels(volatile __u64 * m, __u64 v 
#define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels

#define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels

#endif

#endif





/* This function doesn't exist, so you'll get a linker error

   if something tries to do an invalid xchg().  */

extern void __xchg_called_with_bad_pointer(void);



static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)

static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)

{

{

	switch (size) {

	switch (size) {
@@ -205,11 +202,17 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz 
	case 8:

	case 8:

		return __xchg_u64(ptr, x);

		return __xchg_u64(ptr, x);

	}

	}

	__xchg_called_with_bad_pointer();



	return x;

	return x;

}

}





#define xchg(ptr, x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))

#define xchg(ptr, x)							\

({									\

	BUILD_BUG_ON(sizeof(*(ptr)) & ~0xc);				\

									\

	((__typeof__(*(ptr)))						\

		__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))));	\

})





extern void set_handler(unsigned long offset, void *addr, unsigned long len);

extern void set_handler(unsigned long offset, void *addr, unsigned long len);

extern void set_uncached_handler(unsigned long offset, void *addr, unsigned long len);

extern void set_uncached_handler(unsigned long offset, void *addr, unsigned long len);

CRA Git | Maintained and supported by SUSTech CRA and CCSE