diff --git a/[refs] b/[refs] index ca6775f0390c..d4c7304f1b6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3474224e6a01924be40a8255636ea5522c1023a +refs/heads/master: d32ddd8f20e7d7a49c45c337c2079be03c77dc41 diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 5bc2ceb692ec..08a9bd91a1aa 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -321,7 +321,8 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node) /* Improve fragment distribution and reduce our average * search time by starting our next search here. (see * Knuth vol 1, sec 2.5, pg 449) */ - if (free_slob_pages.next != prev->next) + if (prev != free_slob_pages.prev && + free_slob_pages.next != prev->next) list_move_tail(&free_slob_pages, prev->next); break; }