Messages in this thread | | | Date | Fri, 26 Jan 2007 19:43:06 +0100 | From | Pavel Machek <> | Subject | Re: mm snapshot broken-out-2007-01-26-00-36.tar.gz uploaded |
| |
Hi!
> but I would think that this would fix the compile errors that are my > responsibility (sort of .... patch was against rc6 and not against mm). > More when I track down the above issue:
...
> Signed-off-by: Christoph Lameter <clameter@sgi.com> > > Index: linux-2.6.20-rc6/kernel/power/swsusp.c > =================================================================== > --- linux-2.6.20-rc6.orig/kernel/power/swsusp.c 2007-01-26 10:32:05.000000000 -0800 > +++ linux-2.6.20-rc6/kernel/power/swsusp.c 2007-01-26 10:32:24.000000000 -0800 > @@ -230,7 +230,8 @@ int swsusp_shrink_memory(void) > for_each_zone (zone) > if (populated_zone(zone)) { > if (is_highmem(zone)) { > - highmem_size -= zone->free_pages; > + highmem_size -= > + zone_page_state(zone, NR_FREE_PAGES); > } else { > tmp -= zone->free_pages;
Does last line need similar conversion, too? Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html - 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/
| |