Print this page
de-linting of .s files

@@ -33,21 +33,10 @@
  * from this file into the respective ../`arch -k`/subr.s file.
  * Or, if you want to be really nice, move them to a file whose
  * name has something to do with the routine you are moving.
  */
 
-#if defined(lint)
-#include <sys/types.h>
-#include <sys/scb.h>
-#include <sys/systm.h>
-#include <sys/regset.h>
-#include <sys/sunddi.h>
-#include <sys/lockstat.h>
-#include <sys/dtrace.h>
-#include <sys/ftrace.h>
-#endif  /* lint */
-
 #include <sys/asm_linkage.h>
 #include <sys/privregs.h>
 #include <sys/machparam.h>      /* To get SYSBASE and PAGESIZE */
 #include <sys/machthread.h>
 #include <sys/clock.h>

@@ -56,11 +45,10 @@
 #include <sys/dditypes.h>
 #include <sys/panic.h>
 #include <sys/machlock.h>
 #include <sys/ontrap.h>
 
-#if !defined(lint)
 #include "assym.h"
 
         .seg    ".text"
         .align  4
 

@@ -132,12 +120,10 @@
         rdpr    %pil, %o1;              /* get current PIL */           \
         wrpr    %g0, level, %pil;                                       \
         retl;                                                           \
         mov     %o1, %o0                /* return old PIL */
 
-#endif  /* lint */
-
         /*
          * Berkley 4.3 introduced symbolically named interrupt levels
          * as a way deal with priority in a machine independent fashion.
          * Numbered priorities are machine specific, and should be
          * discouraged where possible.

@@ -176,22 +162,10 @@
          *      splzs()         Because this is used at boot time to lower our
          *                      priority, to allow the PROM to poll the uart.
          *      spl0()          Used to lower priority to 0.
          */
 
-#if defined(lint)
-
-int spl0(void)          { return (0); }
-int spl6(void)          { return (0); }
-int spl7(void)          { return (0); }
-int spl8(void)          { return (0); }
-int splhi(void)         { return (0); }
-int splhigh(void)       { return (0); }
-int splzs(void)         { return (0); }
-
-#else   /* lint */
-
         /* locks out all interrupts, including memory errors */
         ENTRY(spl8)
         SETPRI_HIGH(15)
         SET_SIZE(spl8)
 

@@ -222,34 +196,21 @@
         /* allow all interrupts */
         ENTRY(spl0)
         SETPRI(0)
         SET_SIZE(spl0)
 
-#endif  /* lint */
-
 /*
  * splx - set PIL back to that indicated by the old %pil passed as an argument,
  * or to the CPU's base priority, whichever is higher.
  */
 
-#if defined(lint)
-
-/* ARGSUSED */
-void
-splx(int level)
-{}
-
-#else   /* lint */
-
         ENTRY(splx)
         ALTENTRY(i_ddi_splx)
         SETPRI(%o0)             /* set PIL */
         SET_SIZE(i_ddi_splx)
         SET_SIZE(splx)
 
-#endif  /* level */
-
 /*
  * splr()
  *
  * splr is like splx but will only raise the priority and never drop it
  * Be careful not to set priority lower than CPU->cpu_base_pri,

@@ -256,40 +217,21 @@
  * even though it seems we're raising the priority, it could be set higher
  * at any time by an interrupt routine, so we must block interrupts and
  * look at CPU->cpu_base_pri.
  */
 
-#if defined(lint)
-
-/* ARGSUSED */
-int
-splr(int level)
-{ return (0); }
-
-#else   /* lint */
         ENTRY(splr)
         RAISE(%o0)
         SET_SIZE(splr)
 
-#endif  /* lint */
-
 /*
  * on_fault()
  * Catch lofault faults. Like setjmp except it returns one
  * if code following causes uncorrectable fault. Turned off
  * by calling no_fault().
  */
 
-#if defined(lint)
-
-/* ARGSUSED */
-int
-on_fault(label_t *ljb)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(on_fault)
         membar  #Sync                   ! sync error barrier (see copy.s)
         stn     %o0, [THREAD_REG + T_ONFAULT]
         set     catch_fault, %o1
         b       setjmp                  ! let setjmp do the rest

@@ -302,74 +244,45 @@
         stn     %g0, [THREAD_REG + T_ONFAULT]   ! turn off onfault
         b       longjmp                 ! let longjmp do the rest
         stn     %g0, [THREAD_REG + T_LOFAULT]   ! turn off lofault
         SET_SIZE(on_fault)
 
-#endif  /* lint */
-
 /*
  * no_fault()
  * turn off fault catching.
  */
 
-#if defined(lint)
-
-void
-no_fault(void)
-{}
-
-#else   /* lint */
-
         ENTRY(no_fault)
         membar  #Sync                           ! sync error barrier
         stn     %g0, [THREAD_REG + T_ONFAULT]
         retl
         stn     %g0, [THREAD_REG + T_LOFAULT]   ! turn off lofault
         SET_SIZE(no_fault)
 
-#endif  /* lint */
-
 /*
  * Default trampoline code for on_trap() (see <sys/ontrap.h>).  On sparcv9,
  * the trap code will complete trap processing but reset the return %pc to
  * ot_trampoline, which will by default be set to the address of this code.
  * We longjmp(&curthread->t_ontrap->ot_jmpbuf) to return back to on_trap().
  */
-#if defined(lint)
 
-void 
-on_trap_trampoline(void)
-{}
-
-#else   /* lint */
-
         ENTRY(on_trap_trampoline)
         ldn     [THREAD_REG + T_ONTRAP], %o0    
         b       longjmp                 
         add     %o0, OT_JMPBUF, %o0
         SET_SIZE(on_trap_trampoline)
 
-#endif  /* lint */
-
 /*
  * Push a new element on to the t_ontrap stack.  Refer to <sys/ontrap.h> for
  * more information about the on_trap() mechanism.  If the on_trap_data is the
  * same as the topmost stack element, we just modify that element.
  * On UltraSPARC, we need to issue a membar #Sync before modifying t_ontrap.
  * The issue barrier is defined to force all deferred errors to complete before
  * we go any further.  We want these errors to be processed before we modify
  * our current error protection.
  */
-#if defined(lint)
 
-/*ARGSUSED*/
-int
-on_trap(on_trap_data_t *otp, uint_t prot)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(on_trap)
         membar  #Sync                           ! force error barrier
         sth     %o1, [%o0 + OT_PROT]            ! ot_prot = prot
         sth     %g0, [%o0 + OT_TRAP]            ! ot_trap = 0
         set     on_trap_trampoline, %o2         ! %o2 = &on_trap_trampoline

@@ -386,45 +299,23 @@
 
 0:      b       setjmp                          ! let setjmp do the rest
         add     %o0, OT_JMPBUF, %o0             ! %o0 = &ot_jmpbuf
         SET_SIZE(on_trap)
 
-#endif  /* lint */
-
 /*
  * Setjmp and longjmp implement non-local gotos using state vectors
  * type label_t.
  */
 
-#if defined(lint)
-
-/* ARGSUSED */
-int
-setjmp(label_t *lp)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(setjmp)
         stn     %o7, [%o0 + L_PC]       ! save return address
         stn     %sp, [%o0 + L_SP]       ! save stack ptr
         retl
         clr     %o0                     ! return 0
         SET_SIZE(setjmp)
 
-#endif  /* lint */
 
-
-#if defined(lint)
-
-/* ARGSUSED */
-void
-longjmp(label_t *lp)
-{}
-
-#else   /* lint */
-
         ENTRY(longjmp)
         !
         ! The following save is required so that an extra register
         ! window is flushed.  Flushw flushes nwindows-2
         ! register windows.  If setjmp and longjmp are called from

@@ -440,27 +331,16 @@
         ldn     [%i0 + L_SP], %fp       ! restore sp for dest on foreign stack
         ret                             ! return 1
         restore %g0, 1, %o0             ! takes underflow, switches stacks
         SET_SIZE(longjmp)
 
-#endif  /* lint */
-
 /*
  * movtuc(length, from, to, table)
  *
  * VAX movtuc instruction (sort of).
  */
 
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-movtuc(size_t length, u_char *from, u_char *to, u_char table[])
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(movtuc)
         tst     %o0
         ble,pn  %ncc, 2f                ! check length
         clr     %o4
 

@@ -481,27 +361,16 @@
 2:
         retl                            ! return (bytes moved)
         mov     %o4, %o0
         SET_SIZE(movtuc)
 
-#endif  /* lint */
-
 /*
  * scanc(length, string, table, mask)
  *
  * VAX scanc instruction.
  */
 
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-scanc(size_t length, u_char *string, u_char table[], u_char mask)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(scanc)
         tst     %o0     
         ble,pn  %ncc, 1f                ! check length
         clr     %o4
 0:

@@ -515,105 +384,55 @@
 1:
         retl                            ! return(length - index)
         sub     %o0, %o4, %o0
         SET_SIZE(scanc)
 
-#endif  /* lint */
-
 /*
  * if a() calls b() calls caller(),
  * caller() returns return address in a().
  */
 
-#if defined(lint)
-
-caddr_t
-caller(void)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(caller)
         retl
         mov     %i7, %o0
         SET_SIZE(caller)
 
-#endif  /* lint */
-
 /*
  * if a() calls callee(), callee() returns the
  * return address in a();
  */
 
-#if defined(lint)
-
-caddr_t
-callee(void)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(callee)
         retl
         mov     %o7, %o0
         SET_SIZE(callee)
 
-#endif  /* lint */
-
 /*
  * return the current frame pointer
  */
 
-#if defined(lint)
-
-greg_t
-getfp(void)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(getfp)
         retl
         mov     %fp, %o0
         SET_SIZE(getfp)
 
-#endif  /* lint */
-
 /*
  * Get vector base register
  */
 
-#if defined(lint)
-
-greg_t
-gettbr(void)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(gettbr)
         retl
         mov     %tbr, %o0
         SET_SIZE(gettbr)
 
-#endif  /* lint */
-
 /*
  * Get processor state register, V9 faked to look like V8.
  * Note: does not provide ccr.xcc and provides FPRS.FEF instead of
  * PSTATE.PEF, because PSTATE.PEF is always on in order to allow the
  * libc_psr memcpy routines to run without hitting the fp_disabled trap.
  */
 
-#if defined(lint)
-
-greg_t
-getpsr(void)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(getpsr)
         rd      %ccr, %o1                       ! get ccr
         sll     %o1, PSR_ICC_SHIFT, %o0         ! move icc to V8 psr.icc
         rd      %fprs, %o1                      ! get fprs
         and     %o1, FPRS_FEF, %o1              ! mask out dirty upper/lower

@@ -622,118 +441,64 @@
         set     V9_PSR_IMPLVER, %o1             ! SI assigned impl/ver: 0xef
         retl
         or      %o0, %o1, %o0                   ! or into psr.impl/ver
         SET_SIZE(getpsr)
 
-#endif  /* lint */
-
 /*
  * Get current processor interrupt level
  */
 
-#if defined(lint)
-
-u_int
-getpil(void)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(getpil)
         retl
         rdpr    %pil, %o0
         SET_SIZE(getpil)
 
-#endif  /* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-void
-setpil(u_int pil)
-{}
-
-#else   /* lint */
-
         ENTRY(setpil)
         retl
         wrpr    %g0, %o0, %pil
         SET_SIZE(setpil)
 
-#endif  /* lint */
 
-
 /*
  * _insque(entryp, predp)
  *
  * Insert entryp after predp in a doubly linked list.
  */
 
-#if defined(lint)
-
-/*ARGSUSED*/
-void
-_insque(caddr_t entryp, caddr_t predp)
-{}
-
-#else   /* lint */
-
         ENTRY(_insque)
         ldn     [%o1], %g1              ! predp->forw
         stn     %o1, [%o0 + CPTRSIZE]   ! entryp->back = predp
         stn     %g1, [%o0]              ! entryp->forw = predp->forw
         stn     %o0, [%o1]              ! predp->forw = entryp
         retl
         stn     %o0, [%g1 + CPTRSIZE]   ! predp->forw->back = entryp
         SET_SIZE(_insque)
 
-#endif  /* lint */
-
 /*
  * _remque(entryp)
  *
  * Remove entryp from a doubly linked list
  */
 
-#if defined(lint)
-
-/*ARGSUSED*/
-void
-_remque(caddr_t entryp)
-{}
-
-#else   /* lint */
-
         ENTRY(_remque)
         ldn     [%o0], %g1              ! entryp->forw
         ldn     [%o0 + CPTRSIZE], %g2   ! entryp->back
         stn     %g1, [%g2]              ! entryp->back->forw = entryp->forw
         retl
         stn     %g2, [%g1 + CPTRSIZE]   ! entryp->forw->back = entryp->back
         SET_SIZE(_remque)
 
-#endif  /* lint */
 
-
 /*
  * strlen(str)
  *
  * Returns the number of non-NULL bytes in string argument.
  *
  * XXX -  why is this here, rather than the traditional file?
  *        why does it have local labels which don't start with a `.'?
  */
 
-#if defined(lint)
-
-/*ARGSUSED*/
-size_t
-strlen(const char *str)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(strlen)
         mov     %o0, %o1
         andcc   %o1, 3, %o3             ! is src word aligned
         bz      $nowalgnd
         clr     %o0                     ! length of non-zero bytes

@@ -814,95 +579,14 @@
 $done3:
         retl
         inc     3, %o0
         SET_SIZE(strlen)
 
-#endif  /* lint */
-
 /*
  * Provide a C callable interface to the membar instruction.
  */
 
-#if defined(lint)
-
-void
-membar_ldld(void)
-{}
-
-void
-membar_stld(void)
-{}
-
-void
-membar_ldst(void)
-{}
-
-void
-membar_stst(void)
-{}
-
-void
-membar_ldld_ldst(void)
-{}
-
-void
-membar_ldld_stld(void)
-{}
-
-void
-membar_ldld_stst(void)
-{}
-
-void
-membar_stld_ldld(void)
-{}
-
-void
-membar_stld_ldst(void)
-{}
-
-void
-membar_stld_stst(void)
-{}
-
-void
-membar_ldst_ldld(void)
-{}
-
-void
-membar_ldst_stld(void)
-{}
-
-void
-membar_ldst_stst(void)
-{}
-
-void
-membar_stst_ldld(void)
-{}
-
-void
-membar_stst_stld(void)
-{}
-
-void
-membar_stst_ldst(void)
-{}
-
-void
-membar_lookaside(void)
-{}
-
-void
-membar_memissue(void)
-{}
-
-void
-membar_sync(void)
-{}
-
-#else
         ENTRY(membar_ldld)
         retl
         membar  #LoadLoad
         SET_SIZE(membar_ldld)
 

@@ -976,47 +660,11 @@
         ENTRY(membar_sync)
         retl
         membar  #Sync
         SET_SIZE(membar_sync)
 
-#endif  /* lint */
 
-
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-fuword64(const void *addr, uint64_t *dst)
-{ return (0); }
-
-/*ARGSUSED*/
-int
-fuword32(const void *addr, uint32_t *dst)
-{ return (0); }
-
-/*ARGSUSED*/
-int
-fuword16(const void *addr, uint16_t *dst)
-{ return (0); }
-
-/*ARGSUSED*/
-int
-fuword8(const void *addr, uint8_t *dst)
-{ return (0); }
-
-/*ARGSUSED*/
-int
-dtrace_ft_fuword64(const void *addr, uint64_t *dst)
-{ return (0); }
-
-/*ARGSUSED*/
-int
-dtrace_ft_fuword32(const void *addr, uint32_t *dst)
-{ return (0); }
-
-#else   /* lint */
-
 /*
  * Since all of the fuword() variants are so similar, we have a macro to spit
  * them out.
  */
 

@@ -1050,37 +698,11 @@
         FUWORD(fuword64, ldxa, stx, CP_FUWORD64)
         FUWORD(fuword32, lda, st, CP_FUWORD32)
         FUWORD(fuword16, lduha, sth, CP_FUWORD16)
         FUWORD(fuword8, lduba, stb, CP_FUWORD8)
 
-#endif  /* lint */
 
-
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-suword64(void *addr, uint64_t value)
-{ return (0); }
-
-/*ARGSUSED*/
-int
-suword32(void *addr, uint32_t value)
-{ return (0); }
-
-/*ARGSUSED*/
-int
-suword16(void *addr, uint16_t value)
-{ return (0); }
-
-/*ARGSUSED*/
-int
-suword8(void *addr, uint8_t value)
-{ return (0); }
-
-#else   /* lint */
-
 /*
  * Since all of the suword() variants are so similar, we have a macro to spit
  * them out.
  */
 

@@ -1113,36 +735,10 @@
         SUWORD(suword64, stxa, CP_SUWORD64)
         SUWORD(suword32, sta, CP_SUWORD32)
         SUWORD(suword16, stha, CP_SUWORD16)
         SUWORD(suword8, stba, CP_SUWORD8)
 
-#endif  /* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-void
-fuword8_noerr(const void *addr, uint8_t *dst)
-{}
-
-/*ARGSUSED*/
-void
-fuword16_noerr(const void *addr, uint16_t *dst)
-{}
-
-/*ARGSUSED*/
-void
-fuword32_noerr(const void *addr, uint32_t *dst)
-{}
-
-/*ARGSUSED*/
-void
-fuword64_noerr(const void *addr, uint64_t *dst)
-{}
-
-#else   /* lint */
-
         ENTRY(fuword8_noerr)
         lduba   [%o0]ASI_USER, %o0      
         retl
         stb     %o0, [%o1]
         SET_SIZE(fuword8_noerr)

@@ -1163,36 +759,10 @@
         ldxa    [%o0]ASI_USER, %o0
         retl
         stx     %o0, [%o1]
         SET_SIZE(fuword64_noerr)
 
-#endif  /* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-void
-suword8_noerr(void *addr, uint8_t value)
-{}
-
-/*ARGSUSED*/
-void
-suword16_noerr(void *addr, uint16_t value)
-{}
-
-/*ARGSUSED*/
-void
-suword32_noerr(void *addr, uint32_t value)
-{}
-
-/*ARGSUSED*/
-void
-suword64_noerr(void *addr, uint64_t value)
-{}
-
-#else   /* lint */
-
         ENTRY(suword8_noerr)
         retl
         stba    %o1, [%o0]ASI_USER
         SET_SIZE(suword8_noerr)
 

@@ -1209,46 +779,10 @@
         ENTRY(suword64_noerr)
         retl
         stxa    %o1, [%o0]ASI_USER
         SET_SIZE(suword64_noerr)
 
-#endif  /* lint */
-
-#if defined(__lint)
-
-/*ARGSUSED*/
-int
-subyte(void *addr, uchar_t value)
-{ return (0); }
-
-/*ARGSUSED*/
-void
-subyte_noerr(void *addr, uchar_t value)
-{}
-
-/*ARGSUSED*/
-int
-fulword(const void *addr, ulong_t *valuep)
-{ return (0); }
-
-/*ARGSUSED*/
-void
-fulword_noerr(const void *addr, ulong_t *valuep)
-{}
-
-/*ARGSUSED*/
-int
-sulword(void *addr, ulong_t valuep)
-{ return (0); }
-
-/*ARGSUSED*/
-void
-sulword_noerr(void *addr, ulong_t valuep)
-{}
-
-#else
-
         .weak   subyte
         subyte=suword8
         .weak   subyte_noerr
         subyte_noerr=suword8_noerr
 #ifdef _LP64

@@ -1269,151 +803,64 @@
         sulword=suword32
         .weak   sulword_noerr
         sulword_noerr=suword32_noerr
 #endif  /* LP64 */
 
-#endif  /* lint */
-
 /*
  * We define rdtick here, but not for sun4v. On sun4v systems, the %tick
  * and %stick should not be read directly without considering the tick
  * and stick offset kernel variables introduced to support sun4v OS
  * suspension.
  */
 #if !defined (sun4v)
 
-#if defined (lint)
-
-hrtime_t
-rdtick()
-{ return (0); }
-
-#else /* lint */
-
         ENTRY(rdtick)
         retl
         rd      %tick, %o0
         SET_SIZE(rdtick)
 
-#endif /* lint */
-
 #endif /* !sun4v */
 
 /*
  * Set tba to given address, no side effects.
  */
-#if defined (lint)
 
-/*ARGSUSED*/
-void *
-set_tba(void *new_tba)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(set_tba)
         mov     %o0, %o1
         rdpr    %tba, %o0
         wrpr    %o1, %tba
         retl
         nop
         SET_SIZE(set_tba)
 
-#endif  /* lint */
-
-#if defined (lint)
-
-/*ARGSUSED*/
-void *
-get_tba()
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(get_tba)
         retl
         rdpr    %tba, %o0
         SET_SIZE(get_tba)
 
-#endif  /* lint */
-
-#if defined(lint) || defined(__lint)
-
-/* ARGSUSED */
-void
-setpstate(u_int pstate)
-{}
-
-#else   /* lint */
-
         ENTRY_NP(setpstate)
         retl
         wrpr    %g0, %o0, %pstate
         SET_SIZE(setpstate)
 
-#endif  /* lint */
-
-#if defined(lint) || defined(__lint)
-
-u_int
-getpstate(void)
-{ return(0); }
-
-#else   /* lint */
-
         ENTRY_NP(getpstate)
         retl
         rdpr    %pstate, %o0
         SET_SIZE(getpstate)
 
-#endif  /* lint */
-
-#if defined(lint) || defined(__lint)
-
-dtrace_icookie_t
-dtrace_interrupt_disable(void)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY_NP(dtrace_interrupt_disable)
         rdpr    %pstate, %o0
         andn    %o0, PSTATE_IE, %o1
         retl
         wrpr    %g0, %o1, %pstate
         SET_SIZE(dtrace_interrupt_disable)
 
-#endif  /* lint */
-
-#if defined(lint) || defined(__lint)
-
-/*ARGSUSED*/
-void
-dtrace_interrupt_enable(dtrace_icookie_t cookie)
-{}
-
-#else
-
         ENTRY_NP(dtrace_interrupt_enable)
         retl
         wrpr    %g0, %o0, %pstate 
         SET_SIZE(dtrace_interrupt_enable)
 
-#endif /* lint*/
-
-#if defined(lint)
-
-void
-dtrace_membar_producer(void)
-{}
-
-void
-dtrace_membar_consumer(void)
-{}
-
-#else   /* lint */
-
 #ifdef SF_ERRATA_51
         .align 32
         ENTRY(dtrace_membar_return)
         retl
         nop

@@ -1431,38 +878,15 @@
         ENTRY(dtrace_membar_consumer)
         DTRACE_MEMBAR_RETURN
         membar  #LoadLoad
         SET_SIZE(dtrace_membar_consumer)
 
-#endif  /* lint */
-
-#if defined(lint) || defined(__lint)
-
-void
-dtrace_flush_windows(void)
-{}
-
-#else
-
         ENTRY_NP(dtrace_flush_windows)
         retl
         flushw
         SET_SIZE(dtrace_flush_windows)
 
-#endif  /* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-getpcstack_top(pc_t *pcstack, int limit, uintptr_t *lastfp, pc_t *lastpc)
-{
-        return (0);
-}
-
-#else   /* lint */
-
         /*
          * %g1  pcstack
          * %g2  iteration count
          * %g3  final %fp
          * %g4  final %i7

@@ -1529,45 +953,22 @@
         ldn     [%fp + STACK_BIAS + 14*CLONGSIZE], %g3  ! load initial fp
         ba      2b
         ldn     [%fp + STACK_BIAS + 15*CLONGSIZE], %g4  ! and pc
         SET_SIZE(getpcstack_top)
 
-#endif  /* lint */
-
-#if defined(lint) || defined(__lint)
-
-/* ARGSUSED */
-void
-setwstate(u_int wstate)
-{}
-
-#else   /* lint */
-
         ENTRY_NP(setwstate)
         retl
         wrpr    %g0, %o0, %wstate
         SET_SIZE(setwstate)
 
-#endif  /* lint */
 
-
-#if defined(lint) || defined(__lint)
-
-u_int
-getwstate(void)
-{ return(0); }
-
-#else   /* lint */
-
         ENTRY_NP(getwstate)
         retl
         rdpr    %wstate, %o0
         SET_SIZE(getwstate)
 
-#endif  /* lint */
 
-
 /*
  * int panic_trigger(int *tp)
  *
  * A panic trigger is a word which is updated atomically and can only be set
  * once.  We atomically store 0xFF into the high byte and load the old value.

@@ -1574,20 +975,11 @@
  * If the byte was 0xFF, the trigger has already been activated and we fail.
  * If the previous value was 0 or not 0xFF, we succeed.  This allows a
  * partially corrupt trigger to still trigger correctly.  DTrace has its own
  * version of this function to allow it to panic correctly from probe context.
  */
-#if defined(lint)
 
-/*ARGSUSED*/
-int panic_trigger(int *tp) { return (0); }
-
-/*ARGSUSED*/
-int dtrace_panic_trigger(int *tp) { return (0); }
-
-#else   /* lint */
-
         ENTRY_NP(panic_trigger)
         ldstub  [%o0], %o0              ! store 0xFF, load byte into %o0
         cmp     %o0, 0xFF               ! compare %o0 to 0xFF
         set     1, %o1                  ! %o1 = 1
         be,a    0f                      ! if (%o0 == 0xFF) goto 0f (else annul)

@@ -1604,12 +996,10 @@
         set     0, %o1                  ! delay - %o1 = 0
 0:      retl
         mov     %o1, %o0                ! return (%o1);
         SET_SIZE(dtrace_panic_trigger)
 
-#endif  /* lint */
-
 /*
  * void vpanic(const char *format, va_list alist)
  *
  * The panic() and cmn_err() functions invoke vpanic() as a common entry point
  * into the panic code implemented in panicsys().  vpanic() is responsible

@@ -1622,20 +1012,11 @@
  * DTrace takes a slightly different panic path if it must panic from probe
  * context.  Instead of calling panic, it calls into dtrace_vpanic(), which
  * sets up the initial stack as vpanic does, calls dtrace_panic_trigger(), and
  * branches back into vpanic().
  */
-#if defined(lint)
 
-/*ARGSUSED*/
-void vpanic(const char *format, va_list alist) {}
-
-/*ARGSUSED*/
-void dtrace_vpanic(const char *format, va_list alist) {}
-
-#else   /* lint */
-
         ENTRY_NP(vpanic)
 
         save    %sp, -SA(MINFRAME + REGSIZE), %sp       ! save and allocate regs
 
         !

@@ -1759,58 +1140,24 @@
         or      %o0, %lo(panic_quiesce), %o0            ! if (!panic_trigger(
 
         ba,a    vpanic_common
         SET_SIZE(dtrace_vpanic)
         
-#endif  /* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-
-uint_t
-get_subcc_ccr( uint64_t addrl, uint64_t addrr)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(get_subcc_ccr)
         wr      %g0, %ccr       ! clear condition codes
         subcc   %o0, %o1, %g0
         retl
         rd      %ccr, %o0       ! return condition codes
         SET_SIZE(get_subcc_ccr)
 
-#endif  /* lint */
-
-#if defined(lint) || defined(__lint)
-
-ftrace_icookie_t
-ftrace_interrupt_disable(void)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY_NP(ftrace_interrupt_disable)
         rdpr    %pstate, %o0
         andn    %o0, PSTATE_IE, %o1
         retl
         wrpr    %g0, %o1, %pstate
         SET_SIZE(ftrace_interrupt_disable)
 
-#endif  /* lint */
-
-#if defined(lint) || defined(__lint)
-
-/*ARGSUSED*/
-void
-ftrace_interrupt_enable(ftrace_icookie_t cookie)
-{}
-
-#else
-
         ENTRY_NP(ftrace_interrupt_enable)
         retl
         wrpr    %g0, %o0, %pstate 
         SET_SIZE(ftrace_interrupt_enable)
 
-#endif /* lint*/