diff -urN openafs-1.4.0/configure openafs-1.4.0-openvz/configure
--- openafs-1.4.0/configure     2005-10-20 23:57:27.000000000 -0400
+++ openafs-1.4.0-openvz/configure      2006-05-03 16:34:11.000000000 -0400
@@ -3009,7 +3009,7 @@
 #include "confdefs.h"
 #include <linux/sched.h>
 int main() {
-#ifndef for_each_process(p)
+#ifndef for_each_process_all(p)
 #error for_each_process not defined
 #endif
 ; return 0; }
diff -urN openafs-1.4.0/src/afs/LINUX/osi_sleep.c
openafs-1.4.0-openvz/src/afs/LINUX/osi_sleep.c
--- openafs-1.4.0/src/afs/LINUX/osi_sleep.c     2005-09-18 23:41:31.000000000 -0400
+++ openafs-1.4.0-openvz/src/afs/LINUX/osi_sleep.c      2006-05-03 16:52:09.000000000
-0400
@@ -192,22 +192,11 @@
        AFS_ASSERT_GLOCK();
        AFS_GUNLOCK();
        schedule();
-#ifdef AFS_LINUX26_ENV
-#ifdef CONFIG_PM
-       if (
-#ifdef PF_FREEZE
-           current->flags & PF_FREEZE
-#else
-           !current->todo
-#endif
-           )
 #ifdef LINUX_REFRIGERATOR_TAKES_PF_FREEZE
            refrigerator(PF_FREEZE);
 #else
            refrigerator();
 #endif
-#endif
-#endif
        AFS_GLOCK();
        if (signal_pending(current)) {
            retval = EINTR;
@@ -286,22 +275,11 @@
            code = EINTR;
     } else
        schedule_timeout(ticks);
-#ifdef AFS_LINUX26_ENV
-#ifdef CONFIG_PM
-    if (
-#ifdef PF_FREEZE
-           current->flags & PF_FREEZE
-#else
-           !current->todo
-#endif
-           )
 #ifdef LINUX_REFRIGERATOR_TAKES_PF_FREEZE
        refrigerator(PF_FREEZE);
 #else
        refrigerator();
 #endif
-#endif
-#endif

     AFS_GLOCK();
     remove_wait_queue(&evp->cond, &wait);
diff -urN openafs-1.4.0/src/afs/afs_osi.c openafs-1.4.0-openvz/src/afs/afs_osi.c
--- openafs-1.4.0/src/afs/afs_osi.c     2005-04-03 14:15:36.000000000 -0400
+++ openafs-1.4.0-openvz/src/afs/afs_osi.c      2006-05-03 16:33:58.000000000 -0400
@@ -791,7 +791,7 @@
     if (&tasklist_lock)
        read_lock(&tasklist_lock);
 #ifdef DEFINED_FOR_EACH_PROCESS
-    for_each_process(p) if (p->pid) {
+    for_each_process_all(p) if (p->pid) {
 #ifdef STRUCT_TASK_STRUCT_HAS_EXIT_STATE
        if (p->exit_state)
            continue;
diff -urN openafs-1.4.0/src/rx/LINUX/rx_knet.c openafs-1.4.0-openvz/src/rx/LINUX/rx_knet.c
--- openafs-1.4.0/src/rx/LINUX/rx_knet.c        2005-07-26 13:42:25.000000000 -0400
+++ openafs-1.4.0-openvz/src/rx/LINUX/rx_knet.c 2006-05-03 17:04:01.000000000 -0400
@@ -191,7 +191,7 @@

     if (&tasklist_lock)
       read_lock(&tasklist_lock);
-    listener = find_task_by_pid(rxk_ListenerPid);
+    listener = find_task_by_pid_all(rxk_ListenerPid);
     if (&tasklist_lock)
        read_unlock(&tasklist_lock);
     while (rxk_ListenerPid) {