From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Feb 2012 23:53:03 +0100 (CET) Received: from mail-pw0-f49.google.com ([209.85.160.49]:58142 "EHLO mail-pw0-f49.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903642Ab2BNWw4 (ORCPT ); Tue, 14 Feb 2012 23:52:56 +0100 Received: by pbcun1 with SMTP id un1so1017264pbc.36 for ; Tue, 14 Feb 2012 14:52:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=gamma; h=mime-version:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=G1uOMzHgzzP7ZeAyvXYF0gGf+HQmOoIOsfXAlX0EVpI=; b=y8rVfgFMJ803msfIH96qh8JPSFAMFr1rbrxpWvullywNL2bM8yd92VHKIEjiMTKi/C +0YwQDFfXaCWYnGqGrrnjWaZXmJVO+uXuc3OjN2jqV+1Zdmj8CN3bkq3sBea4rc8NxG2 M+9aw25Ejr0Tgbzaqiin8DoWQbr63wU5yueM4= MIME-Version: 1.0 Received: by 10.68.231.201 with SMTP id ti9mr63646675pbc.73.1329259970617; Tue, 14 Feb 2012 14:52:50 -0800 (PST) Received: by 10.68.231.201 with SMTP id ti9mr63646609pbc.73.1329259970460; Tue, 14 Feb 2012 14:52:50 -0800 (PST) Received: from tippy.mtv.corp.google.com (tippy.mtv.corp.google.com [172.18.96.130]) by mx.google.com with ESMTPS id y9sm6426972pbi.3.2012.02.14.14.52.48 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Feb 2012 14:52:49 -0800 (PST) From: Venkatesh Pallipadi To: Rusty Russell Cc: Tony Luck , "Srivatsa S. Bhat" , Andrew Morton , KOSAKI Motohiro , KOSAKI Motohiro , Mike Travis , "Paul E. McKenney" , "Rafael J. Wysocki" , Paul Gortmaker , linux-kernel@vger.kernel.org, Richard Kuo , linux-hexagon@vger.kernel.org, Ralf Baechle , linux-mips@linux-mips.org, Jeff Dike , Richard Weinberger , user-mode-linux-devel@lists.sourceforge.net, Venkatesh Pallipadi Subject: [PATCH 3/3] um: Avoid raw handling of cpu_online_map Date: Tue, 14 Feb 2012 14:49:44 -0800 Message-Id: <1329259784-20592-4-git-send-email-venki@google.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1329259784-20592-1-git-send-email-venki@google.com> References: <87wr7pbwbz.fsf@rustcorp.com.au> <1329259784-20592-1-git-send-email-venki@google.com> X-Gm-Message-State: ALoCoQkpJpCkjOUXzOq5LnZnamNu3ej5wSfHFgQSi6glhLrvZDc0yUVz3et2KHtUarlC6Eef6yvz5zYcOHzonfSqAwBKQ6giQA1BkXnzQk7AYy22T1f3Ek261a+MJ5CbrYep742/cB4uLSiSokeKQUHsKwpHr0EkAVTMTBWgED8HJnnNmkbn2X4= X-archive-position: 32428 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: venki@google.com Precedence: bulk X-list: linux-mips Return-Path: Use init_cpu_online and set_cpu_online instead. Signed-off-by: Venkatesh Pallipadi --- arch/um/kernel/skas/process.c | 2 +- arch/um/kernel/smp.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c index 2e9852c..5daa0f5 100644 --- a/arch/um/kernel/skas/process.c +++ b/arch/um/kernel/skas/process.c @@ -41,7 +41,7 @@ static int __init start_kernel_proc(void *unused) cpu_tasks[0].pid = pid; cpu_tasks[0].task = current; #ifdef CONFIG_SMP - cpu_online_map = cpumask_of_cpu(0); + init_cpu_online(cpumask_of(0)); #endif start_kernel(); return 0; diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index 155206a..b5d2ca9 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c @@ -76,7 +76,7 @@ static int idle_proc(void *cpup) cpu_relax(); notify_cpu_starting(cpu); - cpu_set(cpu, cpu_online_map); + set_cpu_online(cpu, true); default_idle(); return 0; } @@ -110,8 +110,8 @@ void smp_prepare_cpus(unsigned int maxcpus) for (i = 0; i < ncpus; ++i) set_cpu_possible(i, true); - cpu_clear(me, cpu_online_map); - cpu_set(me, cpu_online_map); + set_cpu_online(me, false); + set_cpu_online(me, true); cpu_set(me, cpu_callin_map); err = os_pipe(cpu_data[me].ipi_pipe, 1, 1); @@ -138,7 +138,7 @@ void smp_prepare_cpus(unsigned int maxcpus) void smp_prepare_boot_cpu(void) { - cpu_set(smp_processor_id(), cpu_online_map); + set_cpu_online(smp_processor_id(), true); } int __cpu_up(unsigned int cpu) -- 1.7.7.3