protect-SMP-with-conditionals-against-multiple-definitions-20010612

don't redefine __SMP__ if it's defined.

diff --git a/src/config/param.alpha_linux_2216_22.h b/src/config/param.alpha_linux_2216_22.h
index 474e6dbcb7c66555f3c68e52e433067a992218b4..5b1498a4b6215bdb9f511525482f865dc485abb8 100644 (file)
--- 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 85506a61cf59897c510f63391019fbe7898eb564..0eb8a2ac154c9ddac4d0ea81beb80720628e65f8 100644 (file)
--- 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 6d572e70ea283c9176508a86cbf84717996a7213..25721c0e650f8c7af7d268a2dfd872146b928f1c 100644 (file)
--- 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 93e46cf3466913250cb1606acc9cbbb3a22fe4fc..5dfa506ae677e3d68d85368b7123febef38abd09 100644 (file)
--- 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 b88c0c01ea31cfe074589aba68024fb3d9eaca9f..cd313f1488f07bdba7d20165cb725d1997b17740 100644 (file)
--- 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 f9fbb048d363cbc92b732dda625c9e9935f388eb..2bb67147bb03d55b1f15d02549181086671e08e6 100644 (file)
--- 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 091c18ad6cf60c59d5b116f0655efe12e63f5ff9..2a0718964380777e632931f409af67e1cdaa6a2f 100644 (file)
--- 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 28f0977295c58db53fde1cb45ea6a5e6532c43fe..061c718664f954546eba5c565291e4a54b0648dc 100644 (file)
--- 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 f0b4214d6f45af69f6caab4d105b26d9c0e47d0b..5c0a68a209d8dfa1ceb187ff7e5fded3b65908e0 100644 (file)
--- 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