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

Commit 61ce7b3a 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] Cleanup unnecessary <asm/ptrace.h> inclusions.
  [MIPS] DEC: pt_regs fixes for buserror handlers
  [MIPS] Fix return type of gt64120_irq.
  [MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument.
  [MIPS] Jazz defconfig file.
  [MIPS] Jazz: build fix - include <linux/screen_info.h>
  [MIPS] Jazz: Remove warning.  After 7 years probably somebody test this ;)
  [MIPS] Jazz: Fix I/O port resources.
  [MIPS] DEC: pt_regs fixes for dec_intr_halt.
  handle_sysrq lost its pt_regs * argument

Manual conflict resolved in arch/um/drivers/mconsole_kern.c
parents 7bea96fd 27f76819

arch/mips/au1000/common/time.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ 




#include <asm/compiler.h>

#include <asm/compiler.h>

#include <asm/mipsregs.h>

#include <asm/mipsregs.h>

#include <asm/ptrace.h>

#include <asm/time.h>

#include <asm/time.h>

#include <asm/div64.h>

#include <asm/div64.h>

#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-au1x00/au1000.h>

arch/mips/cobalt/irq.c

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

#include <asm/i8259.h>

#include <asm/irq_cpu.h>

#include <asm/irq_cpu.h>

#include <asm/gt64120.h>

#include <asm/gt64120.h>

#include <asm/ptrace.h>





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

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

arch/mips/configs/jazz_defconfig

0 → 100644
+1404 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/mips/dec/ecc-berr.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/addrspace.h>

#include <asm/addrspace.h>

#include <asm/bootinfo.h>

#include <asm/bootinfo.h>

#include <asm/cpu.h>

#include <asm/cpu.h>

#include <asm/irq_regs.h>

#include <asm/processor.h>

#include <asm/processor.h>

#include <asm/system.h>

#include <asm/system.h>

#include <asm/traps.h>

#include <asm/traps.h>
@@ -200,8 +201,10 @@ int dec_ecc_be_handler(struct pt_regs *regs, int is_fixup) 
	return dec_ecc_be_backend(regs, is_fixup, 0);

	return dec_ecc_be_backend(regs, is_fixup, 0);

}

}





irqreturn_t dec_ecc_be_interrupt(int irq, void *dev_id, struct pt_regs *regs)

irqreturn_t dec_ecc_be_interrupt(int irq, void *dev_id)

{

{

	struct pt_regs *regs = get_irq_regs();



	int action = dec_ecc_be_backend(regs, 0, 1);

	int action = dec_ecc_be_backend(regs, 0, 1);





	if (action == MIPS_BE_DISCARD)

	if (action == MIPS_BE_DISCARD)

arch/mips/dec/kn01-berr.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -150,10 +150,10 @@ int dec_kn01_be_handler(struct pt_regs *regs, int is_fixup) 
	return dec_kn01_be_backend(regs, is_fixup, 0);

	return dec_kn01_be_backend(regs, is_fixup, 0);

}

}





irqreturn_t dec_kn01_be_interrupt(int irq, void *dev_id,

irqreturn_t dec_kn01_be_interrupt(int irq, void *dev_id)

				    struct pt_regs *regs)

{

{

	volatile u16 *csr = (void *)CKSEG1ADDR(KN01_SLOT_BASE + KN01_CSR);

	volatile u16 *csr = (void *)CKSEG1ADDR(KN01_SLOT_BASE + KN01_CSR);

	struct pt_regs *regs = get_irq_regs();

	int action;

	int action;





	if (!(*csr & KN01_CSR_MEMERR))

	if (!(*csr & KN01_CSR_MEMERR))