Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754674AbZKBLs1 (ORCPT ); Mon, 2 Nov 2009 06:48:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754426AbZKBLs1 (ORCPT ); Mon, 2 Nov 2009 06:48:27 -0500 Received: from ey-out-2122.google.com ([74.125.78.25]:7467 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752304AbZKBLs0 convert rfc822-to-8bit (ORCPT ); Mon, 2 Nov 2009 06:48:26 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=ZqHoZkVFgZkklL+9rFotava8CmY3NVlo9gvYYuPord1/8EwE252lo5Zboss8Ym7XFi EcsPFku3dWHcwzaBNXJ3A/qg3bgY+u8TPwSrvXkVQ8HeUlHHvepjlYJAYqEoL3aTwb1h uVaNV++DvnykL58mXFyCepbZ9GUtzUm8gJ4N0= MIME-Version: 1.0 In-Reply-To: <1257151763-11507-1-git-send-email-jirislaby@gmail.com> References: <4AEE5EA2.6010905@kernel.org> <1257151763-11507-1-git-send-email-jirislaby@gmail.com> Date: Mon, 2 Nov 2009 19:48:30 +0800 Message-ID: Subject: Re: [PATCH 1/1] MM: slqb, fix per_cpu access From: Dave Young To: Jiri Slaby Cc: npiggin@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tejun Heo , Rusty Russell , Christoph Lameter Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2873 Lines: 79 On Mon, Nov 2, 2009 at 4:49 PM, Jiri Slaby wrote: > We cannot use the same local variable name as the declared per_cpu > variable since commit "percpu: remove per_cpu__ prefix." > > Otherwise we would see crashes like: > general protection fault: 0000 [#1] SMP > last sysfs file: > CPU 1 > Modules linked in: > Pid: 1, comm: swapper Tainted: G W 2.6.32-rc5-mm1_64 #860 > RIP: 0010:[] [] start_cpu_timer+0x2b/0x87 > ... > > Use slqb_ prefix for the global variable so that we don't collide > even with the rest of the kernel (s390 and alpha need this). > > Signed-off-by: Jiri Slaby > Cc: Nick Piggin > Cc: Tejun Heo > Cc: Rusty Russell > Cc: Christoph Lameter Tested-by: Dave Young > --- > mm/slqb.c | 10 ++++++---- > 1 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/mm/slqb.c b/mm/slqb.c > index e745d9a..e4bb53f 100644 > --- a/mm/slqb.c > +++ b/mm/slqb.c > @@ -2766,11 +2766,12 @@ out: > schedule_delayed_work(work, round_jiffies_relative(3*HZ)); > } > > -static DEFINE_PER_CPU(struct delayed_work, cache_trim_work); > +static DEFINE_PER_CPU(struct delayed_work, slqb_cache_trim_work); > > static void __cpuinit start_cpu_timer(int cpu) > { > - struct delayed_work *cache_trim_work = &per_cpu(cache_trim_work, cpu); > + struct delayed_work *cache_trim_work = &per_cpu(slqb_cache_trim_work, > + cpu); > > /* > * When this gets called from do_initcalls via cpucache_init(), > @@ -3136,8 +3137,9 @@ static int __cpuinit slab_cpuup_callback(struct notifier_block *nfb, > > case CPU_DOWN_PREPARE: > case CPU_DOWN_PREPARE_FROZEN: > - cancel_rearming_delayed_work(&per_cpu(cache_trim_work, cpu)); > - per_cpu(cache_trim_work, cpu).work.func = NULL; > + cancel_rearming_delayed_work(&per_cpu(slqb_cache_trim_work, > + cpu)); > + per_cpu(slqb_cache_trim_work, cpu).work.func = NULL; > break; > > case CPU_UP_CANCELED: > -- > 1.6.4.2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- Regards dave -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/