From owner-p4-projects@FreeBSD.ORG  Tue Apr  8 15:38:18 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 748CD37B404; Tue,  8 Apr 2003 15:38:18 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1737E37B401
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 15:38:18 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B6A0A43F75
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 15:38:17 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h38McH0U097624
	for <perforce@freebsd.org>; Tue, 8 Apr 2003 15:38:17 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h38McHTJ097621
	for perforce@freebsd.org; Tue, 8 Apr 2003 15:38:17 -0700 (PDT)
Date: Tue, 8 Apr 2003 15:38:17 -0700 (PDT)
Message-Id: <200304082238.h38McHTJ097621@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28570 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Apr 2003 22:38:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=28570

Change 28570 by peter@peter_daintree on 2003/04/08 15:37:40

	Use iretq, not iret.  DOH!  this is why I was getting a GPF
	on interrupts.  The manual made me do it.
	Tidy some comments.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#17 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#17 (text+ko) ====

@@ -150,12 +150,8 @@
 calltrap:
 	FAKE_MCOUNT(btrap)		/* init "from" btrap -> calltrap */
 	call	trap
-
-	/*
-	 * Return via doreti to handle ASTs.
-	 */
 	MEXITCOUNT
-	jmp	doreti
+	jmp	doreti			/* Handle any pending ASTs */
 
 /*
  * Call gate entry for FreeBSD ELF and Linux/NetBSD syscall (int 0x80)
@@ -203,13 +199,8 @@
 	movl	$1,TD_CRITNEST(%rbx)
 	sti				/* enable interrupts */
 	call	fork_exit
-	/* cut from syscall */
-
-	/*
-	 * Return via doreti to handle ASTs.
-	 */
 	MEXITCOUNT
-	jmp	doreti
+	jmp	doreti			/* Handle any ASTs */
 
 
 /*
@@ -282,7 +273,7 @@
 	addq	$16,%rsp
 	.globl	doreti_iret
 doreti_iret:
-	iret
+	iretq
 
   	/*
 	 * doreti_iret_fault and friends.  Alternative return code for