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

Commit dc315011 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] Fix warning by moving do_default_vi into CONFIG_CPU_MIPSR2_SRS
  [MIPS] Fix some minor typoes in arch/mips/Kconfig.
  [MIPS] Remove prototype for deleted function qemu_handle_int
  [MIPS] Fix some system calls with long long arguments
  [MIPS] Make dma_map_sg handle sg elements which are longer than one page
  [MIPS] Drop __ARCH_WANT_SYS_FADVISE64
  [MIPS] Fix VGA corruption on RM300C
  [MIPS] RM300: Fix MMIO problems by marking the PCI INT ACK region busy
  [MIPS] EMMA2RH: remove dead KGDB code
  [MIPS] Remove duplicate fpu enable hazard code.
  [MIPS] Atlas, Malta, SEAD: Remove scroll from interrupt handler.
parents 2c750edd 6ba07e59

arch/mips/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -747,9 +747,9 @@ config EARLY_PRINTK 
	  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,

	  early before the console code is initialized. For normal operation,

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

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

	  unless you want to debug such a crash.



config SYS_HAS_EARLY_PRINTK

arch/mips/emma2rh/markeins/setup.c

+0 −24
Original line number Diff line number Diff line
@@ -115,30 +115,6 @@ extern void markeins_irq_setup(void); 


static void inline __init markeins_sio_setup(void)

{

#ifdef CONFIG_KGDB_8250

	struct uart_port emma_port;



	memset(&emma_port, 0, sizeof(emma_port));



	emma_port.flags =

	    UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;

	emma_port.iotype = UPIO_MEM;

	emma_port.regshift = 4;	/* I/O addresses are every 8 bytes */

	emma_port.uartclk = 18544000;	/* Clock rate of the chip */



	emma_port.line = 0;

	emma_port.mapbase = KSEG1ADDR(EMMA2RH_PFUR0_BASE + 3);

	emma_port.membase = (u8*)emma_port.mapbase;

	early_serial_setup(&emma_port);



	emma_port.line = 1;

	emma_port.mapbase = KSEG1ADDR(EMMA2RH_PFUR1_BASE + 3);

	emma_port.membase = (u8*)emma_port.mapbase;

	early_serial_setup(&emma_port);



	emma_port.irq = EMMA2RH_IRQ_PFUR1;

	kgdb8250_add_port(1, &emma_port);

#endif

}



void __init plat_mem_setup(void)

arch/mips/kernel/linux32.c

+10 −0
Original line number Diff line number Diff line
@@ -556,6 +556,16 @@ asmlinkage long sys32_sync_file_range(int fd, int __pad, 
			flags);

}



asmlinkage long sys32_fadvise64_64(int fd, int __pad,

	unsigned long a2, unsigned long a3,

	unsigned long a4, unsigned long a5,

	int flags)

{

	return sys_fadvise64_64(fd,

			merge_64(a2, a3), merge_64(a4, a5),

			flags);

}



save_static_function(sys32_clone);

__attribute_used__ noinline static int

_sys32_clone(nabi_no_regargs struct pt_regs regs)

arch/mips/kernel/r4k_switch.S

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ LEAF(_init_fpu) 
	or	t0, t1

	mtc0	t0, CP0_STATUS

#endif /* CONFIG_MIPS_MT_SMTC */

	fpu_enable_hazard

	enable_fpu_hazard



	li	t1, FPU_DEFAULT

	ctc1	t1, fcr31

arch/mips/kernel/scall64-n32.S

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ EXPORT(sysn32_call_table) 
	PTR	sys_ni_syscall			/* res. for afs_syscall */

	PTR	sys_ni_syscall			/* res. for security */

	PTR	sys_gettid

	PTR	sys32_readahead

	PTR	sys_readahead

	PTR	sys_setxattr			/* 6180 */

	PTR	sys_lsetxattr

	PTR	sys_fsetxattr