From patchwork Tue Mar 4 21:07:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3767811 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 57B37BF13A for ; Tue, 4 Mar 2014 21:08:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 659B120237 for ; Tue, 4 Mar 2014 21:08:54 +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 2FD032022D for ; Tue, 4 Mar 2014 21:08:53 +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 1WKwZY-0002yB-00; Tue, 04 Mar 2014 21:08:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKwZR-0004bd-7b; Tue, 04 Mar 2014 21:08:13 +0000 Received: from mail-ie0-x22e.google.com ([2607:f8b0:4001:c03::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKwZF-0004YR-6l for linux-arm-kernel@lists.infradead.org; Tue, 04 Mar 2014 21:08:01 +0000 Received: by mail-ie0-f174.google.com with SMTP id rp18so110378iec.5 for ; Tue, 04 Mar 2014 13:07:40 -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=fSZ+FbvWAnYHF30y9n/+7+iEs9DzHxQQN704PrDyoac=; b=c1JMSqwQhYPqL51SwRoFpE+fFlQ+EfJPGel8HqL4wFnHyYgh+xpuaCDiAcgqctaB99 IVZiVwDGxX1rYRYiy8MY/z1nq9pZPL1jNRP9r9JSugx0ot4kMIJY5hJm/iSDL2+p0xiP soWY6b2D3B35bESfuwWjk8n4LvSWYOsXJ2wed//qlqEi08CErBolRFAGI3DiFh9ZCDeJ oSMG3j7Bv2vGrmbzKKVBKtYyW0PV5o0VAmYgK6JxLbTayn6Wf+B/aDj43WXQuuM+5UXu KVG/26NUtjCJOGoEWy6fUYWE7HXQdoO20APPLFZqjrXcdMYRiLAwZtbu/K5tCukhewgG HW6w== 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=fSZ+FbvWAnYHF30y9n/+7+iEs9DzHxQQN704PrDyoac=; b=UO+u/BUoxElR7qw/z3Lhj5novtNjjv94BgERRByEX1tUaaDt8qSi6TlTMppmRUPbCJ reTVuM5ysqKev0Dch4OodvW6z5M1tOUrvBdbD2Ej+yoH9anXTpiqoI86VbFlw9JK6ld/ YPPu2XvrnPjoNYZeoUa0F2WkDvBykVHZGj+/LNVAPw3StpU722w6c+JyUQ2dyavJaB4v pI1IqmAqopY5Sllq+bs1IFEDmm50RRkT5PPFrTMkqjZEWFVwLx6Wxub0Yu3dwuF6tcee M+XoOCaj47BjfuO/Zo9jzQSlaFu31im22iOcWKd1xYagltq6RbHuC8q4iRe8LEcz4qe0 0yeQ== X-Gm-Message-State: ALoCoQl2DFUvNU1uyHbafsLbb049gB2mDNkQqePLFz+SK4oXvHeNH+RR5vPU69PUcewgbq3nyCwlSbAtw5RD+9MiIkj7SApx2PSzjwiCyKrufpXie2LeY1cEwmpwsc9M3qbOftX3pzNam0KimFvClbtUxJpG9AZAN8GWTx4ty0od5Qwu6xRIr9YDkidjF/iO4SdsHlke0mkvWheUXuBrzZmo1vShdfHPuw== X-Received: by 10.50.78.229 with SMTP id e5mr30708180igx.24.1393967259102; Tue, 04 Mar 2014 13:07:39 -0800 (PST) Received: from localhost ([172.16.49.180]) by mx.google.com with ESMTPSA id r4sm53578317igh.1.2014.03.04.13.07.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Mar 2014 13:07:38 -0800 (PST) Subject: [PATCH 1/2] sched: Remove unused mc_capable() and smt_capable() To: Peter Zijlstra , Ingo Molnar From: Bjorn Helgaas Date: Tue, 04 Mar 2014 14:07:37 -0700 Message-ID: <20140304210737.16893.54289.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_160801_298688_553D53AC X-CRM114-Status: GOOD ( 11.12 ) 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 mc_capable() and smt_capable(). Neither is used. Both were added by 5c45bf279d37 ("sched: mc/smt power savings sched policy"). Uses of both were removed by 8e7fbcbc22c1 ("sched: Remove stale power aware scheduling remnants and dysfunctional knobs"). Signed-off-by: Bjorn Helgaas Acked-by: David S. Miller Acked-by: Thomas Gleixner Acked-by: Benjamin Herrenschmidt Reviewed-by: Preeti U Murthy --- arch/arm/include/asm/topology.h | 3 --- arch/ia64/include/asm/topology.h | 1 - arch/mips/include/asm/topology.h | 4 ---- arch/powerpc/include/asm/topology.h | 1 - arch/sparc/include/asm/topology_64.h | 2 -- arch/x86/include/asm/topology.h | 6 ------ 6 files changed, 17 deletions(-) diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h index 58b8b84adcd2..2fe85fff5cca 100644 --- a/arch/arm/include/asm/topology.h +++ b/arch/arm/include/asm/topology.h @@ -20,9 +20,6 @@ extern struct cputopo_arm cpu_topology[NR_CPUS]; #define topology_core_cpumask(cpu) (&cpu_topology[cpu].core_sibling) #define topology_thread_cpumask(cpu) (&cpu_topology[cpu].thread_sibling) -#define mc_capable() (cpu_topology[0].socket_id != -1) -#define smt_capable() (cpu_topology[0].thread_id != -1) - void init_cpu_topology(void); void store_cpu_topology(unsigned int cpuid); const struct cpumask *cpu_coregroup_mask(int cpu); diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index a2496e449b75..5cb55a1e606b 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h @@ -77,7 +77,6 @@ void build_cpu_to_node_map(void); #define topology_core_id(cpu) (cpu_data(cpu)->core_id) #define topology_core_cpumask(cpu) (&cpu_core_map[cpu]) #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) -#define smt_capable() (smp_num_siblings > 1) #endif extern void arch_fix_phys_package_id(int num, u32 slot); diff --git a/arch/mips/include/asm/topology.h b/arch/mips/include/asm/topology.h index 12609a17dc8b..20ea4859c822 100644 --- a/arch/mips/include/asm/topology.h +++ b/arch/mips/include/asm/topology.h @@ -10,8 +10,4 @@ #include -#ifdef CONFIG_SMP -#define smt_capable() (smp_num_siblings > 1) -#endif - #endif /* __ASM_TOPOLOGY_H */ diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index d0b5fca6b077..c9202151079f 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h @@ -99,7 +99,6 @@ static inline int prrn_is_enabled(void) #ifdef CONFIG_SMP #include -#define smt_capable() (cpu_has_feature(CPU_FTR_SMT)) #ifdef CONFIG_PPC64 #include diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h index 1754390a426f..a2d10fc64faf 100644 --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h @@ -42,8 +42,6 @@ static inline int pcibus_to_node(struct pci_bus *pbus) #define topology_core_id(cpu) (cpu_data(cpu).core_id) #define topology_core_cpumask(cpu) (&cpu_core_map[cpu]) #define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) -#define mc_capable() (sparc64_multi_core) -#define smt_capable() (sparc64_multi_core) #endif /* CONFIG_SMP */ extern cpumask_t cpu_core_map[NR_CPUS]; diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index d35f24e231cd..9bcc724cafdd 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -133,12 +133,6 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) struct pci_bus; void x86_pci_root_bus_resources(int bus, struct list_head *resources); -#ifdef CONFIG_SMP -#define mc_capable() ((boot_cpu_data.x86_max_cores > 1) && \ - (cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids)) -#define smt_capable() (smp_num_siblings > 1) -#endif - #ifdef CONFIG_NUMA extern int get_mp_bus_to_node(int busnum); extern void set_mp_bus_to_node(int busnum, int node);