de-linting of .s files

@@ -22,83 +22,46 @@
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident   "%Z%%M% %I%     %E% SMI"
-
-#if defined(lint)
-#include <sys/types.h>
-#include <sys/t_lock.h>
-#include <sys/promif.h>
-#include <sys/prom_isa.h>
-#endif  /* lint */
-
 #include <sys/asm_linkage.h>
 #include <sys/privregs.h>
 #include <sys/scb.h>
 #include <sys/machparam.h>
 #include <sys/machthread.h>
 
-#if defined(lint)
-
-#include <sys/thread.h>
-#include <sys/time.h>
-
-#else   /* lint */
-
 #include "assym.h"
 
-#endif  /* lint */
-
 /*
  * void
  * reestablish_curthread(void)
  *    - reestablishes the invariant that THREAD_REG contains
  *      the same value as the cpu struct for this cpu (implicit from
  *      where we're running). This is needed for OBP callback routines.
  *      The CPU_ADDR macro figures out the cpuid by reading hardware registers.
  */
 
-#if defined(lint)
-
-void
-reestablish_curthread(void)
-{}
-
-#else   /* lint */
-
         ENTRY_NP(reestablish_curthread)
 
         CPU_ADDR(%o0, %o1)
         retl
         ldn     [%o0 + CPU_THREAD], THREAD_REG
         SET_SIZE(reestablish_curthread)
 
 
-#endif  /* lint */
-
 /*
  * Return the current THREAD pointer.
  * This is also available as an inline function.
  */
-#if defined(lint)
 
-kthread_id_t
-threadp(void)
-{ return ((kthread_id_t)0); }
-
-#else   /* lint */
-
         ENTRY_NP(threadp)
         retl
         mov     THREAD_REG, %o0
         SET_SIZE(threadp)
 
-#endif  /* lint */
 
-
 /*
  * The IEEE 1275-1994 callback handler for a 64-bit SPARC V9 PROM calling
  * a 32 bit client program. The PROM calls us with a 64 bit stack and a
  * pointer to a client interface argument array in %o0.  The called code
  * returns 0 if the call succeeded (i.e. the service name exists) or -1

@@ -107,22 +70,10 @@
  * This code is called as trusted subroutine of the firmware, and is
  * called with %tba pointing to the boot firmware's trap table.  All of
  * the prom's window handlers are mixed mode handlers.
  */
 
-#if defined(lint)
-
-int
-callback_handler(cell_t *arg_array)
-{
-        extern int vx_handler(cell_t *arg_array);
-
-        return (vx_handler(arg_array));
-}
-
-#else   /* lint */
-
         ENTRY_NP(callback_handler)
         !
         ! We assume we are called with a 64 bit stack with PSTATE_AM clear
         !
         save    %sp, -SA64(MINFRAME64), %sp     ! 64 bit save

@@ -151,8 +102,6 @@
         wrpr    %g0, %l5, %wstate               ! restore %wstate
 
         ret                                     ! return result in %o0
         restore                                 ! back to a 64 bit stack
         SET_SIZE(callback_handler)
-
-#endif  /* lint */