git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
mm
/
slab.c
diff --git
a/mm/slab.c
b/mm/slab.c
index
fcae981
..
b1e40da
100644
(file)
--- 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 */
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 = min
3(from->avail, max
, to->limit - to->avail);
if (!nr)
return 0;
if (!nr)
return 0;