diff options
author | Nick Piggin <nickpiggin@yahoo.com.au> | 2006-10-04 05:15:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:12 -0400 |
commit | e80ee884ae0e3794ef2b65a18a767d502ad712ee (patch) | |
tree | 6e5704f603d1596df930bc22f5e926cc50550102 /mm | |
parent | b2abacf3a2699a8020829c85c16f358ba85cecaf (diff) |
[PATCH] mm: micro optimise zone_watermark_ok
Having min be a signed quantity means gcc can't turn high latency divides
into shifts. There happen to be two such divides for GFP_ATOMIC (ie.
networking, ie. important) allocations, one of which depends on the other.
Fixing this makes code smaller as a bonus.
Shame on somebody (probably me).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4f59d90b81e6..b5468de49869 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -900,7 +900,8 @@ int zone_watermark_ok(struct zone *z, int order, unsigned long mark, | |||
900 | int classzone_idx, int alloc_flags) | 900 | int classzone_idx, int alloc_flags) |
901 | { | 901 | { |
902 | /* free_pages my go negative - that's OK */ | 902 | /* free_pages my go negative - that's OK */ |
903 | long min = mark, free_pages = z->free_pages - (1 << order) + 1; | 903 | unsigned long min = mark; |
904 | long free_pages = z->free_pages - (1 << order) + 1; | ||
904 | int o; | 905 | int o; |
905 | 906 | ||
906 | if (alloc_flags & ALLOC_HIGH) | 907 | if (alloc_flags & ALLOC_HIGH) |