Re: linux-next: Tree for October 6

[Pekka Enberg <penberg@cs.helsinki.fi>]

On 6.10.2010 21.12, Christoph Lameter wrote:
> On Wed, 6 Oct 2010, Zimny Lech wrote:
>
>>>> It seems that you forgot to push to repo
>>>> http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=summary
>>>
>>> No, its just that the mirroring was slow/blocked :-(
>>
>> Ok, I pulled latest tree. Thanks.
>>
>> I already reported this before.
>>
>> /home/test/linux-2.6/mm/slub.c: In function 'kmem_cache_init':
>> /home/test/linux-2.6/mm/slub.c:3031:2: error: 'slab_memory_callback'
>> undeclared (first use in this function)
>> /home/test/linux-2.6/mm/slub.c:3031:2: note: each undeclared
>> identifier is reported only once for each function it appears in
>> make[2]: *** [mm/slub.o] Error 1
>> make[1]: *** [mm] Error 2
>> make: *** [sub-make] Error 2
>>
>> any thoughts?
>
>
> Subject: slub: hotplug_memory_notifier not useable for !CONFIG_MEMORY_HOTPLUG
>
> Add #ifdef to resolve the situation.
>
> Signed-off-by: Christoph Lameter<cl@linux.com>
>
> ---
>   mm/slub.c |    2 ++
>   1 file changed, 2 insertions(+)
>
> Index: linux-2.6/mm/slub.c
> ===================================================================
> --- linux-2.6.orig/mm/slub.c	2010-10-06 13:10:00.000000000 -0500
> +++ linux-2.6/mm/slub.c	2010-10-06 13:10:25.000000000 -0500
> @@ -3028,7 +3028,9 @@ void __init kmem_cache_init(void)
>   		sizeof(struct kmem_cache_node),
>   		0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
>
> +#ifdef CONFIG_MEMORY_HOTPLUG
>   	hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
> +#endif
>
>   	/* Able to allocate the per node structures */
>   	slab_state = PARTIAL;

You already acked my patch to fix it:

http://lkml.org/lkml/2010/10/6/194

			Pekka