6368594 extra backslash in MSROW_BIG2SMALL, MSROW_SMALL2BIG

6368599 extra backslash in SEMA_BLOCK
6368838 extra backslash in sfmmu macros
Contributed by Scott Heimer.

4 files changed, 12 insertions, 14 deletions

diff --git a/usr/src/uts/common/os/semaphore.c b/usr/src/uts/common/os/semaphore.c
index 101adfdd00..7f7e6235e3 100644
--- a/usr/src/uts/common/os/semaphore.c
+++ b/usr/src/uts/common/os/semaphore.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -92,7 +91,7 @@ static sobj_ops_t sema_sobj_ops = {
 		*tpp = curthread;					\
 		curthread->t_link = tp;					\
 		ASSERT(s->s_slpq != NULL);				\
-	}								\
+	}
 
 /* ARGSUSED */
 void
diff --git a/usr/src/uts/common/sys/lvm/md_convert.h b/usr/src/uts/common/sys/lvm/md_convert.h
index 45ecc6a46b..17da344430 100644
--- a/usr/src/uts/common/sys/lvm/md_convert.h
+++ b/usr/src/uts/common/sys/lvm/md_convert.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2001, 2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -185,7 +184,7 @@ extern void dump_mr_unit32_od(mr_unit32_od_t *);
 	small_mdr->un_ncomp	 = big_mdr->un_ncomp;			\
 	small_mdr->un_blocks	 = (daddr32_t)big_mdr->un_blocks;	\
 	small_mdr->un_cum_blocks = (daddr32_t)big_mdr->un_cum_blocks;	\
-	small_mdr->un_interlace	 = (daddr32_t)big_mdr->un_interlace;	\
+	small_mdr->un_interlace	 = (daddr32_t)big_mdr->un_interlace;
 
 /* ms_row -> ms_row32_od */
 #define	MSROW_SMALL2BIG(small_mdr, big_mdr)				\
@@ -193,7 +192,7 @@ extern void dump_mr_unit32_od(mr_unit32_od_t *);
 	big_mdr->un_ncomp	= small_mdr->un_ncomp;			\
 	big_mdr->un_blocks	= (diskaddr_t)small_mdr->un_blocks;	\
 	big_mdr->un_cum_blocks	= (diskaddr_t)small_mdr->un_cum_blocks;	\
-	big_mdr->un_interlace	= (diskaddr_t)small_mdr->un_interlace;	\
+	big_mdr->un_interlace	= (diskaddr_t)small_mdr->un_interlace;
 
 
 
diff --git a/usr/src/uts/sfmmu/vm/hat_sfmmu.h b/usr/src/uts/sfmmu/vm/hat_sfmmu.h
index 9f08f93e77..1d11998521 100644
--- a/usr/src/uts/sfmmu/vm/hat_sfmmu.h
+++ b/usr/src/uts/sfmmu/vm/hat_sfmmu.h
@@ -988,7 +988,7 @@ struct hmehash_bucket {
 #define	HASHADDR_MASK(hashno)	TTE_PAGEMASK(hashno)
 
 #define	HME_HASH_SHIFT(ttesz)						\
-	((ttesz == TTE8K)? HBLK_RANGE_SHIFT : TTE_PAGE_SHIFT(ttesz))	\
+	((ttesz == TTE8K)? HBLK_RANGE_SHIFT : TTE_PAGE_SHIFT(ttesz))
 
 #define	HME_HASH_ADDR(vaddr, hmeshift)					\
 	((caddr_t)(((uintptr_t)(vaddr) >> (hmeshift)) << (hmeshift)))
@@ -1065,7 +1065,7 @@ struct hmehash_bucket {
 			/* found hme_blk */				\
 			break;						\
 		}							\
-	}								\
+	}
 
 
 #define	SFMMU_HASH_LOCK(hmebp)						\
diff --git a/usr/src/uts/sun4v/vm/mach_sfmmu.h b/usr/src/uts/sun4v/vm/mach_sfmmu.h
index f2165c21c8..e91c4cdd0f 100644
--- a/usr/src/uts/sun4v/vm/mach_sfmmu.h
+++ b/usr/src/uts/sun4v/vm/mach_sfmmu.h
@@ -378,7 +378,7 @@ label/**/2:								\
 	ldx	[tsbinfo + TSBINFO_PADDR], tsbreg;		\
 	lduh	[tsbinfo + TSBINFO_SZCODE], tmp1;		\
 	and	tmp1, TSB_SOFTSZ_MASK, tmp1;			\
-	or	tsbreg, tmp1, tsbreg;				\
+	or	tsbreg, tmp1, tsbreg;
 
 
 /*