diff --git a/sys/arch/bebox/bebox/clock.c b/sys/arch/bebox/bebox/clock.c
index a59203773434..db46f543fbec 100644
--- a/sys/arch/bebox/bebox/clock.c
+++ b/sys/arch/bebox/bebox/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.12 2003/07/15 01:26:29 lukem Exp $	*/
+/*	$NetBSD: clock.c,v 1.13 2004/06/29 12:01:11 kleink Exp $	*/
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.12 2003/07/15 01:26:29 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.13 2004/06/29 12:01:11 kleink Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -159,7 +159,7 @@ delay(n)
 	tbl = tb;
 	asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
 		      "mftb %0; cmplw %0,%2; blt 1b; 2:"
-		      : "=r"(scratch) : "r"(tbh), "r"(tbl));
+		      : "=&r"(scratch) : "r"(tbh), "r"(tbl));
 }
 
 /*
diff --git a/sys/arch/mvmeppc/mvmeppc/clock.c b/sys/arch/mvmeppc/mvmeppc/clock.c
index 77b5b01b84c3..7249a6417f3d 100644
--- a/sys/arch/mvmeppc/mvmeppc/clock.c
+++ b/sys/arch/mvmeppc/mvmeppc/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.6 2003/07/18 21:41:23 thorpej Exp $	*/
+/*	$NetBSD: clock.c,v 1.7 2004/06/29 12:01:11 kleink Exp $	*/
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.6 2003/07/18 21:41:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.7 2004/06/29 12:01:11 kleink Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -165,7 +165,7 @@ delay(n)
 	tbl = tb;
 	asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
 		      "mftb %0; cmplw %0,%2; blt 1b; 2:"
-		      : "=r"(scratch) : "r"(tbh), "r"(tbl));
+		      : "=&r"(scratch) : "r"(tbh), "r"(tbl));
 }
 
 /*
diff --git a/sys/arch/ofppc/ofppc/clock.c b/sys/arch/ofppc/ofppc/clock.c
index b371447255fd..b695cfa0d7f7 100644
--- a/sys/arch/ofppc/ofppc/clock.c
+++ b/sys/arch/ofppc/ofppc/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.7 2003/07/15 02:46:32 lukem Exp $	*/
+/*	$NetBSD: clock.c,v 1.8 2004/06/29 12:01:11 kleink Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.7 2003/07/15 02:46:32 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.8 2004/06/29 12:01:11 kleink Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -169,7 +169,7 @@ delay(n)
 	tbl = tb;
 	asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
 		      "mftb %0; cmplw %0,%2; blt 1b; 2:"
-		      : "=r"(scratch) : "r"(tbh), "r"(tbl));
+		      : "=&r"(scratch) : "r"(tbh), "r"(tbl));
 }
 
 /*
diff --git a/sys/arch/pmppc/pmppc/clock.c b/sys/arch/pmppc/pmppc/clock.c
index fa7d7c7f7f86..21703b209fec 100644
--- a/sys/arch/pmppc/pmppc/clock.c
+++ b/sys/arch/pmppc/pmppc/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.4 2003/07/15 02:54:42 lukem Exp $	*/
+/*	$NetBSD: clock.c,v 1.5 2004/06/29 12:01:11 kleink Exp $	*/
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.4 2003/07/15 02:54:42 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.5 2004/06/29 12:01:11 kleink Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -170,7 +170,7 @@ delay(unsigned int n)
 	tbl = tb;
 	asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
 		      "mftb %0; cmplw %0,%2; blt 1b; 2:"
-		      : "=r"(scratch) : "r"(tbh), "r"(tbl));
+		      : "=&r"(scratch) : "r"(tbh), "r"(tbl));
 }
 
 /*
diff --git a/sys/arch/prep/prep/clock.c b/sys/arch/prep/prep/clock.c
index 92730f51ad06..9bf1a9d60b93 100644
--- a/sys/arch/prep/prep/clock.c
+++ b/sys/arch/prep/prep/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.8 2004/06/23 17:50:42 kleink Exp $	*/
+/*	$NetBSD: clock.c,v 1.9 2004/06/29 12:01:11 kleink Exp $	*/
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.8 2004/06/23 17:50:42 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.9 2004/06/29 12:01:11 kleink Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -285,7 +285,7 @@ delay(n)
 		}
 		asm volatile ("1: mfspr %0,%3; cmplw %0,%1; blt 1b; bgt 2f;"
 		    "mfspr %0,%4; cmplw %0,%2; blt 1b; 2:"
-		    : "=r"(scratch)
+		    : "=&r"(scratch)
 		    : "r"(rtc[0]), "r"(rtc[1]), "n"(SPR_RTCU_R), "n"(SPR_RTCL_R)
 		    : "cr0");
 	} else {
@@ -295,7 +295,7 @@ delay(n)
 		tbl = tb;
 		asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
 			      "mftb %0; cmplw %0,%2; blt 1b; 2:"
-			      : "=r"(scratch) : "r"(tbh), "r"(tbl)
+			      : "=&r"(scratch) : "r"(tbh), "r"(tbl)
 			      : "cr0");
 	}
 }
diff --git a/sys/arch/sandpoint/sandpoint/clock.c b/sys/arch/sandpoint/sandpoint/clock.c
index 3f7d34bfbb6c..3357d7a0cb8d 100644
--- a/sys/arch/sandpoint/sandpoint/clock.c
+++ b/sys/arch/sandpoint/sandpoint/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.5 2003/07/15 03:35:50 lukem Exp $	*/
+/*	$NetBSD: clock.c,v 1.6 2004/06/29 12:01:11 kleink Exp $	*/
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.5 2003/07/15 03:35:50 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.6 2004/06/29 12:01:11 kleink Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -162,7 +162,7 @@ delay(n)
 	tbl = tb;
 	asm volatile ("1: mftbu %0; cmplw %0,%1; blt 1b; bgt 2f;"
 		      "mftb %0; cmplw %0,%2; blt 1b; 2:"
-		      : "=r"(scratch) : "r"(tbh), "r"(tbl));
+		      : "=&r"(scratch) : "r"(tbh), "r"(tbl));
 }
 
 /*