From 83cd375cd29060286a55c4667737099068db00e2 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 3 Oct 1997 15:27:18 +0000
Subject: [PATCH] Linux/alpha patch from Dan Maynard

---
 src/include/storage/s_lock.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 6a8a454606..761ae6b11c 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.9 1997/10/02 18:32:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.10 1997/10/03 15:27:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -97,7 +97,7 @@
  * (see storage/ipc.h).
  */
 
-#if defined(__alpha__) || defined(__alpha)
+#if (defined(__alpha__) || defined(__alpha)) && !defined(linux)
 
 #define	S_LOCK(lock)	do \
 						{ \