Fix SCM ID's and remove tailing blanks.

8 files changed, 24 insertions, 27 deletions

diff --git a/sys/alpha/alpha/atomic.s b/sys/alpha/alpha/atomic.s
index 5f847e0..cab7f23 100644
--- a/sys/alpha/alpha/atomic.s
+++ b/sys/alpha/alpha/atomic.s
@@ -27,9 +27,9 @@
  */
 
 #include <machine/asm.h>
-	
+
 	.text
-	
+
 LEAF(atomic_set_8, 2)
 	bic	a0, 7, t1
 0:	ldq_l	t2, 0(t1)
diff --git a/sys/alpha/alpha/exception.s b/sys/alpha/alpha/exception.s
index b3bf1dc..31665c8 100644
--- a/sys/alpha/alpha/exception.s
+++ b/sys/alpha/alpha/exception.s
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ */
-
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
@@ -26,6 +23,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *	$NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $
+ * $FreeBSD$
  */
 
 #include <machine/asm.h>
diff --git a/sys/alpha/alpha/locore.s b/sys/alpha/alpha/locore.s
index 81884ad..db13d52 100644
--- a/sys/alpha/alpha/locore.s
+++ b/sys/alpha/alpha/locore.s
@@ -25,6 +25,7 @@
  *
  * $FreeBSD$
  */
+
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
@@ -143,7 +144,7 @@
 #ifdef SMP
 	/*
 	 * Secondary processors start executing here. They will have their
-	 * unique value set to point at the per-cpu structure and will 
+	 * unique value set to point at the per-cpu structure and will
 	 * be executing on their private idle stack.
 	 */
 	NESTED(smp_init_secondary_glue, 1, 0, ra, 0, 0)
diff --git a/sys/alpha/alpha/pal.s b/sys/alpha/alpha/pal.s
index 1f9545b..2b608f4 100644
--- a/sys/alpha/alpha/pal.s
+++ b/sys/alpha/alpha/pal.s
@@ -1,22 +1,19 @@
-/* $FreeBSD$ */
-/* $NetBSD: pal.s,v 1.12 1998/02/27 03:44:53 thorpej Exp $ */
-
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
  * All rights reserved.
  *
  * Author: Chris G. Demetriou
- * 
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
  * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
  *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
@@ -26,6 +23,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/prom_disp.s b/sys/alpha/alpha/prom_disp.s
index 0c548b4..23485a4 100644
--- a/sys/alpha/alpha/prom_disp.s
+++ b/sys/alpha/alpha/prom_disp.s
@@ -1,21 +1,19 @@
-/* $NetBSD: prom_disp.s,v 1.8 1997/11/03 04:22:03 ross Exp $ */
-
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
  *
  * Author: Chris G. Demetriou
- * 
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
  * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
  *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
diff --git a/sys/alpha/alpha/support.s b/sys/alpha/alpha/support.s
index 2a87327..6c42b81 100644
--- a/sys/alpha/alpha/support.s
+++ b/sys/alpha/alpha/support.s
@@ -25,6 +25,7 @@
  *
  * $FreeBSD$
  */
+
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/alpha/alpha/swtch.s b/sys/alpha/alpha/swtch.s
index 87471a3..0d244fc 100644
--- a/sys/alpha/alpha/swtch.s
+++ b/sys/alpha/alpha/swtch.s
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ */
-
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
@@ -26,6 +23,9 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ *	$NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $
+ * $FreeBSD$
  */
 
 #define _LOCORE
diff --git a/sys/alpha/include/asm.h b/sys/alpha/include/asm.h
index 2b4efe0..5b626ef 100644
--- a/sys/alpha/include/asm.h
+++ b/sys/alpha/include/asm.h
@@ -1,6 +1,3 @@
-/* $FreeBSD$ */
-/* From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp */
-
 /* 
  * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
  * All Rights Reserved.
@@ -24,6 +21,8 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *	From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp
+ * $FreeBSD$
  */
 
 /*