From owner-svn-src-all@FreeBSD.ORG  Sun Mar 16 21:57:06 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3A5C9B34;
 Sun, 16 Mar 2014 21:57:06 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2730C99E;
 Sun, 16 Mar 2014 21:57:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2GLv6AP085765;
 Sun, 16 Mar 2014 21:57:06 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2GLv5N4085763;
 Sun, 16 Mar 2014 21:57:05 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201403162157.s2GLv5N4085763@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 16 Mar 2014 21:57:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263253 - head/sys/ia64/ia64
X-SVN-Group: head
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.17
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: Sun, 16 Mar 2014 21:57:06 -0000

Author: marcel
Date: Sun Mar 16 21:57:05 2014
New Revision: 263253
URL: http://svnweb.freebsd.org/changeset/base/263253

Log:
  Don't use the ITC as the faulting address for external interrupts.
  We only use it for tracing and the KTR infrastructure will use ITC
  for the time-stamp.

Modified:
  head/sys/ia64/ia64/exception.S
  head/sys/ia64/ia64/interrupt.c

Modified: head/sys/ia64/ia64/exception.S
==============================================================================
--- head/sys/ia64/ia64/exception.S	Sun Mar 16 21:05:00 2014	(r263252)
+++ head/sys/ia64/ia64/exception.S	Sun Mar 16 21:57:05 2014	(r263253)
@@ -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: head/sys/ia64/ia64/interrupt.c
==============================================================================
--- head/sys/ia64/ia64/interrupt.c	Sun Mar 16 21:05:00 2014	(r263252)
+++ head/sys/ia64/ia64/interrupt.c	Sun Mar 16 21:57:05 2014	(r263253)
@@ -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();