From owner-svn-src-all@FreeBSD.ORG  Wed Jul  2 23:33:07 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D111476C;
 Wed,  2 Jul 2014 23:33:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BE3C52F08;
 Wed,  2 Jul 2014 23:33:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62NX74f066553;
 Wed, 2 Jul 2014 23:33:07 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62NX7fD066542;
 Wed, 2 Jul 2014 23:33:07 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201407022333.s62NX7fD066542@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 2 Jul 2014 23:33:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r268198 - stable/10/sys/ia64/ia64
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jul 2014 23:33:07 -0000

Author: marcel
Date: Wed Jul  2 23:33:07 2014
New Revision: 268198
URL: http://svnweb.freebsd.org/changeset/base/268198

Log:
  MFC r263253: Don't use the ITC as the faulting address for external
  interrupts.

Modified:
  stable/10/sys/ia64/ia64/exception.S
  stable/10/sys/ia64/ia64/interrupt.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ia64/ia64/exception.S
==============================================================================
--- stable/10/sys/ia64/ia64/exception.S	Wed Jul  2 23:32:05 2014	(r268197)
+++ stable/10/sys/ia64/ia64/exception.S	Wed Jul  2 23:33:07 2014	(r268198)
@@ -1388,7 +1388,7 @@ IVT_END(Break_Instruction)
 
 IVT_ENTRY(External_Interrupt, 0x3000)
 {	.mib
-	mov		r17=ar.itc	// Put the ITC in the trapframe.
+	mov		r17=0
 	mov		r16=ip
 	br.sptk		exception_save
 	;;

Modified: stable/10/sys/ia64/ia64/interrupt.c
==============================================================================
--- stable/10/sys/ia64/ia64/interrupt.c	Wed Jul  2 23:32:05 2014	(r268197)
+++ stable/10/sys/ia64/ia64/interrupt.c	Wed Jul  2 23:33:07 2014	(r268198)
@@ -316,8 +316,8 @@ ia64_handle_intr(struct trapframe *tf)
 
 	critical_enter();
 	do {
-		CTR2(KTR_INTR, "INTR: ITC=%u, XIV=%u",
-		    (u_int)tf->tf_special.ifa, xiv);
+		CTR3(KTR_INTR, "INTR: XIV=%u, #%u: frame=%p", xiv,
+		    PCPU_GET(cnt.v_intr), tf);
 		if (!(ia64_handler[xiv])(td, xiv, tf)) {
 			ia64_set_eoi(0);
 			ia64_srlz_d();