Re: 3.2-rc1 and nvidia drivers

[Peter Zijlstra <peterz@infradead.org>]

> I took Peter's patch and ported it to 3.0-rt. Hopefully, I didn't screw
> it up.
> 
> -- Steve
> 
> diff --git a/mm/slab.c b/mm/slab.c
> index 096bf0a..966a8c4 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++) {
> @@ -1752,7 +1753,7 @@ void __init kmem_cache_init_late(void)
>  	mutex_unlock(&cache_chain_mutex);
>  
>  	/* Done! */
> -	g_cpucache_up = FULL;
> +	g_cpucache_up = LATE;
>  
>  	/* Annotate slab for lockdep -- annotate the malloc caches */
>  	init_lock_keys();
> 
> 

You did screw it up.. now g_cpucache_up will never be FULL. It works
much better if you also apply 30765b92 to this tree.