diff -urNp vm-8/include/linux/sched.h vm-9/include/linux/sched.h
--- vm-8/include/linux/sched.h	Wed May 29 04:35:13 2002
+++ vm-9/include/linux/sched.h	Wed May 29 04:40:09 2002
@@ -481,7 +481,6 @@ struct task_struct {
 #define PF_DUMPCORE	0x00000200	/* dumped core */
 #define PF_SIGNALED	0x00000400	/* killed by a signal */
 #define PF_MEMALLOC	0x00000800	/* Allocating memory */
-#define PF_MEMDIE	0x00001000	/* Killed for out-of-memory */
 #define PF_FREE_PAGES	0x00002000	/* per process page freeing */
 #define PF_NOIO		0x00004000	/* avoid generating further I/O */
 
diff -urNp vm-8/mm/oom_kill.c vm-9/mm/oom_kill.c
--- vm-8/mm/oom_kill.c	Wed May 29 04:34:19 2002
+++ vm-9/mm/oom_kill.c	Wed May 29 04:41:50 2002
@@ -149,7 +149,6 @@ void oom_kill_task(struct task_struct *p
 	 * exit() and clear out its resources quickly...
 	 */
 	p->time_slice = HZ;
-	p->flags |= PF_MEMALLOC | PF_MEMDIE;
 
 	/* This process has hardware access, be more careful. */
 	if (cap_t(p->cap_effective) & CAP_TO_MASK(CAP_SYS_RAWIO)) {
diff -urNp vm-8/mm/page_alloc.c vm-9/mm/page_alloc.c
--- vm-8/mm/page_alloc.c	Wed May 29 04:36:20 2002
+++ vm-9/mm/page_alloc.c	Wed May 29 04:42:24 2002
@@ -348,7 +348,7 @@ struct page * __alloc_pages(unsigned int
 	/* here we're in the low on memory slow path */
 
 rebalance:
-	if (current->flags & (PF_MEMALLOC | PF_MEMDIE)) {
+	if (current->flags & PF_MEMALLOC) {
 		zone = zonelist->zones;
 		for (;;) {
 			zone_t *z = *(zone++);
diff -urNp vm-8/mm/page_io.c vm-9/mm/page_io.c
--- vm-8/mm/page_io.c	Tue Jan 22 18:56:00 2002
+++ vm-9/mm/page_io.c	Wed May 29 04:40:11 2002
@@ -73,10 +73,6 @@ static int rw_swap_page_base(int rw, swp
  	/* block_size == PAGE_SIZE/zones_used */
  	brw_page(rw, page, dev, zones, block_size);
 
- 	/* Note! For consistency we do all of the logic,
- 	 * decrementing the page count, and unlocking the page in the
- 	 * swap lock map - in the IO completion handler.
- 	 */
 	return 1;
 }