From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Schauss Subject: Re: 3.2-rc1 and nvidia drivers Date: Wed, 30 Nov 2011 16:07:29 +0100 Message-ID: <4ED646B1.4020508@tum.de> References: <4EC384FD.1040106@tum.de> <4ED35D9A.7090401@tum.de> <1322620613.17003.110.camel@frodo> <1322651681.2921.247.camel@twins> <1322662465.17003.117.camel@frodo> <1322662578.2921.275.camel@twins> <1322663502.17003.121.camel@frodo> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: Peter Zijlstra , John Kacur , Thomas Gleixner , RT To: Steven Rostedt Return-path: Received: from mailrelay1.lrz-muenchen.de ([129.187.254.106]:55735 "EHLO mailrelay1.lrz-muenchen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752176Ab1K3PHo (ORCPT ); Wed, 30 Nov 2011 10:07:44 -0500 In-Reply-To: <1322663502.17003.121.camel@frodo> Sender: linux-rt-users-owner@vger.kernel.org List-ID: 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