[illumos-gate merge]

commit 5338faaac2dc1b2a16cb1a986233578834926ce0
    12423 ipf: variable may be used uninitialized
commit 9b0bb795691f70ec1b1796f6d15266f82d7a3200
    12349 clean up 32-bit assembly and lint

	Conflicts:
	usr/src/uts/sparc/v9/ml/lock_prim.s
	usr/src/uts/intel/ia32/ml/lock_prim.s
	usr/src/uts/intel/ia32/ml/copy.s
	usr/src/uts/intel/Makefile.rules
	usr/src/uts/i86pc/ml/syscall_asm_amd64.s
	usr/src/uts/i86pc/ml/syscall_asm.s [deleted upstream]

4 files changed, 0 insertions, 166 deletions

diff --git a/usr/src/uts/sun4u/io/panther_asm.s b/usr/src/uts/sun4u/io/panther_asm.s
index 1ec35c3f9d..9261089506 100644
--- a/usr/src/uts/sun4u/io/panther_asm.s
+++ b/usr/src/uts/sun4u/io/panther_asm.s
@@ -25,11 +25,7 @@
  * Assembly code support for the Cheetah+ module
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#if !defined(lint)
 #include "assym.h"
-#endif	/* lint */
 
 #include <sys/asm_linkage.h>
 #include <sys/mmu.h>
@@ -54,8 +50,6 @@
 #endif /* TRAPTRACE */
 
 
-#if !defined(lint)
-
 	.global retire_l2_start
 	.global retire_l2_end
 	.global unretire_l2_start
@@ -127,16 +121,6 @@
 	PN_ECACHE_REFLUSH_LINE(l2_idx_out, l3_idx_out, scr3, scr4)
 
 
-#endif	/* !lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-retire_l2(uint64_t tag_addr, uint64_t pattern)
-{return 0;}
-
-#else
 	.align 4096
 	ENTRY(retire_l2)
 retire_l2_start:
@@ -198,18 +182,6 @@ retire_l2_start:
 retire_l2_end:
 	SET_SIZE(retire_l2)
 
-#endif	/* lint */
-
-#if defined(lint)
-
-/*
- */
-/*ARGSUSED*/
-int
-unretire_l2(uint64_t tag_addr, uint64_t pattern)
-{return 0;}
-
-#else
 	ENTRY(unretire_l2)
 unretire_l2_start:
 
@@ -257,16 +229,6 @@ unretire_l2_start:
 unretire_l2_end:
 	SET_SIZE(unretire_l2)
 
-#endif	/* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-retire_l3(uint64_t tag_addr, uint64_t pattern)
-{return 0;}
-
-#else
 	ENTRY(retire_l3)
 retire_l3_start:
 
@@ -323,18 +285,6 @@ retire_l3_start:
 retire_l3_end:
 	SET_SIZE(retire_l3)
 
-#endif	/* lint */
-
-#if defined(lint)
-
-/*
- */
-/*ARGSUSED*/
-int
-unretire_l3(uint64_t tag_addr, uint64_t pattern)
-{return 0;}
-
-#else
 	ENTRY(unretire_l3)
 unretire_l3_start:
 
@@ -382,16 +332,6 @@ unretire_l3_start:
 unretire_l3_end:
 	SET_SIZE(unretire_l3)
 
-#endif	/* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-retire_l2_alternate(uint64_t tag_addr, uint64_t pattern)
-{return 0;}
-
-#else
 	.align 2048
 
 	ENTRY(retire_l2_alternate)
@@ -452,18 +392,6 @@ retire_l2_alternate(uint64_t tag_addr, uint64_t pattern)
 	 dec	%o5
 	SET_SIZE(retire_l2_alternate)
 
-#endif	/* lint */
-
-#if defined(lint)
-
-/*
- */
-/*ARGSUSED*/
-int
-unretire_l2_alternate(uint64_t tag_addr, uint64_t pattern)
-{return 0;}
-
-#else
 	ENTRY(unretire_l2_alternate)
 
 	! since we disable interrupts, we don't need to do kpreempt_disable()
@@ -509,16 +437,6 @@ unretire_l2_alternate(uint64_t tag_addr, uint64_t pattern)
 	 mov	%o5, %o0
 	SET_SIZE(unretire_l2_alternate)
 
-#endif	/* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-retire_l3_alternate(uint64_t tag_addr, uint64_t pattern)
-{return 0;}
-
-#else
 	ENTRY(retire_l3_alternate)
 
 	! since we disable interrupts, we don't need to do kpreempt_disable()
@@ -573,18 +491,6 @@ retire_l3_alternate(uint64_t tag_addr, uint64_t pattern)
 	 dec	%o5
 	SET_SIZE(retire_l3_alternate)
 
-#endif	/* lint */
-
-#if defined(lint)
-
-/*
- */
-/*ARGSUSED*/
-int
-unretire_l3_alternate(uint64_t tag_addr, uint64_t pattern)
-{return 0;}
-
-#else
 	ENTRY(unretire_l3_alternate)
 
 	! since we disable interrupts, we don't need to do kpreempt_disable()
@@ -630,16 +536,6 @@ unretire_l3_alternate(uint64_t tag_addr, uint64_t pattern)
 	 mov	%o5, %o0
 	SET_SIZE(unretire_l3_alternate)
 
-#endif	/* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-void
-get_ecache_dtags_tl1(uint64_t afar, ch_cpu_logout_t *clop)
-{ }
-
-#else
 	ENTRY(get_ecache_dtags_tl1)
 
 
@@ -654,15 +550,6 @@ get_ecache_dtags_tl1(uint64_t afar, ch_cpu_logout_t *clop)
 	retry
 	SET_SIZE(get_ecache_dtags_tl1)
 
-#endif	/* lint */
-
-#if defined(lint)
-/*ARGSUSED*/
-void
-get_l2_tag_tl1(uint64_t tag_addr, uint64_t tag_data_ptr)
-{ }
-
-#else
 	ENTRY(get_l2_tag_tl1)
 
 	/*
@@ -674,15 +561,6 @@ get_l2_tag_tl1(uint64_t tag_addr, uint64_t tag_data_ptr)
 	retry
 	SET_SIZE(get_l2_tag_tl1)
 
-#endif	/* lint */
-
-#if defined(lint)
-/*ARGSUSED*/
-void
-get_l3_tag_tl1(uint64_t tag_addr, uint64_t tag_data_ptr)
-{ }
-
-#else
 	ENTRY(get_l3_tag_tl1)
 
 	/*
@@ -694,5 +572,3 @@ get_l3_tag_tl1(uint64_t tag_addr, uint64_t tag_data_ptr)
 	retry
 	SET_SIZE(get_l3_tag_tl1)
 
-#endif	/* lint */
-
diff --git a/usr/src/uts/sun4u/io/pci/pci_asm.s b/usr/src/uts/sun4u/io/pci/pci_asm.s
index 654fc0a811..f6221e56b9 100644
--- a/usr/src/uts/sun4u/io/pci/pci_asm.s
+++ b/usr/src/uts/sun4u/io/pci/pci_asm.s
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Assembly language support for physical big/little endian access of pcitool
  * in the PCI drivers.
@@ -37,17 +35,6 @@
 
 /*LINTLIBRARY*/
 
-#if defined(lint)
-
-/*ARGSUSED*/
-int pci_do_phys_peek(size_t size, uint64_t paddr, uint64_t *value, int type)
-{ return (0); }
-
-int pci_do_phys_poke(size_t size, uint64_t paddr, uint64_t *value, int type)
-{ return (0); }
-
-#else /* lint */
-
 ! pci_do_phys_peek: Do physical address read.
 !
 ! %o0 is size in bytes - Must be 8, 4, 2 or 1.  Invalid sizes default to 1.
@@ -164,4 +151,3 @@ int pci_do_phys_poke(size_t size, uint64_t paddr, uint64_t *value, int type)
 	mov	%g0, %o0
 	SET_SIZE(pci_do_phys_poke)
  
-#endif
diff --git a/usr/src/uts/sun4u/io/pci/pcisch_asm.s b/usr/src/uts/sun4u/io/pci/pcisch_asm.s
index afb6a353ae..815a55a944 100644
--- a/usr/src/uts/sun4u/io/pci/pcisch_asm.s
+++ b/usr/src/uts/sun4u/io/pci/pcisch_asm.s
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/asm_linkage.h>
 #include <sys/machthread.h>
 #include <sys/fsr.h>
@@ -34,14 +32,6 @@
 
 #define	VIS_BLOCKSIZE	64
 
-#if defined(lint)
-
-void
-tomatillo_store_store_order()
-{}
-
-#else /* lint */
-
 	.seg    ".data"
 	.align  VIS_BLOCKSIZE
 	.type   sync_buf, #object
@@ -62,4 +52,3 @@ sync_buf:
 	membar  #Sync
 	SET_SIZE(tomatillo_store_store_order)
 
-#endif /* lint */
diff --git a/usr/src/uts/sun4u/io/px/px_asm_4u.s b/usr/src/uts/sun4u/io/px/px_asm_4u.s
index 6fbae19cf4..13756c8793 100644
--- a/usr/src/uts/sun4u/io/px/px_asm_4u.s
+++ b/usr/src/uts/sun4u/io/px/px_asm_4u.s
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Assembly language support for px driver
  */
@@ -36,20 +34,6 @@
 
 /*LINTLIBRARY*/
 
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-px_phys_peek_4u(size_t size, uint64_t paddr, uint64_t *value, int type)
-{ return (0); }
-
-/*ARGSUSED*/
-int
-px_phys_poke_4u(size_t size, uint64_t paddr, uint64_t *value, int type)
-{ return (0); }
-
-#else /* lint */
-
 ! px_phys_peek_4u: Do physical address read.
 !
 ! %o0 is size in bytes - Must be 8, 4, 2 or 1.  Invalid sizes default to 1.
@@ -167,4 +151,3 @@ px_phys_poke_4u(size_t size, uint64_t paddr, uint64_t *value, int type)
 	mov	%g0, %o0
 	SET_SIZE(px_phys_poke_4u)
  
-#endif