D26619.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26619.diff
View Options

	Index: head/sys/mips/include/proc.h
	===================================================================
	--- head/sys/mips/include/proc.h
	+++ head/sys/mips/include/proc.h
	@@ -81,11 +81,11 @@
	size_t md_tls_tcb_offset; /* TCB offset */
	};

	+#define MAXARGS 8
	struct syscall_args {
	u_int code;
	struct sysent *callp;
	- register_t args[8];
	- struct trapframe *trapframe;
	+ register_t args[MAXARGS];
	};

	#ifdef __mips_n64
	Index: head/sys/mips/mips/trap.c
	===================================================================
	--- head/sys/mips/mips/trap.c
	+++ head/sys/mips/mips/trap.c
	@@ -349,9 +349,9 @@
	bzero(sa->args, sizeof(sa->args));

	/* compute next PC after syscall instruction */
	- td->td_pcb->pcb_tpc = sa->trapframe->pc; /* Remember if restart */
	- if (DELAYBRANCH(sa->trapframe->cause)) /* Check BD bit */
	- locr0->pc = MipsEmulateBranch(locr0, sa->trapframe->pc, 0, 0);
	+ td->td_pcb->pcb_tpc = locr0->pc; /* Remember if restart */
	+ if (DELAYBRANCH(locr0->cause)) /* Check BD bit */
	+ locr0->pc = MipsEmulateBranch(locr0, locr0->pc, 0, 0);
	else
	locr0->pc += sizeof(int);
	sa->code = locr0->v0;
	@@ -781,7 +781,6 @@

	case T_SYSCALL + T_USER:
	{
	- td->td_sa.trapframe = trapframe;
	syscallenter(td);

	#if !defined(SMP) && (defined(DDB) \|\| defined(DEBUG))