From owner-p4-projects@FreeBSD.ORG  Sat Apr 26 12:59:09 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4F05737B404; Sat, 26 Apr 2003 12:59:09 -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 DFC1837B401
	for <perforce@freebsd.org>; Sat, 26 Apr 2003 12:59:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 377F243FB1
	for <perforce@freebsd.org>; Sat, 26 Apr 2003 12:59:08 -0700 (PDT)
	(envelope-from marcel@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 h3QJx70U055693
	for <perforce@freebsd.org>; Sat, 26 Apr 2003 12:59:07 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3QJx7fp055687
	for perforce@freebsd.org; Sat, 26 Apr 2003 12:59:07 -0700 (PDT)
Date: Sat, 26 Apr 2003 12:59:07 -0700 (PDT)
Message-Id: <200304261959.h3QJx7fp055687@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 29810 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: Sat, 26 Apr 2003 19:59:10 -0000

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

Change 29810 by marcel@marcel_nfs on 2003/04/26 12:58:17

	ntpd(8) has an unaligned memory reference, but we're not
	yet fixing it up, as it may involve unwinding and the likes.
	Give a SIGBUS instead of panicing :-)

Affected files ...

.. //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#15 edit

Differences ...

==== //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#15 (text+ko) ====

@@ -335,9 +335,8 @@
 	struct proc *p;
 	struct thread *td;
 	u_int64_t ucode;
-	int i;
+	int i, user;
 	u_int sticks;
-	int user;
 
 	user = ((framep->tf_special.psr & IA64_PSR_CPL) == IA64_PSR_CPL_USER);
 
@@ -376,17 +375,19 @@
 		 * signalling is appropriate (based on system-wide
 		 * and per-process unaligned-access-handling flags).
 		 */
-#if 0
 		if (user) {
+#if NOTYET
 			mtx_lock(&Giant);
 			i = unaligned_fixup(framep, td);
 			mtx_unlock(&Giant);
 			if (i == 0)
 				goto out;
+#else
+			i = SIGBUS;
+#endif
 			ucode = framep->tf_special.ifa;	/* VA */
 			break;
 		}
-#endif
 
 		/*
 		 * Unaligned access from kernel mode is always an error,