Linux: Use freezer compatibility macros in RX

[openafs.git] / src / rx / LINUX / rx_kmutex.c

diff --git a/src/rx/LINUX/rx_kmutex.c b/src/rx/LINUX/rx_kmutex.c
index a4c863f..be36c74 100644 (file)
--- a/src/rx/LINUX/rx_kmutex.c
+++ b/src/rx/LINUX/rx_kmutex.c
@@ -16,13 +16,13 @@
 #include <afsconfig.h>
 #include "afs/param.h"
 
-RCSID
-    ("$Header$");
 
 #include "rx/rx_kcommon.h"
 #include "rx_kmutex.h"
 #include "rx/rx_kernel.h"
 
+#include "osi_compat.h"
+
 void
 afs_mutex_init(afs_kmutex_t * l)
 {
@@ -45,7 +45,7 @@ afs_mutex_enter(afs_kmutex_t * l)
     down(&l->sem);
 #endif
     if (l->owner)
-       osi_Panic("mutex_enter: 0x%x held by %d", l, l->owner);
+       osi_Panic("mutex_enter: 0x%lx held by %d", (unsigned long)l, l->owner);
     l->owner = current->pid;
 }
 
@@ -66,7 +66,7 @@ void
 afs_mutex_exit(afs_kmutex_t * l)
 {
     if (l->owner != current->pid)
-       osi_Panic("mutex_exit: 0x%x held by %d", l, l->owner);
+       osi_Panic("mutex_exit: 0x%lx held by %d", (unsigned long)l, l->owner);
     l->owner = 0;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
     mutex_unlock(&l->mutex);
@@ -93,7 +93,7 @@ afs_cv_wait(afs_kcondvar_t * cv, afs_kmutex_t * l, int sigok)
 #else
     struct wait_queue wait = { current, NULL };
 #endif
-
+    sigemptyset(&saved_set);
     seq = cv->seq;
     
     set_current_state(TASK_INTERRUPTIBLE);
@@ -113,27 +113,8 @@ afs_cv_wait(afs_kcondvar_t * cv, afs_kmutex_t * l, int sigok)
 
     while(seq == cv->seq) {
        schedule();
-#ifdef AFS_LINUX26_ENV
-#ifdef CONFIG_PM
-       if (
-#ifdef PF_FREEZE
-           current->flags & PF_FREEZE
-#else
-#if defined(STRUCT_TASK_STRUCT_HAS_TODO)
-           !current->todo
-#else
-           test_ti_thread_flag(current->thread_info, TIF_FREEZE)
-#endif
-#endif
-           )
-#ifdef LINUX_REFRIGERATOR_TAKES_PF_FREEZE
-           refrigerator(PF_FREEZE);
-#else
-           refrigerator();
-#endif
-           set_current_state(TASK_INTERRUPTIBLE);
-#endif
-#endif
+       afs_try_to_freeze();
+       set_current_state(TASK_INTERRUPTIBLE);
     }
 
     remove_wait_queue(&cv->waitq, &wait);