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

Commit 185d84b4 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] IP27: Build fix
  [MIPS] Wire up ioprio_set and ioprio_get.
  [MIPS] Fix __raw_read_trylock() to allow multiple readers
  [MIPS] Export __copy_user_inatomic.
  [MIPS] R2 bitops compile fix for gcc < 4.0.
  [MIPS] TX39: Remove redundant tx39_blast_icache() calls
  [MIPS] Cobalt: Fix early printk
  [MIPS] SMTC: De-obscure Malta hooks.
  [MIPS] SMTC: Add fordward declarations for mm_struct and task_struct.
  [MIPS] SMTC: <asm/mips_mt.h> must include <linux/cpumask.h>
  [MIPS] SMTC: <asm/smtc_ipi.h> must include <linux/spinlock.h>
  [MIPS] Atlas, Malta: Fix build warning.
parents 03154a27 063ea774

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ config MIPS_COBALT 
	select IRQ_CPU

	select MIPS_GT64111

	select SYS_HAS_CPU_NEVADA

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -837,7 +838,6 @@ source "arch/mips/tx4927/Kconfig" 
source "arch/mips/tx4938/Kconfig"

source "arch/mips/vr41xx/Kconfig"

source "arch/mips/philips/pnx8550/common/Kconfig"

source "arch/mips/cobalt/Kconfig"



endmenu

arch/mips/cobalt/Kconfig

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
config EARLY_PRINTK

	bool "Early console support"

	depends on MIPS_COBALT

	help

	  Provide early console support by direct access to the

	  on board UART. The UART must have been previously

	  initialised by the boot loader.

arch/mips/cobalt/console.c

+1 −4
Original line number Diff line number Diff line
@@ -9,11 +9,8 @@ 
#include <asm/addrspace.h>

#include <asm/mach-cobalt/cobalt.h>



static void putchar(int c)

void prom_putchar(char c)

{

	if(c == '\n')

		putchar('\r');



	while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))

		;

arch/mips/kernel/mips_ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ EXPORT_SYMBOL(kernel_thread); 
 * Userspace access stuff.

 */

EXPORT_SYMBOL(__copy_user);

EXPORT_SYMBOL(__copy_user_inatomic);

EXPORT_SYMBOL(__bzero);

EXPORT_SYMBOL(__strncpy_from_user_nocheck_asm);

EXPORT_SYMBOL(__strncpy_from_user_asm);

arch/mips/kernel/scall32-o32.S

+2 −0
Original line number Diff line number Diff line
@@ -656,6 +656,8 @@ einval: li v0, -EINVAL 
	sys	sys_kexec_load		4

	sys	sys_getcpu		3

	sys	sys_epoll_pwait		6

	sys	sys_ioprio_set		3

	sys	sys_ioprio_get		2

	.endm



	/* We pre-compute the number of _instruction_ bytes needed to