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: 3767831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 86478BF13A for ; Tue, 4 Mar 2014 21:09:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B17192022A for ; Tue, 4 Mar 2014 21:09:18 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C5BD720225 for ; Tue, 4 Mar 2014 21:09:17 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKwZh-00034i-Mi; Tue, 04 Mar 2014 21:08:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKwZY-0004cg-Ap; Tue, 04 Mar 2014 21:08:20 +0000 Received: from mail-ig0-x230.google.com ([2607:f8b0:4001:c05::230]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKwZL-0004Z1-ST for linux-arm-kernel@lists.infradead.org; Tue, 04 Mar 2014 21:08:10 +0000 Received: by mail-ig0-f176.google.com with SMTP id uy17so11496428igb.3 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=YzIpoD6jYP9mxuD+R9x7GVQo91Lfzy7jE92ZAV+WTEZTXdcUx48Kym/Mx/W2s7swut TVmXAcZQMI6b3Q4/Yrh0686fML/oRSaeJiFVYBzIDJvdRLTXGlygzKTMBVFa+U38qhHe E9K0s3MkU9Mn3C6eDQgy35OBhE/TKCV6Uk0tLXOkU14XUrmi3R+MixzOn3EZwpJJRj2d QzIJZfZ4CSW1JlP1U8kf7YuhLBmdxy+jSZzD/Lrmw0tB516Gf2xwqwE1BOAQtzc+aDq3 whEHwqBo7fRDxqGJiWhCBYtnRh6AI/u4PgVr7plR2zTPBfsu820LsMeAOLuCr1pKhOKO 4Yxg== X-Gm-Message-State: ALoCoQnLOXehcrRjI3Ucw2GVfcQA62I/FL6zQj/lYxPs+Hjvt4W878IFjS5aEOCAWwKgtkCJIttrRcPM70tVpsX3E6Qg5pBqPHyDCxW2qdocmCeEn4ROYR5OtAnknpuNKGT+rkLOsJdmZJROFJ0JlsvRfStID7VpJz0I48IS3LnbgPreirtpT1hfAXB98DjuTt46/km1DHXEZSk6nMTD+j4ashfnSJn8kQ== 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140304_160808_087248_FD05253F X-CRM114-Status: GOOD ( 10.77 ) X-Spam-Score: -2.0 (--) 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 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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 };