de-linting of .s files

@@ -21,16 +21,11 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#if defined(lint)
-#include <sys/types.h>
-#include <sys/cpuvar.h>
-#else   /*lint */
 #include "assym.h"
-#endif  /* lint */
 
 #include <sys/asm_linkage.h>
 #include <sys/privregs.h>
 #include <sys/x_call.h>
 #include <sys/xc_impl.h>

@@ -40,19 +35,10 @@
 #ifdef TRAPTRACE
 #include <sys/traptrace.h>
 #endif /* TRAPTRACE */
 
 
-#if defined(lint)
-
-/* ARGSUSED */
-void
-self_xcall(struct cpu *cpu, uint64_t arg1, uint64_t arg2, xcfunc_t *func)
-{}
-
-#else
-
 /*
  * Entered by the software trap (TT=ST_SELFXCALL, TL>0) thru send_self_xcall().
  * Emulate the mondo handler - vec_interrupt().
  *
  * Global registers are the Alternate Globals.

@@ -102,22 +88,11 @@
         jmp     %o3                             ! call the fast trap handler
         mov     %o2, %g2
         /* Not Reached */
         SET_SIZE(self_xcall)
 
-#endif  /* lint */
-
 #ifdef  TRAPTRACE
-#if defined(lint)
-
-/* ARGSUSED */
-void
-xc_trace(u_int traptype, cpuset_t *cpu_set, xcfunc_t *func,
-        uint64_t arg1, uint64_t arg2)
-{}
-
-#else   /* lint */
         ENTRY(xc_trace)
         rdpr    %pstate, %g1
         andn    %g1, PSTATE_IE | PSTATE_AM, %g2
         wrpr    %g0, %g2, %pstate                       /* disable interrupts */
         TRACE_PTR(%g3, %g4)

@@ -186,26 +161,12 @@
 #endif  /* CPUSET_SIZE */
         retl
         wrpr    %g0, %g1, %pstate                       /* enable interrupts */
         SET_SIZE(xc_trace)
 
-#endif  /* lint */
 #endif  /* TRAPTRACE */
 
-#if defined(lint)
-
-/*ARGSUSED*/
-void
-init_mondo(xcfunc_t *func, uint64_t arg1, uint64_t arg2)
-{}
-
-/*ARGSUSED*/
-int
-shipit(int n, uint64_t cpuid)
-{ return(0); }
-
-#else   /* lint */
 /*
  * Setup interrupt dispatch data registers
  * Entry:
  *      %o0 - function or inumber to call
  *      %o1, %o2 - arguments (2 uint64_t's)

@@ -239,20 +200,10 @@
         ta      FAST_TRAP
         retl
         membar  #Sync
         SET_SIZE(shipit)
 
-#endif  /* lint */
-
-#if defined(lint)
-
-/*ARGSUSED*/
-uint64_t
-get_cpuaddr(uint64_t reg, uint64_t scr)
-{ return (0);}
-
-#else   /* lint */
 /*
  * Get cpu structure
  * Entry:
  *      %o0 - register for CPU_ADDR macro
  *      %o1 - scratch for CPU_ADDR macro

@@ -261,19 +212,10 @@
         CPU_ADDR(%o0, %o1)      ! %o0 == CPU struct addr
         retl
         nop
         SET_SIZE(get_cpuaddr)
 
-#endif  /* lint */
-
-#if defined(lint)
-/* ARGSUSED */
-void
-xt_sync_tl1(uint64_t *cpu_sync_addr)
-{}
-
-#else /* lint */
 /*
  * This is to ensure that previously called xtrap handlers have executed on
  * sun4v. We zero out the byte corresponding to its cpuid in the
  * array passed to us from xt_sync(), so the sender knows the previous
  * mondo has been executed.

@@ -284,6 +226,5 @@
         CPU_INDEX(%g3, %g4)             /* %g3 = cpu id */
         stb     %g0, [%g1 + %g3] 
         retry
         SET_SIZE(xt_sync_tl1)
 
-#endif  /* lint */