summaryrefslogtreecommitdiffstats
path: root/include/asm-sh/smplock.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-04-28 01:09:25 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-04-28 01:09:25 +0000
commitb9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch)
tree42d07b0c7246ae2536a702e7c5de9e2732341116 /include/asm-sh/smplock.h
parent7406b0a326f2d70ade2671c37d1beef62249db97 (diff)
Merge with 2.3.99-pre6.
Diffstat (limited to 'include/asm-sh/smplock.h')
-rw-r--r--include/asm-sh/smplock.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-sh/smplock.h b/include/asm-sh/smplock.h
index 29495778e..6f71b8bba 100644
--- a/include/asm-sh/smplock.h
+++ b/include/asm-sh/smplock.h
@@ -7,7 +7,9 @@
* for more details.
*/
-#ifndef __SMP__
+#include <linux/config.h>
+
+#ifndef CONFIG_SMP
#define lock_kernel() do { } while(0)
#define unlock_kernel() do { } while(0)
@@ -65,6 +67,6 @@ do { \
spin_lock(&kernel_flag); \
} while (0)
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
#endif /* __ASM_SH_SMPLOCK_H */