Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6fd6b17c6d9713f56b5f20903ec3e00fa6cc435e
Commit:     6fd6b17c6d9713f56b5f20903ec3e00fa6cc435e
Parent:     f56df2f4db6e4af87fb8e941cff69f4501a111df
Author:     Linus Torvalds <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 31 16:43:36 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Jan 31 16:46:40 2007 -0800

    Revert "[PATCH] mm: micro optimise zone_watermark_ok"
    
    This reverts commit e80ee884ae0e3794ef2b65a18a767d502ad712ee.
    
    Pawel Sikora had a boot-time oops due to it - because the sign change
    invalidates the following comparisons, since 'free_pages' can be
    negative.
    
    The micro-optimization just isn't worth it.
    
    Bisected-by: Pawel Sikora <[EMAIL PROTECTED]>
    Acked-by: Andrew Morton <[EMAIL PROTECTED]>
    Cc: Nick Piggin <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 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 fc5b544..2c606cc 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,
                      int classzone_idx, int alloc_flags)
 {
        /* free_pages my go negative - that's OK */
-       unsigned long min = mark;
-       long free_pages = z->free_pages - (1 << order) + 1;
+       long min = mark, free_pages = z->free_pages - (1 << order) + 1;
        int o;
 
        if (alloc_flags & ALLOC_HIGH)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to