diff --git a/src/include/port/osf.h b/src/include/port/osf.h
index 90c5a8af6cf..5f138a31791 100644
--- a/src/include/port/osf.h
+++ b/src/include/port/osf.h
@@ -1,8 +1,10 @@
 #define USE_POSIX_TIME
 #define DISABLE_XOPEN_NLS
 #define HAS_TEST_AND_SET
-#include <sys/mman.h>			/* for msemaphore */
-typedef msemaphore slock_t;
+/*#include <sys/mman.h>*/			/* for msemaphore */
+/*typedef msemaphore slock_t;*/
+#include <alpha/builtins.h>
+typedef volatile long slock_t;
 
 /* some platforms define __alpha, but not __alpha__ */
 #if defined(__alpha) && !defined(__alpha__)
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 98cbf10920a..86acb8bb56a 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.71 2000/07/05 16:09:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.72 2000/10/08 04:38:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -270,10 +270,15 @@ tas(slock_t *s_lock)
  * Note that slock_t on the Alpha AXP is msemaphore instead of char
  * (see storage/ipc.h).
  */
+#include <alpha/builtins.h>
+#if 0
 #define TAS(lock)	  (msem_lock((lock), MSEM_IF_NOWAIT) < 0)
 #define S_UNLOCK(lock) msem_unlock((lock), 0)
 #define S_INIT_LOCK(lock)		msem_init((lock), MSEM_UNLOCKED)
 #define S_LOCK_FREE(lock)	  (!(lock)->msem_state)
+#else
+#define TAS(lock)         (__INTERLOCKED_TESTBITSS_QUAD((lock),0))
+#endif
 
 #else /* i.e. not __osf__ */