Re: [test program] for OOM situations

Bernd Kaindl (bk@suse.de)
Mon, 12 Jul 1999 21:29:22 +0200 (MEST)

On Fri, 9 Jul 1999, Linus Torvalds wrote:
> >
> > Yes, this was also my observation.
> >
> > > With the bug fixed now the faulting task gets killed in less than one
> > > second. Here it is the fix against 2.2.10. I propose it for inclusion into
> > > 2.2.11:
> >
> > Confirmed, Linus?
>
> Applied in my 2.3.x tree, as it looks correct.
>

Just for completeness and to avoid confusion: Andrea's posted patch applied
to a kernel without lock_map_size(like 2.3.x).

The correct patch for 2.2.x is:

--- mm/swapfile.c Mon Jul 12 20:16:36 1999
+++ mm/swapfile.c Mon Jul 12 20:17:52 1999
@@ -649,7 +649,8 @@
else
p->swap_map[page] = SWAP_MAP_BAD;
}
- nr_good_pages = swap_header->info.last_page - i;
+ nr_good_pages = swap_header->info.last_page -
+ swap_header->info.nr_badpages - 1;
lock_map_size = (p->max + 7) / 8;
if (error)
goto bad_swap;

Is this also correct for 2.2.x?

don't worry, be happy,

Bernhard

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/