diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
| commit | 8423200553113cc031caa9b147f6150a8e26545c (patch) | |
| tree | 752c93a200c9ba056c7469c96f7e27d02c99291d /mm/page_alloc.c | |
| parent | f03e64f2ca6ee3d0b7824536b1940497701fe766 (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index fc5b5442e942..2c606cc922a5 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -989,8 +989,7 @@ int zone_watermark_ok(struct zone *z, int order, unsigned long mark, | |||
| 989 | int classzone_idx, int alloc_flags) | 989 | int classzone_idx, int alloc_flags) |
| 990 | { | 990 | { |
| 991 | /* free_pages my go negative - that's OK */ | 991 | /* free_pages my go negative - that's OK */ |
| 992 | unsigned long min = mark; | 992 | long min = mark, free_pages = z->free_pages - (1 << order) + 1; |
| 993 | long free_pages = z->free_pages - (1 << order) + 1; | ||
| 994 | int o; | 993 | int o; |
| 995 | 994 | ||
| 996 | if (alloc_flags & ALLOC_HIGH) | 995 | if (alloc_flags & ALLOC_HIGH) |