Re: linux-next: Tree for August 25 (mm/slub)

Randy Dunlap
2010-08-25T20:13:44Z

On Wed, 25 Aug 2010 14:51:14 -0500 (CDT) Christoph Lameter wrote:

> On Wed, 25 Aug 2010, Randy Dunlap wrote:
>
> > Certainly. config file is attached.
>
> Ah. Memory hotplug....
>
>
>
> Subject: Slub: Fix up missing kmalloc_cache -> kmem_cache_node case for memoryhotplug
>
> Memory hotplug allocates and frees per node structures. Use the correct name.
>
> Signed-off-by: Christoph Lameter <cl@linux.com>

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks.

> ---
> mm/slub.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-2.6/mm/slub.c
> ===================================================================
> --- linux-2.6.orig/mm/slub.c 2010-08-25 14:48:23.000000000 -0500
> +++ linux-2.6/mm/slub.c 2010-08-25 14:49:03.000000000 -0500
> @@ -2909,7 +2909,7 @@ static void slab_mem_offline_callback(vo
> BUG_ON(slabs_node(s, offline_node));
>
> s->node[offline_node] = NULL;
> - kmem_cache_free(kmalloc_caches, n);
> + kmem_cache_free(kmem_cache_node, n);
> }
> }
> up_read(&slub_lock);
> @@ -2942,7 +2942,7 @@ static int slab_mem_going_online_callbac
> * since memory is not yet available from the node that
> * is brought up.
> */
> - n = kmem_cache_alloc(kmalloc_caches, GFP_KERNEL);
> + n = kmem_cache_alloc(kmem_cache_node, GFP_KERNEL);
> if (!n) {
> ret = -ENOMEM;
> goto out;

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***