Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/vax/boot/xxboot/bootxx.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/vax/boot/xxboot/bootxx.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.14.8.2
diff -u -p -r1.14 -r1.14.8.2
--- src/sys/arch/vax/boot/xxboot/bootxx.c	2000/11/09 01:54:20	1.14
+++ src/sys/arch/vax/boot/xxboot/bootxx.c	2002/04/17 00:04:37	1.14.8.2
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.14 2000/11/09 01:54:20 matt Exp $ */
+/* $NetBSD: bootxx.c,v 1.14.8.2 2002/04/17 00:04:37 nathanw Exp $ */
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -43,6 +43,7 @@
 #include "lib/libsa/stand.h"
 #include "lib/libsa/ufs.h"
 #include "lib/libsa/cd9660.h"
+#include "lib/libsa/ustarfs.h"
 
 #include "lib/libkern/libkern.h"
 
@@ -188,9 +189,13 @@ die:
  * - Must be the first file on tape.
  */
 struct fs_ops file_system[] = {
+#ifdef NEED_UFS
 	{ ufs_open, 0, ufs_read, 0, 0, ufs_stat },
+#endif
+#ifdef NEED_CD9660
 	{ cd9660_open, 0, cd9660_read, 0, 0, cd9660_stat },
-#if 0
+#endif
+#ifdef NEED_USTARFS
 	{ ustarfs_open, 0, ustarfs_read, 0, 0, ustarfs_stat },
 #endif
 };
@@ -343,7 +348,11 @@ hpread(int bn)
 	/*
 	 * Avoid four subroutine calls by using hardware division.
 	 */
-	asm("clrl r1;movl %3,r0;ediv %4,r0,%0,%1;movl %1,r0;ediv %5,r0,%2,%1"
+	asm("clrl %%r1;"
+	    "movl %3,%%r0;"
+	    "ediv %4,%%r0,%0,%1;"
+	    "movl %1,%%r0;"
+	    "ediv %5,%%r0,%2,%1"
 	    : "=g"(cn),"=g"(sn),"=g"(tn)
 	    : "g"(bn),"g"(dp->d_secpercyl),"g"(dp->d_nsectors)
 	    : "r0","r1","cc");