diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 03a084acf082b0006dc1ee5c1f8b6ca406404039..4a7afc86c1390e6a6e79dfea391faa6591caf6f2 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -17,6 +17,8 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * kernel patches
 	- fix truncated write corruption (2366)
 	- fix for failed assertion in iopen_connect_dentry (1792,2517)
+       * bug fixes
+	- don't flag the ptlrpcd thread with PF_MEMALLOC (2636)
 
 2004-01-27  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.0.3
diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c
index aff00b8140039f3da5bf534862f752489edeb6b2..7b56097bd1b09a1c80aeb21ab8e350cd50249e86 100644
--- a/lustre/ptlrpc/ptlrpcd.c
+++ b/lustre/ptlrpc/ptlrpcd.c
@@ -140,9 +140,6 @@ static int ptlrpcd(void *arg)
 
         complete(&pc->pc_starting);
 
-        /* like kswapd */
-        current->flags |= PF_MEMALLOC;
-
         /* this mainloop strongly resembles ptlrpc_set_wait except
          * that our set never completes.  ptlrpcd_check calls ptlrpc_check_set
          * when there are requests in the set.  new requests come in