From patchwork Tue Mar 4 21:07:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 326503 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7459E2C0381 for ; Wed, 5 Mar 2014 08:08:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932462AbaCDVIB (ORCPT ); Tue, 4 Mar 2014 16:08:01 -0500 Received: from mail-ie0-f177.google.com ([209.85.223.177]:41018 "EHLO mail-ie0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933013AbaCDVHr (ORCPT ); Tue, 4 Mar 2014 16:07:47 -0500 Received: by mail-ie0-f177.google.com with SMTP id rl12so109891iec.22 for ; Tue, 04 Mar 2014 13:07:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=4jK++tivuiCXS3fMuEA3P8BmPtUwCjNt1WnsxIiJq0Y=; b=Ad6B9xuBtpFtAARDZhH53YfIJYcsGdyzy88t3XjnAZgwE0wZyiwJdnceoWAiVDc1B0 zDEsKPcZWHhxFCU//0oeTaBIOuNlvfz6zJaklidICRfJ0efiUA2F7ButUQIuxPMckACl xvDDURKn7UJ+k3NM6r0nxk9oQKualWWcaNmlgYqfKZgxWwa7ZCHGp0hIzSVqH2JtxkGF yDbvT/z07ED/B3+yjzYnm+CijeVknLxYvVI5ihvlhuOTj33zN1U9i1I4mVHROr/QbUYP 0NmYHvzRDV3d4FLuEBmHFPKLL0dwdLmJfAv9Z460DwenCv+f86XSip6h2kTSJCPFceO4 oGCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=4jK++tivuiCXS3fMuEA3P8BmPtUwCjNt1WnsxIiJq0Y=; b=kCtNFIhf6hI8+HiK1yr9yoxtaHB/C4cnytgNc0PYQSpUU1FU+ECJPcBxP1zhitxLIf I/Qi8GGKavY/l/gk4OVRlUMGcy1ItpN9Ne4g2zuUmFVwHVF88gRPnd4PE0nbWTqUHmVp 4dg3sMdcT/gv7XExeAJIFZzNOwYrp7fft5HemSuwy4LMB5LWjfrjGxTL5uEXQyohZZdT 8zPMftcK17WNAq5wCExB2a0QenVums/pdFsfHzd5L9S2lGSoaGIp4f+Db1WMdGfERYRN c0r3+UjtNWZSbyTM1xIF1kWXkqyq1U5l2VsNTAYWPy2UhGLwaYCz9meyYB8NkolBl16t 0eoA== X-Gm-Message-State: ALoCoQlGaBMWHIeow51aHaadZR5WhpPjLqUz/cTxOvS0bCVOYwqmpuP5sDttOaKk2sif2DRrrh/R1damMQfMTEKDITx7JG2W4G2GNYWzMa/f7PIoo1OAkuyVFlHKRYSPzllxgSQUPXegSRmnp8KAVt2tPnjrNKSPDtH77ZzqXPS8qt8Iwhzp4tne5jso8ChvdLW5vb/KkjKki8MMdHsNaN9z9IE39EpQ4Q== X-Received: by 10.42.54.67 with SMTP id q3mr1502537icg.21.1393967266662; Tue, 04 Mar 2014 13:07:46 -0800 (PST) Received: from localhost ([172.16.49.180]) by mx.google.com with ESMTPSA id dz8sm53557969igb.5.2014.03.04.13.07.44 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Mar 2014 13:07:45 -0800 (PST) Subject: [PATCH 2/2] sparc64: Remove unused sparc64_multi_core To: Peter Zijlstra , Ingo Molnar From: Bjorn Helgaas Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Date: Tue, 04 Mar 2014 14:07:44 -0700 Message-ID: <20140304210744.16893.75929.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140304210621.16893.8772.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140304210621.16893.8772.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Remove sparc64_multi_core because it's not used any more. It was added by a2f9f6bbb30e ("Fix {mc,smt}_capable()"), and the last uses were removed by e637d96bf462 ("sched: Remove unused mc_capable() and smt_capable()"). Signed-off-by: Bjorn Helgaas Acked-by: David S. Miller --- arch/sparc/include/asm/smp_64.h | 1 - arch/sparc/kernel/mdesc.c | 4 ---- arch/sparc/kernel/prom_64.c | 3 --- arch/sparc/kernel/smp_64.c | 2 -- 4 files changed, 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sparc/include/asm/smp_64.h b/arch/sparc/include/asm/smp_64.h index dd3bef4b9896..05710393959f 100644 --- a/arch/sparc/include/asm/smp_64.h +++ b/arch/sparc/include/asm/smp_64.h @@ -32,7 +32,6 @@ DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); extern cpumask_t cpu_core_map[NR_CPUS]; -extern int sparc64_multi_core; extern void arch_send_call_function_single_ipi(int cpu); extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c index b90bf23e3aab..a1a4400d4025 100644 --- a/arch/sparc/kernel/mdesc.c +++ b/arch/sparc/kernel/mdesc.c @@ -896,10 +896,6 @@ void mdesc_fill_in_cpu_data(cpumask_t *mask) mdesc_iterate_over_cpus(fill_in_one_cpu, NULL, mask); -#ifdef CONFIG_SMP - sparc64_multi_core = 1; -#endif - hp = mdesc_grab(); set_core_ids(hp); diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c index 6b39125eb927..9a690d39c01b 100644 --- a/arch/sparc/kernel/prom_64.c +++ b/arch/sparc/kernel/prom_64.c @@ -555,9 +555,6 @@ static void *fill_in_one_cpu(struct device_node *dp, int cpuid, int arg) cpu_data(cpuid).core_id = portid + 1; cpu_data(cpuid).proc_id = portid; -#ifdef CONFIG_SMP - sparc64_multi_core = 1; -#endif } else { cpu_data(cpuid).dcache_size = of_getintprop_default(dp, "dcache-size", 16 * 1024); diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index b085311dcd0e..9781048161ab 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c @@ -53,8 +53,6 @@ #include "cpumap.h" -int sparc64_multi_core __read_mostly; - DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE; cpumask_t cpu_core_map[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = CPU_MASK_NONE };