Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)

1 files changed, 60 insertions, 0 deletions

diff --git a/include/asm-s390/smplock.h b/include/asm-s390/smplock.h
new file mode 100644
index 000000000..4ebd38025
--- /dev/null
+++ b/include/asm-s390/smplock.h
@@ -0,0 +1,60 @@
+/*
+ *  include/asm-s390/smplock.h
+ *
+ *  S390 version
+ *
+ *  Derived from "include/asm-i386/smplock.h"
+ */
+
+#include <linux/interrupt.h>
+#include <asm/spinlock.h>
+
+extern spinlock_t kernel_flag;
+
+/*
+ * Release global kernel lock and global interrupt lock
+ */
+#define release_kernel_lock(task, cpu)     \
+do {                                       \
+	if (task->lock_depth >= 0)         \
+		spin_unlock(&kernel_flag); \
+	release_irqlock(cpu);              \
+	__sti();                           \
+} while (0)
+
+/*
+ * Re-acquire the kernel lock
+ */
+#define reacquire_kernel_lock(task)        \
+do {                                       \
+	if (task->lock_depth >= 0)         \
+		spin_lock(&kernel_flag);   \
+} while (0)
+
+
+/*
+ * Getting the big kernel lock.
+ *
+ * This cannot happen asynchronously,
+ * so we only need to worry about other
+ * CPU's.
+ */
+/*
+ * Getting the big kernel lock.
+ *
+ * This cannot happen asynchronously,
+ * so we only need to worry about other
+ * CPU's.
+ */
+extern __inline__ void lock_kernel(void)
+{
+        if (!++current->lock_depth)
+                spin_lock(&kernel_flag);
+}
+
+extern __inline__ void unlock_kernel(void)
+{
+        if (--current->lock_depth < 0)
+                spin_unlock(&kernel_flag);
+}
+