Commit 7c48090a authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

Merge branch 'mips-fixes' into mips-next

parents 77543269 0d5679a0

arch/mips/bmips/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ static void bcm6358_quirks(void) 
	 * RAC flush causes kernel panics on BCM6358 when booting from TP1

	 * because the bootloader is not initializing it properly.

	 */

	bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31));

	bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31)) ||

				  !!BMIPS_GET_CBR();

}



static void bcm6368_quirks(void)

arch/mips/include/asm/mipsmtregs.h

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static inline void ehb(void) 
	"	.set	push				\n"	\

	"	.set	"MIPS_ISA_LEVEL"		\n"	\

	_ASM_SET_MFTC0							\

	"	mftc0	$1, " #rt ", " #sel "		\n"	\

	"	mftc0	%0, " #rt ", " #sel "		\n"	\

	_ASM_UNSET_MFTC0						\

	"	.set	pop				\n"	\

	: "=r" (__res));						\

arch/mips/kernel/syscalls/syscall_o32.tbl

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
17	o32	break				sys_ni_syscall

# 18 was sys_stat

18	o32	unused18			sys_ni_syscall

19	o32	lseek				sys_lseek

19	o32	lseek				sys_lseek			compat_sys_lseek

20	o32	getpid				sys_getpid

21	o32	mount				sys_mount

22	o32	umount				sys_oldumount

arch/mips/pci/ops-rc32434.c

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ static int read_config_dword(struct pci_bus *bus, unsigned int devfn, 
	 * gives them time to settle

	 */

	if (where == PCI_VENDOR_ID) {

		if (ret == 0xffffffff || ret == 0x00000000 ||

		    ret == 0x0000ffff || ret == 0xffff0000) {

		if (*val == 0xffffffff || *val == 0x00000000 ||

		    *val == 0x0000ffff || *val == 0xffff0000) {

			if (delay > 4)

				return 0;

			delay *= 2;