[PATCH]: Remove PF_MEMDIE as it is redundant

From: Juan Quintela (quintela@mandrakesoft.com)
Date: Wed Jan 08 2003 - 17:47:52 EST

Hi
        PF_MEMDIE don't have any use in current kernels. Please
        remove, we only set it in one place, and there we also set
        PF_MEMALLOC. And we only test it in other place, and we also
        test for PF_MEMALLOC. This patch has existed in aa for some
        quite time.

        Please apply.

        Later, Juan.

diff -urNp ref/include/linux/sched.h 2.4.20pre5aa1/include/linux/sched.h
--- ref/include/linux/sched.h Fri Aug 30 01:55:20 2002
+++ 2.4.20pre5aa1/include/linux/sched.h Fri Aug 30 01:55:22 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 ref/mm/oom_kill.c 2.4.20pre5aa1/mm/oom_kill.c
--- t3/mm/oom_kill.c.cc13-2.orig 2002-10-25 12:53:02.000000000 +0200
+++ t3/mm/oom_kill.c 2002-10-25 13:09:27.000000000 +0200
@@ -149,7 +149,7 @@ void oom_kill_task(struct task_struct *p
          * exit() and clear out its resources quickly...
          */
         p->counter = 5 * HZ;
- p->flags |= PF_MEMALLOC | PF_MEMDIE;
+ p->flags |= PF_MEMALLOC;
 
         /* This process has hardware access, be more careful. */
         if (cap_t(p->cap_effective) & CAP_TO_MASK(CAP_SYS_RAWIO)) {
diff -uNp t1/mm/page_alloc.c.cc13-3.orig t1/mm/page_alloc.c
--- t1/mm/page_alloc.c.cc13-3.orig 2003-01-08 23:32:31.000000000 +0100
+++ t1/mm/page_alloc.c 2003-01-08 23:40:26.000000000 +0100
@@ -351,7 +351,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++); 

-- 
In theory, practice and theory are the same, but in practice they 
are different -- Larry McVoy
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Wed Jan 15 2003 - 22:00:25 EST