X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fslab.c;h=b1e40dafbab3cc6326a6913acf17155cbcd8e7f0;hb=f3b0cfa9b017a9d4686c9b14b908a1685f97a077;hp=fcae9815d3b35ce951669e8a404fb71b7a40d34f;hpb=00527cc6bbcac05ab7d54c40bda1ff2a0625ab10;p=pandora-kernel.git diff --git a/mm/slab.c b/mm/slab.c index fcae9815d3b3..b1e40dafbab3 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -901,7 +901,7 @@ static int transfer_objects(struct array_cache *to, struct array_cache *from, unsigned int max) { /* Figure out how many entries to transfer */ - int nr = min(min(from->avail, max), to->limit - to->avail); + int nr = min3(from->avail, max, to->limit - to->avail); if (!nr) return 0;