Commit 2c89a8d0 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] MTX1: clear PCI errors
  [MIPS] MTX1: add idsel cardbus ressources
  [MIPS] MTX1: remove unneeded settings
  [MIPS] dma_sync_sg_for_cpu is a no-op except for non-coherent R10000s.
  [MIPS] Cobalt: update reserved resources
  [MIPS] SN: PCI fixup needs to include <irq.h>.
  [MIPS] DMA: Fix a bunch of warnings due to missing inline keywords.
  [MIPS] RM: It should be #ifdef CONFIG_FOO not #if CONFIG_FOO ...
  [MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.
  [MIPS] DEC: Remove redeclarations of mips_machgroup and mips_machtype.
  [MIPS] No need to write c0_compare in plat_timer_setup
  [MIPS] Convert to RTC-class ds1742 driver
  [MIPS] Oprofile: Add missing break statements.
  [MIPS] jmr3927: build fix
  [MIPS] SNI: Fix mc146818_decode_year
  [MIPS] Replace sys32_timer_create with the generic compat_sys_timer_create.
  [MIPS] Replace sys32_socketcall with the generic compat_sys_socketcall.
  [MIPS] N32 waitid is the same as o32.
parents e9cdb1e3 8b4ac6f3

arch/mips/Kconfig

+28 −7
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ config MACH_DECSTATION 
	bool "DECstations"

	select BOOT_ELF32

	select DMA_NONCOHERENT

	select EARLY_PRINTK

	select SYS_HAS_EARLY_PRINTK

	select IRQ_CPU

	select SYS_HAS_CPU_R3000

	select SYS_HAS_CPU_R4X00
@@ -242,6 +242,7 @@ config MACH_JAZZ 
config LASAT

	bool "LASAT Networks platforms"

	select DMA_NONCOHERENT

	select SYS_HAS_EARLY_PRINTK

	select HW_HAS_PCI

	select MIPS_GT64120

	select MIPS_NILE4
@@ -256,6 +257,7 @@ config MIPS_ATLAS 
	bool "MIPS Atlas board"

	select BOOT_ELF32

	select DMA_NONCOHERENT

	select SYS_HAS_EARLY_PRINTK

	select IRQ_CPU

	select HW_HAS_PCI

	select MIPS_BOARDS_GEN
@@ -301,6 +303,7 @@ config MIPS_MALTA 
	select SYS_HAS_CPU_MIPS64_R1

	select SYS_HAS_CPU_NEVADA

	select SYS_HAS_CPU_RM7000

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN
@@ -316,6 +319,7 @@ config MIPS_SEAD 
	depends on EXPERIMENTAL

	select IRQ_CPU

	select DMA_NONCOHERENT

	select SYS_HAS_EARLY_PRINTK

	select MIPS_BOARDS_GEN

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2
@@ -353,9 +357,11 @@ config WR_PPMC 
config MIPS_SIM

	bool 'MIPS simulator (MIPSsim)'

	select DMA_NONCOHERENT

	select SYS_HAS_EARLY_PRINTK

	select IRQ_CPU

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -376,6 +382,7 @@ config MOMENCO_JAGUAR_ATX 
	select RM7000_CPU_SCACHE

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_RM9000

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN
@@ -513,6 +520,7 @@ config PMC_YOSEMITE 
	select IRQ_CPU_RM9K

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_RM9000

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN
@@ -573,6 +581,7 @@ config SGI_IP22 
	select SWAP_IO_SPACE

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_R5000

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN
@@ -587,7 +596,7 @@ config SGI_IP27 
	select ARC64

	select BOOT_ELF64

	select DMA_IP27

	select EARLY_PRINTK

	select SYS_HAS_EARLY_PRINTK

	select HW_HAS_PCI

	select NR_CPUS_DEFAULT_64

	select PCI_DOMAINS
@@ -749,6 +758,7 @@ config SNI_RM 
	select SYS_HAS_CPU_R5000

	select SYS_HAS_CPU_R10000

	select R5000_CPU_SCACHE

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_BIG_ENDIAN
@@ -897,6 +907,20 @@ config DMA_NEED_PCI_MAP_STATE 
	bool



config EARLY_PRINTK

	bool "Early printk" if EMBEDDED && DEBUG_KERNEL

	depends on SYS_HAS_EARLY_PRINTK

	default y

	help

	  This option enables special console drivers which allow the kernel

	  to print messages very early in the bootup process.



	  This is useful for kernel debugging when your machine crashes very

	  early before the console code is initialized. For normal operation

	  it is not recommended because it looks on some machines ugly and

	  oesn't cooperate with an X server. You should normally N here,

	  unless you want to debug such a crash.



config SYS_HAS_EARLY_PRINTK

	bool



config GENERIC_ISA_DMA
@@ -1033,6 +1057,7 @@ config SOC_PNX8550 
	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select GENERIC_HARDIRQS_NO__DO_IRQ

	select SYS_SUPPORTS_KGDB
@@ -1093,7 +1118,7 @@ config HAVE_STD_PC_SERIAL_PORT 


config ARC_CONSOLE

	bool "ARC console support"

	depends on SGI_IP22 || SNI_RM

	depends on SGI_IP22 || (SNI_RM && CPU_LITTLE_ENDIAN)



config ARC_MEMORY

	bool
@@ -1895,10 +1920,6 @@ config HZ 


source "kernel/Kconfig.preempt"



config RTC_DS1742

	bool "DS1742 BRAM/RTC support"

	depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927



config MIPS_INSANE_LARGE

	bool "Support for large 64-bit configurations"

	depends on CPU_R10000 && 64BIT

arch/mips/arc/console.c

+0 −32
Original line number Diff line number Diff line
@@ -29,35 +29,3 @@ void prom_putchar(char c) 
	ArcWrite(1, &it, 1, &cnt);

	bc_enable();

}
 


char prom_getchar(void)

{

	ULONG cnt;

	CHAR c;



	bc_disable();

	ArcRead(0, &c, 1, &cnt);

	bc_enable();



	return c;

}



void prom_printf(char *fmt, ...)

{

	va_list args;

	char ppbuf[1024];

	char *bptr;



	va_start(args, fmt);

	vsprintf(ppbuf, fmt, args);



	bptr = ppbuf;



	while (*bptr != 0) {

		if (*bptr == '\n')

			prom_putchar('\r');



		prom_putchar(*bptr++);

	}

	va_end(args);

}

arch/mips/arc/init.c

+6 −3
Original line number Diff line number Diff line
@@ -24,12 +24,15 @@ void __init prom_init(void) 
{

	PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK;

	romvec = ROMVECTOR;

	ULONG cnt;

	CHAR c;



	prom_argc = fw_arg0;

	_prom_argv = (LONG *) fw_arg1;

	_prom_envp = (LONG *) fw_arg2;



	if (pb->magic != 0x53435241) {

		prom_printf("Aieee, bad prom vector magic %08lx\n", pb->magic);

		printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n", pb->magic);

		while(1)

			;

	}
@@ -41,8 +44,8 @@ void __init prom_init(void) 
	prom_meminit();



#ifdef DEBUG_PROM_INIT

	prom_printf("Press a key to reboot\n");

	prom_getchar();

	pr_info("Press a key to reboot\n");

	ArcRead(0, &c, 1, &cnt);

	ArcEnterInteractiveMode();

#endif

}

arch/mips/arc/memory.c

+3 −3
Original line number Diff line number Diff line
@@ -118,10 +118,10 @@ void __init prom_meminit(void) 
#ifdef DEBUG

	int i = 0;



	prom_printf("ARCS MEMORY DESCRIPTOR dump:\n");

	printk("ARCS MEMORY DESCRIPTOR dump:\n");

	p = ArcGetMemoryDescriptor(PROM_NULL_MDESC);

	while(p) {

		prom_printf("[%d,%p]: base<%08lx> pages<%08lx> type<%s>\n",

		printk("[%d,%p]: base<%08lx> pages<%08lx> type<%s>\n",

		       i, p, p->base, p->pages, mtypes(p->type));

		p = ArcGetMemoryDescriptor(p);

		i++;

arch/mips/arc/tree.c

+5 −5
Original line number Diff line number Diff line
@@ -93,10 +93,10 @@ static char *iflags[] = { 
static void __init

dump_component(pcomponent *p)

{

	prom_printf("[%p]:class<%s>type<%s>flags<%s>ver<%d>rev<%d>",

	printk("[%p]:class<%s>type<%s>flags<%s>ver<%d>rev<%d>",

	       p, classes[p->class], types[p->type],

	       iflags[p->iflags], p->vers, p->rev);

	prom_printf("key<%08lx>\n\tamask<%08lx>cdsize<%d>ilen<%d>iname<%s>\n",

	printk("key<%08lx>\n\tamask<%08lx>cdsize<%d>ilen<%d>iname<%s>\n",

	       p->key, p->amask, (int)p->cdsize, (int)p->ilen, p->iname);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE