de-linting of .s files

@@ -21,13 +21,11 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
  
-#if !defined(lint)
 #include "assym.h"
-#endif /* !lint */
 #include <sys/asm_linkage.h>
 #include <sys/privregs.h>
 #include <sys/sun4asi.h>
 #include <sys/spitregs.h>
 #include <sys/cheetahregs.h>

@@ -115,13 +113,11 @@
  */
 /*
  * NOT is used for traps that just shouldn't happen.
  * It comes in both single and quadruple flavors.
  */
-#if !defined(lint)
         .global trap
-#endif /* !lint */
 #define NOT                     \
         TT_TRACE(trace_gen)     ;\
         set     trap, %g1       ;\
         rdpr    %tt, %g3        ;\
         ba,pt   %xcc, sys_trap  ;\

@@ -147,13 +143,11 @@
 
 /*
  * TRAP vectors to the trap() function.
  * It's main use is for user errors.
  */
-#if !defined(lint)
         .global trap
-#endif /* !lint */
 #define TRAP(arg)               \
         TT_TRACE(trace_gen)     ;\
         set     trap, %g1       ;\
         mov     arg, %g3        ;\
         ba,pt   %xcc, sys_trap  ;\

@@ -278,12 +272,10 @@
         clr %l4; clr %l5; clr %l6; clr %l7                      ;\
         clr %o0; clr %o1; clr %o2; clr %o3                      ;\
         clr %o4; clr %o5; clr %o6; clr %o7                      ;\
         retry; .align 128
 
-#if !defined(lint)
-
 /*
  * If we get an unresolved tlb miss while in a window handler, the fault
  * handler will resume execution at the last instruction of the window
  * hander, instead of delivering the fault to the kernel.  Spill handlers
  * use this to spill windows into the wbuf.

@@ -698,12 +690,10 @@
         retry                                                   ;\
         SKIP(31-19-TT_TRACE_L_INS)                              ;\
         ba,a,pt %xcc, fault_64bit_/**/tail                      ;\
         .empty
 
-#endif /* !lint */
-
 /*
  * SPILL_mixed spills either size window, depending on
  * whether %sp is even or odd, to a 32-bit address space.
  * This may only be used in conjunction with SPILL_32bit/
  * SPILL_64bit. New versions of SPILL_mixed_{tt1,asi} would be

@@ -843,11 +833,10 @@
         TT_TRACE(trace_gen)             ;\
         ba,pt   %xcc,.fp_exception      ;\
         nop                             ;\
         .align  32
 
-#if !defined(lint)
 /*
  * asynchronous traps at level 0 and level 1
  *
  * The first instruction must be a membar for UltraSPARC-III
  * to stop RED state entry if the store queue has many

@@ -869,12 +858,10 @@
 #define LABELED_BAD(table_name)         \
         .global table_name              ;\
 table_name:                             ;\
         BAD
 
-#endif /* !lint */
-
 /*
  * illegal instruction trap
  */
 #define ILLTRAP_INSTR                     \
         membar  #Sync                     ;\

@@ -1317,17 +1304,10 @@
         TRACE_NEXT(%g3, %g4, %g6)
 #else
 #define TRACE_TSBHIT(ttextra)
 #endif
 
-#if defined(lint)
-
-struct scb      trap_table;
-struct scb      scb;            /* trap_table/scb are the same object */
-
-#else /* lint */
-
 /*
  * =======================================================================
  *              SPARC V9 TRAP TABLE
  *
  * The trap table is divided into two halves: the first half is used when

@@ -3063,6 +3043,5 @@
         ENTRY_NP(syscall_wrapper)
         BRAND_CALLBACK(BRAND_CB_SYSCALL)
         SYSCALL_NOTT(syscall_trap)
         SET_SIZE(syscall_wrapper)
 
-#endif  /* lint */