Re: 3.2-rc1 and nvidia drivers

[Thomas Schauss <schauss@tum.de>]

On 11/30/2011 03:31 PM, Steven Rostedt wrote:
> Thomas (Schauss),
>
> Can you try this patch. It has both patches that Peter pointed to
> applied.
>
> Thanks,
>
> -- Steve
>
> diff --git a/mm/slab.c b/mm/slab.c
> index 096bf0a..86a8dec 100644
> --- a/mm/slab.c
> +++ b/mm/slab.c
> @@ -764,6 +764,7 @@ static enum {
>   	PARTIAL_AC,
>   	PARTIAL_L3,
>   	EARLY,
> +	LATE,
>   	FULL
>   } g_cpucache_up;
>
> @@ -795,7 +796,7 @@ static void init_node_lock_keys(int q)
>   {
>   	struct cache_sizes *s = malloc_sizes;
>
> -	if (g_cpucache_up != FULL)
> +	if (g_cpucache_up<  LATE)
>   		return;
>
>   	for (s = malloc_sizes; s->cs_size != ULONG_MAX; s++) {
> @@ -1744,6 +1745,11 @@ void __init kmem_cache_init_late(void)
>   {
>   	struct kmem_cache *cachep;
>
> +	g_cpucache_up = LATE;
> +
> +	/* Annotate slab for lockdep -- annotate the malloc caches */
> +	init_lock_keys();
> +
>   	/* 6) resize the head arrays to their final sizes */
>   	mutex_lock(&cache_chain_mutex);
>   	list_for_each_entry(cachep,&cache_chain, next)
> @@ -1754,9 +1760,6 @@ void __init kmem_cache_init_late(void)
>   	/* Done! */
>   	g_cpucache_up = FULL;
>
> -	/* Annotate slab for lockdep -- annotate the malloc caches */
> -	init_lock_keys();
> -
>   	/*
>   	 * Register a cpu startup notifier callback that initializes
>   	 * cpu_cache_get for all new cpus

Hello,

I will test this but can only do so on Friday.

On 3.0.9-rt25 (which I have been using here) patch 30765b92 is already 
applied. And it is also present in patch-3.0.10-rt27.patch.

So the original patch from Peter 
(http://article.gmane.org/gmane.linux.kernel.mm/70863/match=) applies 
cleanly here.

Regards,
Thomas