From 79606d4e5f09e9b558189e1b56115c4c3aa178d5 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@umr.edu>
Date: Tue, 12 Jun 2001 20:42:32 +0000
Subject: [PATCH] 
 protect-SMP-with-conditionals-against-multiple-definitions-20010612

don't redefine __SMP__ if it's defined.
---
 src/config/param.alpha_linux_2216_22.h | 2 ++
 src/config/param.i386_linux22.h        | 2 ++
 src/config/param.i386_linux24.h        | 2 ++
 src/config/param.ppc_linux22.h         | 2 ++
 src/config/param.ppc_linux24.h         | 2 ++
 src/config/param.s390_linux22.h        | 2 ++
 src/config/param.s390_linux24.h        | 2 ++
 src/config/param.sparc64_linux22.h     | 2 ++
 src/config/param.sparc_linux22.h       | 2 ++
 9 files changed, 18 insertions(+)

diff --git a/src/config/param.alpha_linux_2216_22.h b/src/config/param.alpha_linux_2216_22.h
index 474e6dbcb..5b1498a4b 100644
--- a/src/config/param.alpha_linux_2216_22.h
+++ b/src/config/param.alpha_linux_2216_22.h
@@ -50,7 +50,9 @@
  */
 #ifdef AFS_SMP
 #define CONFIG_SMP
+#ifndef __SMP__
 #define __SMP__
+#endif
 #define AFS_GLOBAL_SUNLOCK
 #endif
 
diff --git a/src/config/param.i386_linux22.h b/src/config/param.i386_linux22.h
index 85506a61c..0eb8a2ac1 100644
--- a/src/config/param.i386_linux22.h
+++ b/src/config/param.i386_linux22.h
@@ -55,7 +55,9 @@
 #ifndef CONFIG_X86_LOCAL_APIC
 #define CONFIG_X86_LOCAL_APIC
 #endif
+#ifndef __SMP__
 #define __SMP__
+#endif
 #define AFS_GLOBAL_SUNLOCK
 #endif
 
diff --git a/src/config/param.i386_linux24.h b/src/config/param.i386_linux24.h
index 6d572e70e..25721c0e6 100644
--- a/src/config/param.i386_linux24.h
+++ b/src/config/param.i386_linux24.h
@@ -48,7 +48,9 @@
 #ifndef CONFIG_X86_LOCAL_APIC
 #define CONFIG_X86_LOCAL_APIC
 #endif
+#ifndef __SMP__
 #define __SMP__
+#endif
 #define AFS_GLOBAL_SUNLOCK
 #endif
 
diff --git a/src/config/param.ppc_linux22.h b/src/config/param.ppc_linux22.h
index 93e46cf34..5dfa506ae 100644
--- a/src/config/param.ppc_linux22.h
+++ b/src/config/param.ppc_linux22.h
@@ -43,7 +43,9 @@
  */
 #ifdef AFS_SMP
 #define CONFIG_SMP
+#ifndef __SMP__
 #define __SMP__
+#endif
 #define AFS_GLOBAL_SUNLOCK
 #endif
 
diff --git a/src/config/param.ppc_linux24.h b/src/config/param.ppc_linux24.h
index b88c0c01e..cd313f148 100644
--- a/src/config/param.ppc_linux24.h
+++ b/src/config/param.ppc_linux24.h
@@ -45,7 +45,9 @@
  */
 #ifdef AFS_SMP
 #define CONFIG_SMP
+#ifndef __SMP__
 #define __SMP__
+#endif
 #define AFS_GLOBAL_SUNLOCK
 #endif
 
diff --git a/src/config/param.s390_linux22.h b/src/config/param.s390_linux22.h
index f9fbb048d..2bb67147b 100644
--- a/src/config/param.s390_linux22.h
+++ b/src/config/param.s390_linux22.h
@@ -49,7 +49,9 @@
 #ifndef CONFIG_S390_LOCAL_APIC
 #define CONFIG_S390_LOCAL_APIC
 #endif
+#ifndef __SMP__
 #define __SMP__
+#endif
 #define AFS_GLOBAL_SUNLOCK
 #endif
 
diff --git a/src/config/param.s390_linux24.h b/src/config/param.s390_linux24.h
index 091c18ad6..2a0718964 100644
--- a/src/config/param.s390_linux24.h
+++ b/src/config/param.s390_linux24.h
@@ -51,7 +51,9 @@
 #ifndef CONFIG_S390_LOCAL_APIC
 #define CONFIG_S390_LOCAL_APIC
 #endif
+#ifndef __SMP__
 #define __SMP__
+#endif
 #define AFS_GLOBAL_SUNLOCK
 #endif
 
diff --git a/src/config/param.sparc64_linux22.h b/src/config/param.sparc64_linux22.h
index 28f097729..061c71866 100644
--- a/src/config/param.sparc64_linux22.h
+++ b/src/config/param.sparc64_linux22.h
@@ -51,7 +51,9 @@
  */
 #ifdef AFS_SMP
 #define CONFIG_SMP
+#ifndef __SMP__
 #define __SMP__
+#endif
 #define AFS_GLOBAL_SUNLOCK
 #endif
 
diff --git a/src/config/param.sparc_linux22.h b/src/config/param.sparc_linux22.h
index f0b4214d6..5c0a68a20 100644
--- a/src/config/param.sparc_linux22.h
+++ b/src/config/param.sparc_linux22.h
@@ -46,7 +46,9 @@
  */
 #ifdef AFS_SMP
 #define CONFIG_SMP
+#ifndef __SMP__
 #define __SMP__
+#endif
 #define AFS_GLOBAL_SUNLOCK
 #endif
 
-- 
2.39.5