Merge b_devel->b_orphan:

  DEVEL_ORPHAN_UPDATE_PARENT_20030522->DEVEL_ORPHAN_UPDATE_PARENT_20030528

diff --git a/lnet/include/linux/portals_compat25.h b/lnet/include/linux/portals_compat25.h
new file mode 100644 (file)
index 0000000..e28fbac
--- /dev/null
+++ b/lnet/include/linux/portals_compat25.h
@@ -0,0 +1,13 @@
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) || defined(CONFIG_RH_2_4_20)
+# define SIGNAL_MASK_LOCK(task, flags)                              \
+  spin_lock_irqsave(&task->sighand->siglock, flags)
+# define SIGNAL_MASK_UNLOCK(task, flags)                            \
+  spin_unlock_irqrestore(&task->sighand->siglock, flags)
+# define RECALC_SIGPENDING         recalc_sigpending()
+#else
+# define SIGNAL_MASK_LOCK(task, flags)                              \
+  spin_lock_irqsave(&task->sigmask_lock, flags)
+# define SIGNAL_MASK_UNLOCK(task, flags)                            \
+  spin_unlock_irqrestore(&task->sigmask_lock, flags)
+# define RECALC_SIGPENDING         recalc_sigpending(current)
+#endif

diff --git a/lustre/portals/include/linux/portals_compat25.h b/lustre/portals/include/linux/portals_compat25.h
new file mode 100644 (file)
index 0000000..e28fbac
--- /dev/null
+++ b/lustre/portals/include/linux/portals_compat25.h
@@ -0,0 +1,13 @@
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) || defined(CONFIG_RH_2_4_20)
+# define SIGNAL_MASK_LOCK(task, flags)                              \
+  spin_lock_irqsave(&task->sighand->siglock, flags)
+# define SIGNAL_MASK_UNLOCK(task, flags)                            \
+  spin_unlock_irqrestore(&task->sighand->siglock, flags)
+# define RECALC_SIGPENDING         recalc_sigpending()
+#else
+# define SIGNAL_MASK_LOCK(task, flags)                              \
+  spin_lock_irqsave(&task->sigmask_lock, flags)
+# define SIGNAL_MASK_UNLOCK(task, flags)                            \
+  spin_unlock_irqrestore(&task->sigmask_lock, flags)
+# define RECALC_SIGPENDING         recalc_sigpending(current)
+#endif