patch-2.4.0-test2 linux/arch/ia64/kernel/signal.c

• Lines: 521
• Date: Thu Jun 22 07:09:44 2000
• Orig file: v2.4.0-test1/linux/arch/ia64/kernel/signal.c
• Orig date: Mon Jun 19 16:31:57 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/ia64/kernel/signal.c linux/arch/ia64/kernel/signal.c
@@ -37,16 +37,26 @@
 # define GET_SIGSET(k,u)	__get_user((k)->sig[0], &(u)->sig[0])
 #endif
 
+struct sigscratch {
+#ifdef CONFIG_IA64_NEW_UNWIND
+	unsigned long scratch_unat;	/* ar.unat for the general registers saved in pt */
+	unsigned long pad;
+#else
+	struct switch_stack sw;
+#endif
+	struct pt_regs pt;
+};
+
 struct sigframe {
 	struct siginfo info;
 	struct sigcontext sc;
 };
 
 extern long sys_wait4 (int, int *, int, struct rusage *);
-extern long ia64_do_signal (sigset_t *, struct pt_regs *, long);	/* forward decl */
+extern long ia64_do_signal (sigset_t *, struct sigscratch *, long);	/* forward decl */
 
 long
-ia64_rt_sigsuspend (sigset_t *uset, size_t sigsetsize, struct pt_regs *pt)
+ia64_rt_sigsuspend (sigset_t *uset, size_t sigsetsize, struct sigscratch *scr)
 {
 	sigset_t oldset, set;
 
@@ -71,12 +81,19 @@
 	 * pre-set the correct error code here to ensure that the right values
 	 * get saved in sigcontext by ia64_do_signal.
 	 */
-	pt->r8 = EINTR;
-	pt->r10 = -1;
+#ifdef CONFIG_IA32_SUPPORT
+        if (IS_IA32_PROCESS(&scr->pt)) {
+                scr->pt.r8 = -EINTR;
+        } else
+#endif
+	{
+		scr->pt.r8 = EINTR;
+		scr->pt.r10 = -1;
+	}
 	while (1) {
 		set_current_state(TASK_INTERRUPTIBLE);
 		schedule();
-		if (ia64_do_signal(&oldset, pt, 1))
+		if (ia64_do_signal(&oldset, scr, 1))
 			return -EINTR;
 	}
 }
@@ -91,9 +108,8 @@
 }
 
 static long
-restore_sigcontext (struct sigcontext *sc, struct pt_regs *pt)
+restore_sigcontext (struct sigcontext *sc, struct sigscratch *scr)
 {
-	struct switch_stack *sw = (struct switch_stack *) pt - 1;
 	unsigned long ip, flags, nat, um, cfm;
 	long err;
 
@@ -104,28 +120,32 @@
 	err |= __get_user(ip, &sc->sc_ip);			/* instruction pointer */
 	err |= __get_user(cfm, &sc->sc_cfm);
 	err |= __get_user(um, &sc->sc_um);			/* user mask */
-	err |= __get_user(pt->ar_rsc, &sc->sc_ar_rsc);
-	err |= __get_user(pt->ar_ccv, &sc->sc_ar_ccv);
-	err |= __get_user(pt->ar_unat, &sc->sc_ar_unat);
-	err |= __get_user(pt->ar_fpsr, &sc->sc_ar_fpsr);
-	err |= __get_user(pt->ar_pfs, &sc->sc_ar_pfs);
-	err |= __get_user(pt->pr, &sc->sc_pr);			/* predicates */
-	err |= __get_user(pt->b0, &sc->sc_br[0]);		/* b0 (rp) */
-	err |= __get_user(pt->b6, &sc->sc_br[6]);		/* b6 */
-	err |= __get_user(pt->b7, &sc->sc_br[7]);		/* b7 */
-	err |= __copy_from_user(&pt->r1, &sc->sc_gr[1], 3*8);	/* r1-r3 */
-	err |= __copy_from_user(&pt->r8, &sc->sc_gr[8], 4*8);	/* r8-r11 */
-	err |= __copy_from_user(&pt->r12, &sc->sc_gr[12], 4*8);	/* r12-r15 */
-	err |= __copy_from_user(&pt->r16, &sc->sc_gr[16], 16*8);	/* r16-r31 */
+	err |= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc);
+	err |= __get_user(scr->pt.ar_ccv, &sc->sc_ar_ccv);
+	err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
+	err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
+	err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);
+	err |= __get_user(scr->pt.pr, &sc->sc_pr);		/* predicates */
+	err |= __get_user(scr->pt.b0, &sc->sc_br[0]);		/* b0 (rp) */
+	err |= __get_user(scr->pt.b6, &sc->sc_br[6]);		/* b6 */
+	err |= __get_user(scr->pt.b7, &sc->sc_br[7]);		/* b7 */
+	err |= __copy_from_user(&scr->pt.r1, &sc->sc_gr[1], 3*8);	/* r1-r3 */
+	err |= __copy_from_user(&scr->pt.r8, &sc->sc_gr[8], 4*8);	/* r8-r11 */
+	err |= __copy_from_user(&scr->pt.r12, &sc->sc_gr[12], 4*8);	/* r12-r15 */
+	err |= __copy_from_user(&scr->pt.r16, &sc->sc_gr[16], 16*8);	/* r16-r31 */
 
-	pt->cr_ifs = cfm | (1UL << 63);
+	scr->pt.cr_ifs = cfm | (1UL << 63);
 
 	/* establish new instruction pointer: */
-	pt->cr_iip = ip & ~0x3UL;
-	ia64_psr(pt)->ri = ip & 0x3;
-	pt->cr_ipsr = (pt->cr_ipsr & ~IA64_PSR_UM) | (um & IA64_PSR_UM);
-
-	ia64_put_nat_bits (pt, sw, nat);	/* restore the original scratch NaT bits */
+	scr->pt.cr_iip = ip & ~0x3UL;
+	ia64_psr(&scr->pt)->ri = ip & 0x3;
+	scr->pt.cr_ipsr = (scr->pt.cr_ipsr & ~IA64_PSR_UM) | (um & IA64_PSR_UM);
+
+#ifdef CONFIG_IA64_NEW_UNWIND
+	scr->scratch_unat = ia64_put_scratch_nat_bits(&scr->pt, nat);
+#else
+	ia64_put_nat_bits(&scr->pt, &scr->sw, nat);	/* restore the original scratch NaT bits */
+#endif
 
 	if (flags & IA64_SC_FLAG_FPH_VALID) {
 		struct task_struct *fpu_owner = ia64_get_fpu_owner();
@@ -138,7 +158,8 @@
 	return err;
 }
 
-int copy_siginfo_to_user(siginfo_t *to, siginfo_t *from)
+int
+copy_siginfo_to_user (siginfo_t *to, siginfo_t *from)
 {
 	if (!access_ok (VERIFY_WRITE, to, sizeof(siginfo_t)))
 		return -EFAULT;
@@ -147,43 +168,39 @@
 	else {
 		int err;
 
-		/* If you change siginfo_t structure, please be sure
-		   this code is fixed accordingly.
-		   It should never copy any pad contained in the structure
-		   to avoid security leaks, but must copy the generic
-		   3 ints plus the relevant union member.  */
+		/*
+		 * If you change siginfo_t structure, please be sure
+		 * this code is fixed accordingly.  It should never
+		 * copy any pad contained in the structure to avoid
+		 * security leaks, but must copy the generic 3 ints
+		 * plus the relevant union member.
+		 */
 		err = __put_user(from->si_signo, &to->si_signo);
 		err |= __put_user(from->si_errno, &to->si_errno);
 		err |= __put_user((short)from->si_code, &to->si_code);
 		switch (from->si_code >> 16) {
-		case __SI_FAULT >> 16:
-		case __SI_POLL >> 16:
+		      case __SI_FAULT >> 16:
+			err |= __put_user(from->si_isr, &to->si_isr);
+		      case __SI_POLL >> 16:
 			err |= __put_user(from->si_addr, &to->si_addr);
 			err |= __put_user(from->si_imm, &to->si_imm);
 			break;
-		case __SI_CHLD >> 16:
+		      case __SI_CHLD >> 16:
 			err |= __put_user(from->si_utime, &to->si_utime);
 			err |= __put_user(from->si_stime, &to->si_stime);
 			err |= __put_user(from->si_status, &to->si_status);
-		default:
+		      default:
 			err |= __put_user(from->si_uid, &to->si_uid);
 			err |= __put_user(from->si_pid, &to->si_pid);
 			break;
-		/* case __SI_RT: This is not generated by the kernel as of now.  */
+		      /* case __SI_RT: This is not generated by the kernel as of now.  */
 		}
 		return err;
 	}
 }
 
-/*
- * When we get here, ((struct switch_stack *) pt - 1) is a
- * switch_stack frame that has no defined value.  Upon return, we
- * expect sw->caller_unat to contain the new unat value.  The reason
- * we use a full switch_stack frame is so everything is symmetric
- * with ia64_do_signal().
- */
 long
-ia64_rt_sigreturn (struct pt_regs *pt)
+ia64_rt_sigreturn (struct sigscratch *scr)
 {
 	extern char ia64_strace_leave_kernel, ia64_leave_kernel;
 	struct sigcontext *sc;
@@ -191,7 +208,7 @@
 	sigset_t set;
 	long retval;
 
-	sc = &((struct sigframe *) (pt->r12 + 16))->sc;
+	sc = &((struct sigframe *) (scr->pt.r12 + 16))->sc;
 
 	/*
 	 * When we return to the previously executing context, r8 and
@@ -200,9 +217,15 @@
 	 * must not touch r8 or r10 as otherwise user-level stat could
 	 * be corrupted.
 	 */
-	retval = (long) &ia64_leave_kernel | 1;
-	if ((current->flags & PF_TRACESYS)
-	    && (sc->sc_flags & IA64_SC_FLAG_IN_SYSCALL))
+	retval = (long) &ia64_leave_kernel;
+	if (current->flags & PF_TRACESYS)
+		/*
+		 * strace expects to be notified after sigreturn
+		 * returns even though the context to which we return
+		 * may not be in the middle of a syscall.  Thus, the
+		 * return-value that strace displays for sigreturn is
+		 * meaningless.
+		 */
 		retval = (long) &ia64_strace_leave_kernel;
 
 	if (!access_ok(VERIFY_READ, sc, sizeof(*sc)))
@@ -217,18 +240,18 @@
 	recalc_sigpending(current);
 	spin_unlock_irq(&current->sigmask_lock);
 
-	if (restore_sigcontext(sc, pt))
+	if (restore_sigcontext(sc, scr))
 		goto give_sigsegv;
 
 #if DEBUG_SIG
 	printk("SIG return (%s:%d): sp=%lx ip=%lx\n",
-	       current->comm, current->pid, pt->r12, pt->cr_iip);
+	       current->comm, current->pid, scr->pt.r12, scr->pt.cr_iip);
 #endif
 	/*
 	 * It is more difficult to avoid calling this function than to
 	 * call it and ignore errors.
 	 */
-	do_sigaltstack(&sc->sc_stack, 0, pt->r12);
+	do_sigaltstack(&sc->sc_stack, 0, scr->pt.r12);
 	return retval;
 
   give_sigsegv:
@@ -249,14 +272,13 @@
  * trampoline starts.  Everything else is done at the user-level.
  */
 static long
-setup_sigcontext (struct sigcontext *sc, sigset_t *mask, struct pt_regs *pt)
+setup_sigcontext (struct sigcontext *sc, sigset_t *mask, struct sigscratch *scr)
 {
-	struct switch_stack *sw = (struct switch_stack *) pt - 1;
 	struct task_struct *fpu_owner = ia64_get_fpu_owner();
 	unsigned long flags = 0, ifs, nat;
 	long err;
 
-	ifs = pt->cr_ifs;
+	ifs = scr->pt.cr_ifs;
 
 	if (on_sig_stack((unsigned long) sc))
 		flags |= IA64_SC_FLAG_ONSTACK;
@@ -276,46 +298,49 @@
 	 * Note: sw->ar_unat is UNDEFINED unless the process is being
 	 * PTRACED.  However, this is OK because the NaT bits of the
 	 * preserved registers (r4-r7) are never being looked at by
-	 * the signal handler (register r4-r7 are used instead).
+	 * the signal handler (registers r4-r7 are used instead).
 	 */
-	nat = ia64_get_nat_bits(pt, sw);
+#ifdef CONFIG_IA64_NEW_UNWIND
+	nat = ia64_get_scratch_nat_bits(&scr->pt, scr->scratch_unat);
+#else
+	nat = ia64_get_nat_bits(&scr->pt, &scr->sw);
+#endif
 
 	err  = __put_user(flags, &sc->sc_flags);
 
 	err |= __put_user(nat, &sc->sc_nat);
 	err |= PUT_SIGSET(mask, &sc->sc_mask);
-	err |= __put_user(pt->cr_ipsr & IA64_PSR_UM, &sc->sc_um);
-	err |= __put_user(pt->ar_rsc, &sc->sc_ar_rsc);
-	err |= __put_user(pt->ar_ccv, &sc->sc_ar_ccv);
-	err |= __put_user(pt->ar_unat, &sc->sc_ar_unat);		/* ar.unat */
-	err |= __put_user(pt->ar_fpsr, &sc->sc_ar_fpsr);		/* ar.fpsr */
-	err |= __put_user(pt->ar_pfs, &sc->sc_ar_pfs);
-	err |= __put_user(pt->pr, &sc->sc_pr);				/* predicates */
-	err |= __put_user(pt->b0, &sc->sc_br[0]);			/* b0 (rp) */
-	err |= __put_user(pt->b6, &sc->sc_br[6]);			/* b6 */
-	err |= __put_user(pt->b7, &sc->sc_br[7]);			/* b7 */
-
-	err |= __copy_to_user(&sc->sc_gr[1], &pt->r1, 3*8);		/* r1-r3 */
-	err |= __copy_to_user(&sc->sc_gr[8], &pt->r8, 4*8);		/* r8-r11 */
-	err |= __copy_to_user(&sc->sc_gr[12], &pt->r12, 4*8);		/* r12-r15 */
-	err |= __copy_to_user(&sc->sc_gr[16], &pt->r16, 16*8);		/* r16-r31 */
+	err |= __put_user(scr->pt.cr_ipsr & IA64_PSR_UM, &sc->sc_um);
+	err |= __put_user(scr->pt.ar_rsc, &sc->sc_ar_rsc);
+	err |= __put_user(scr->pt.ar_ccv, &sc->sc_ar_ccv);
+	err |= __put_user(scr->pt.ar_unat, &sc->sc_ar_unat);		/* ar.unat */
+	err |= __put_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);		/* ar.fpsr */
+	err |= __put_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);
+	err |= __put_user(scr->pt.pr, &sc->sc_pr);			/* predicates */
+	err |= __put_user(scr->pt.b0, &sc->sc_br[0]);			/* b0 (rp) */
+	err |= __put_user(scr->pt.b6, &sc->sc_br[6]);			/* b6 */
+	err |= __put_user(scr->pt.b7, &sc->sc_br[7]);			/* b7 */
+
+	err |= __copy_to_user(&sc->sc_gr[1], &scr->pt.r1, 3*8);		/* r1-r3 */
+	err |= __copy_to_user(&sc->sc_gr[8], &scr->pt.r8, 4*8);		/* r8-r11 */
+	err |= __copy_to_user(&sc->sc_gr[12], &scr->pt.r12, 4*8);	/* r12-r15 */
+	err |= __copy_to_user(&sc->sc_gr[16], &scr->pt.r16, 16*8);	/* r16-r31 */
 
-	err |= __put_user(pt->cr_iip + ia64_psr(pt)->ri, &sc->sc_ip);
-	err |= __put_user(pt->r12, &sc->sc_gr[12]);			/* r12 */
+	err |= __put_user(scr->pt.cr_iip + ia64_psr(&scr->pt)->ri, &sc->sc_ip);
 	return err;
 }
 
 static long
-setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set, struct pt_regs *pt)
+setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
+	     struct sigscratch *scr)
 {
-	struct switch_stack *sw = (struct switch_stack *) pt - 1;
 	extern char ia64_sigtramp[], __start_gate_section[];
 	unsigned long tramp_addr, new_rbs = 0;
 	struct sigframe *frame;
 	struct siginfo si;
 	long err;
 
-	frame = (void *) pt->r12;
+	frame = (void *) scr->pt.r12;
 	tramp_addr = GATE_ADDR + (ia64_sigtramp - __start_gate_section);
 	if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && !on_sig_stack((unsigned long) frame)) {
 		new_rbs  = (current->sas_ss_sp + sizeof(long) - 1) & ~(sizeof(long) - 1);
@@ -331,31 +356,39 @@
 
 	err |= __put_user(current->sas_ss_sp, &frame->sc.sc_stack.ss_sp);
 	err |= __put_user(current->sas_ss_size, &frame->sc.sc_stack.ss_size);
-	err |= __put_user(sas_ss_flags(pt->r12), &frame->sc.sc_stack.ss_flags);
-	err |= setup_sigcontext(&frame->sc, set, pt);
+	err |= __put_user(sas_ss_flags(scr->pt.r12), &frame->sc.sc_stack.ss_flags);
+	err |= setup_sigcontext(&frame->sc, set, scr);
 
 	if (err)
 		goto give_sigsegv;
 
-	pt->r12 = (unsigned long) frame - 16;		/* new stack pointer */
-	pt->r2  = sig;					/* signal number */
-	pt->r3  = (unsigned long) ka->sa.sa_handler;	/* addr. of handler's proc. descriptor */
-	pt->r15 = new_rbs;
-	pt->ar_fpsr = FPSR_DEFAULT;			/* reset fpsr for signal handler */
-	pt->cr_iip = tramp_addr;
-	ia64_psr(pt)->ri = 0;				/* start executing in first slot */
+	scr->pt.r12 = (unsigned long) frame - 16;		/* new stack pointer */
+	scr->pt.r2  = sig;					/* signal number */
+	scr->pt.r3  = (unsigned long) ka->sa.sa_handler;	/* addr. of handler's proc desc */
+	scr->pt.r15 = new_rbs;
+	scr->pt.ar_fpsr = FPSR_DEFAULT;			/* reset fpsr for signal handler */
+	scr->pt.cr_iip = tramp_addr;
+	ia64_psr(&scr->pt)->ri = 0;			/* start executing in first slot */
 
+#ifdef CONFIG_IA64_NEW_UNWIND
 	/*
 	 * Note: this affects only the NaT bits of the scratch regs
-	 * (the ones saved in pt_regs, which is exactly what we want.
+	 * (the ones saved in pt_regs), which is exactly what we want.
+	 */
+	scr->scratch_unat = 0; /* ensure NaT bits of at least r2, r3, r12, and r15 are clear */
+#else
+	/*
+	 * Note: this affects only the NaT bits of the scratch regs
+	 * (the ones saved in pt_regs), which is exactly what we want.
 	 * The NaT bits for the preserved regs (r4-r7) are in
 	 * sw->ar_unat iff this process is being PTRACED.
 	 */
-	sw->caller_unat = 0;	/* ensure NaT bits of at least r2, r3, r12, and r15 are clear */
+	scr->sw.caller_unat = 0; /* ensure NaT bits of at least r2, r3, r12, and r15 are clear */
+#endif
 
 #if DEBUG_SIG
 	printk("SIG deliver (%s:%d): sig=%d sp=%lx ip=%lx handler=%lx\n",
-	       current->comm, current->pid, sig, pt->r12, pt->cr_iip, pt->r3);
+	       current->comm, current->pid, sig, scr->pt.r12, scr->pt.cr_iip, scr->pt.r3);
 #endif
 	return 1;
 
@@ -374,17 +407,17 @@
 
 static long
 handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset,
-	       struct pt_regs *pt)
+	       struct sigscratch *scr)
 {
 #ifdef CONFIG_IA32_SUPPORT
-	if (IS_IA32_PROCESS(pt)) {
+	if (IS_IA32_PROCESS(&scr->pt)) {
 		/* send signal to IA-32 process */
-		if (!ia32_setup_frame1(sig, ka, info, oldset, pt))
+		if (!ia32_setup_frame1(sig, ka, info, oldset, &scr->pt))
 			return 0;
 	} else
 #endif
 	/* send signal to IA-64 process */
-	if (!setup_frame(sig, ka, info, oldset, pt))
+	if (!setup_frame(sig, ka, info, oldset, scr))
 		return 0;
 
 	if (ka->sa.sa_flags & SA_ONESHOT)
@@ -401,12 +434,6 @@
 }
 
 /*
- * When we get here, `pt' points to struct pt_regs and ((struct
- * switch_stack *) pt - 1) points to a switch stack structure.
- * HOWEVER, in the normal case, the ONLY value valid in the
- * switch_stack is the caller_unat field.  The entire switch_stack is
- * valid ONLY if current->flags has PF_PTRACED set.
- *
  * Note that `init' is a special process: it doesn't get signals it
  * doesn't want to handle.  Thus you cannot kill init even with a
  * SIGKILL even by mistake.
@@ -416,24 +443,35 @@
  * user-level signal handling stack-frames in one go after that.
  */
 long
-ia64_do_signal (sigset_t *oldset, struct pt_regs *pt, long in_syscall)
+ia64_do_signal (sigset_t *oldset, struct sigscratch *scr, long in_syscall)
 {
 	struct k_sigaction *ka;
 	siginfo_t info;
 	long restart = in_syscall;
+	long errno = scr->pt.r8;
 
 	/*
 	 * In the ia64_leave_kernel code path, we want the common case
 	 * to go fast, which is why we may in certain cases get here
 	 * from kernel mode. Just return without doing anything if so.
 	 */
-	if (!user_mode(pt))
+	if (!user_mode(&scr->pt))
 		return 0;
 
 	if (!oldset)
 		oldset = &current->blocked;
 
-	if (pt->r10 != -1) {
+#ifdef CONFIG_IA32_SUPPORT
+	if (IS_IA32_PROCESS(&scr->pt)) {
+		if (in_syscall) {
+			if (errno >= 0)
+				restart = 0;
+			else
+				errno = -errno;
+		}
+	} else
+#endif
+	if (scr->pt.r10 != -1) {
 		/*
 		 * A system calls has to be restarted only if one of
 		 * the error codes ERESTARTNOHAND, ERESTARTSYS, or
@@ -527,7 +565,7 @@
 			      case SIGQUIT: case SIGILL: case SIGTRAP:
 			      case SIGABRT: case SIGFPE: case SIGSEGV:
 			      case SIGBUS: case SIGSYS: case SIGXCPU: case SIGXFSZ:
-				if (do_coredump(signr, pt))
+				if (do_coredump(signr, &scr->pt))
 					exit_code |= 0x80;
 				/* FALLTHRU */
 
@@ -542,39 +580,54 @@
 		}
 
 		if (restart) {
-			switch (pt->r8) {
+			switch (errno) {
 			      case ERESTARTSYS:
 				if ((ka->sa.sa_flags & SA_RESTART) == 0) {
 			      case ERESTARTNOHAND:
-					pt->r8 = EINTR;
-					/* note: pt->r10 is already -1 */
+#ifdef CONFIG_IA32_SUPPORT
+					if (IS_IA32_PROCESS(&scr->pt))
+						scr->pt.r8 = -EINTR;
+					else
+#endif
+					scr->pt.r8 = EINTR;
+					/* note: scr->pt.r10 is already -1 */
 					break;
 				}
 			      case ERESTARTNOINTR:
-				ia64_decrement_ip(pt);
+#ifdef CONFIG_IA32_SUPPORT
+				if (IS_IA32_PROCESS(&scr->pt)) {
+					scr->pt.r8 = scr->pt.r1;
+					scr->pt.cr_iip -= 2;
+				} else
+#endif
+				ia64_decrement_ip(&scr->pt);
 			}
 		}
 
 		/* Whee!  Actually deliver the signal.  If the
 		   delivery failed, we need to continue to iterate in
 		   this loop so we can deliver the SIGSEGV... */
-		if (handle_signal(signr, ka, &info, oldset, pt))
+		if (handle_signal(signr, ka, &info, oldset, scr))
 			return 1;
 	}
 
 	/* Did we come from a system call? */
 	if (restart) {
 		/* Restart the system call - no handlers present */
-		if (pt->r8 == ERESTARTNOHAND ||
-		    pt->r8 == ERESTARTSYS ||
-		    pt->r8 == ERESTARTNOINTR) {
+		if (errno == ERESTARTNOHAND || errno == ERESTARTSYS || errno == ERESTARTNOINTR) {
+#ifdef CONFIG_IA32_SUPPORT
+			if (IS_IA32_PROCESS(&scr->pt)) {
+				scr->pt.r8 = scr->pt.r1;
+				scr->pt.cr_iip -= 2;
+			} else
+#endif
 			/*
 			 * Note: the syscall number is in r15 which is
 			 * saved in pt_regs so all we need to do here
 			 * is adjust ip so that the "break"
 			 * instruction gets re-executed.
 			 */
-			ia64_decrement_ip(pt);
+			ia64_decrement_ip(&scr->pt);
 		}
 	}
 	return 0;