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 474e6db..5b1498a 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 85506a6..0eb8a2a 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 6d572e7..25721c0 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 93e46cf..5dfa506 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 b88c0c0..cd313f1 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 f9fbb04..2bb6714 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 091c18a..2a07189 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 28f0977..061c718 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 f0b4214..5c0a68a 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