diff --git a/[refs] b/[refs] index 180f249f48bd..ffe6e9d0b8da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12d79634f8d7af5229b7d21143d50e7cf7d94177 +refs/heads/master: 9f26490412cf15b04ac8f44a512ba0b09e774576 diff --git a/trunk/include/linux/slub_def.h b/trunk/include/linux/slub_def.h index 4890ef79d752..a32bcfdc7834 100644 --- a/trunk/include/linux/slub_def.h +++ b/trunk/include/linux/slub_def.h @@ -82,7 +82,7 @@ struct kmem_cache { int size; /* The size of an object including meta data */ int objsize; /* The size of an object without meta data */ int offset; /* Free pointer offset. */ - int cpu_partial; /* Number of per cpu partial pages to keep around */ + int cpu_partial; /* Number of per cpu partial objects to keep around */ struct kmem_cache_order_objects oo; /* Allocation and freeing of slabs */ diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 4982fb5c91de..8f687575d310 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -3084,7 +3084,7 @@ static int kmem_cache_open(struct kmem_cache *s, * * A) The number of objects from per cpu partial slabs dumped to the * per node list when we reach the limit. - * B) The number of objects in partial partial slabs to extract from the + * B) The number of objects in cpu partial slabs to extract from the * per node list when we run out of per cpu objects. We only fetch 50% * to keep some capacity around for frees. */