PERFORCE change 29810 for review

[Marcel Moolenaar]

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

Change 29810 by marcel at 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,