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

Commit 7eeac505 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] 20Kc: Disable use of WAIT instruction.
  [MIPS] Workaround for 4Kc machine check exception
  [MIPS] Malta: Fix off by one bug in interrupt handler.
  [MIPS] No ide_default_io_base() if PCI IDE was not found
  [MIPS] Add #include <linux/profile.h> to arch/mips/kernel/time.c
  [MIPS] N32 needs to use compat_sys_futimesat
  [MIPS] rtlx: Fix build error.
  [MIPS] rtlx: fix int vs. long bug.
parents 22d95b12 50da469a

arch/mips/kernel/cpu-probe.c

+8 −1
Original line number Diff line number Diff line
@@ -199,7 +199,14 @@ static inline void check_wait(void) 
		if ((c->processor_id & 0xff) <= 0x64)

			break;



		/*

		 * Another rev is incremeting c0_count at a reduced clock

		 * rate while in WAIT mode.  So we basically have the choice

		 * between using the cp0 timer as clocksource or avoiding

		 * the WAIT instruction.  Until more details are known,

		 * disable the use of WAIT for 20Kc entirely.

		   cpu_wait = r4k_wait;

		 */

		break;

	case CPU_RM9000:

		if ((c->processor_id & 0x00ff) >= 0x40)

arch/mips/kernel/rtlx.c

+1 −3
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ static struct chan_waitqueues { 
	struct mutex mutex;

} channel_wqs[RTLX_CHANNELS];



static struct irqaction irq;

static int irq_num;

static struct vpe_notifications notify;

static int sp_stopping = 0;
@@ -111,7 +109,7 @@ static void __used dump_rtlx(void) 
static int rtlx_init(struct rtlx_info *rtlxi)

{

	if (rtlxi->id != RTLX_ID) {

		printk(KERN_ERR "no valid RTLX id at 0x%p 0x%x\n", rtlxi, rtlxi->id);

		printk(KERN_ERR "no valid RTLX id at 0x%p 0x%lx\n", rtlxi, rtlxi->id);

		return -ENOEXEC;

	}

arch/mips/kernel/scall64-n32.S

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ EXPORT(sysn32_call_table) 
	PTR	sys_mkdirat

	PTR	sys_mknodat

	PTR	sys_fchownat

	PTR	sys_futimesat			/* 6255 */

	PTR	compat_sys_futimesat		/* 6255 */

	PTR	sys_newfstatat

	PTR	sys_unlinkat

	PTR	sys_renameat

arch/mips/kernel/time.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/init.h>

#include <linux/sched.h>

#include <linux/param.h>

#include <linux/profile.h>

#include <linux/time.h>

#include <linux/timex.h>

#include <linux/smp.h>

arch/mips/mips-boards/malta/malta_int.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ asmlinkage void plat_irq_dispatch(void) 


	if (irq == MIPSCPU_INT_I8259A)

		malta_hw0_irqdispatch();

	else if (irq > 0)

	else if (irq >= 0)

		do_IRQ(MIPS_CPU_IRQ_BASE + irq);

	else

		spurious_interrupt();