From: Preeti U Murthy <preeti@linux.vnet.ibm.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
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
Subject: Re: [PATCH 1/2] sched: Remove unused mc_capable() and smt_capable()
Date: Thu, 06 Mar 2014 02:32:11 +0000 [thread overview]
Message-ID: <5317DB5B.60109@linux.vnet.ibm.com> (raw)
In-Reply-To: <20140304210737.16893.54289.stgit@bhelgaas-glaptop.roam.corp.google.com>
On 03/05/2014 02:37 AM, Bjorn Helgaas wrote:
> 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 <bhelgaas@google.com>
> ---
> 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 <topology.h>
>
> -#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 <asm/cputable.h>
> -#define smt_capable() (cpu_has_feature(CPU_FTR_SMT))
>
> #ifdef CONFIG_PPC64
> #include <asm/smp.h>
> 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);
>
Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
WARNING: multiple messages have this Message-ID (diff)
From: Preeti U Murthy <preeti@linux.vnet.ibm.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
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
Subject: Re: [PATCH 1/2] sched: Remove unused mc_capable() and smt_capable()
Date: Thu, 06 Mar 2014 07:50:11 +0530 [thread overview]
Message-ID: <5317DB5B.60109@linux.vnet.ibm.com> (raw)
In-Reply-To: <20140304210737.16893.54289.stgit@bhelgaas-glaptop.roam.corp.google.com>
On 03/05/2014 02:37 AM, Bjorn Helgaas wrote:
> 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 <bhelgaas@google.com>
> ---
> 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 <topology.h>
>
> -#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 <asm/cputable.h>
> -#define smt_capable() (cpu_has_feature(CPU_FTR_SMT))
>
> #ifdef CONFIG_PPC64
> #include <asm/smp.h>
> 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);
>
Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
WARNING: multiple messages have this Message-ID (diff)
From: Preeti U Murthy <preeti@linux.vnet.ibm.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org,
Ingo Molnar <mingo@redhat.com>,
sparclinux@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 1/2] sched: Remove unused mc_capable() and smt_capable()
Date: Thu, 06 Mar 2014 07:50:11 +0530 [thread overview]
Message-ID: <5317DB5B.60109@linux.vnet.ibm.com> (raw)
In-Reply-To: <20140304210737.16893.54289.stgit@bhelgaas-glaptop.roam.corp.google.com>
On 03/05/2014 02:37 AM, Bjorn Helgaas wrote:
> 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 <bhelgaas@google.com>
> ---
> 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 <topology.h>
>
> -#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 <asm/cputable.h>
> -#define smt_capable() (cpu_has_feature(CPU_FTR_SMT))
>
> #ifdef CONFIG_PPC64
> #include <asm/smp.h>
> 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);
>
Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
WARNING: multiple messages have this Message-ID (diff)
From: Preeti U Murthy <preeti@linux.vnet.ibm.com>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 1/2] sched: Remove unused mc_capable() and smt_capable()
Date: Thu, 06 Mar 2014 02:32:11 +0000 [thread overview]
Message-ID: <5317DB5B.60109@linux.vnet.ibm.com> (raw)
In-Reply-To: <20140304210737.16893.54289.stgit@bhelgaas-glaptop.roam.corp.google.com>
On 03/05/2014 02:37 AM, Bjorn Helgaas wrote:
> 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 <bhelgaas@google.com>
> ---
> 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 <topology.h>
>
> -#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 <asm/cputable.h>
> -#define smt_capable() (cpu_has_feature(CPU_FTR_SMT))
>
> #ifdef CONFIG_PPC64
> #include <asm/smp.h>
> 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);
>
Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
WARNING: multiple messages have this Message-ID (diff)
From: preeti@linux.vnet.ibm.com (Preeti U Murthy)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] sched: Remove unused mc_capable() and smt_capable()
Date: Thu, 06 Mar 2014 07:50:11 +0530 [thread overview]
Message-ID: <5317DB5B.60109@linux.vnet.ibm.com> (raw)
In-Reply-To: <20140304210737.16893.54289.stgit@bhelgaas-glaptop.roam.corp.google.com>
On 03/05/2014 02:37 AM, Bjorn Helgaas wrote:
> 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 <bhelgaas@google.com>
> ---
> 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 <topology.h>
>
> -#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 <asm/cputable.h>
> -#define smt_capable() (cpu_has_feature(CPU_FTR_SMT))
>
> #ifdef CONFIG_PPC64
> #include <asm/smp.h>
> 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);
>
Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
next prev parent reply other threads:[~2014-03-06 2:32 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 21:07 [PATCH 0/2] sched: Removed unused mc_capable() and smt_capable() Bjorn Helgaas
2014-03-04 21:07 ` Bjorn Helgaas
2014-03-04 21:07 ` Bjorn Helgaas
2014-03-04 21:07 ` Bjorn Helgaas
2014-03-04 21:07 ` [PATCH 1/2] sched: Remove " Bjorn Helgaas
2014-03-04 21:07 ` Bjorn Helgaas
2014-03-04 21:07 ` Bjorn Helgaas
2014-03-04 21:07 ` Bjorn Helgaas
2014-03-04 21:47 ` David Miller
2014-03-04 21:47 ` David Miller
2014-03-04 21:47 ` David Miller
2014-03-04 21:47 ` David Miller
2014-03-04 21:47 ` David Miller
2014-03-04 22:12 ` Thomas Gleixner
2014-03-04 22:12 ` Thomas Gleixner
2014-03-04 22:12 ` Thomas Gleixner
2014-03-04 22:12 ` Thomas Gleixner
2014-03-04 22:12 ` Thomas Gleixner
2014-03-05 4:36 ` Benjamin Herrenschmidt
2014-03-05 4:36 ` Benjamin Herrenschmidt
2014-03-05 4:36 ` Benjamin Herrenschmidt
2014-03-05 4:36 ` Benjamin Herrenschmidt
2014-03-05 4:36 ` Benjamin Herrenschmidt
2014-03-06 2:20 ` Preeti U Murthy [this message]
2014-03-06 2:32 ` Preeti U Murthy
2014-03-06 2:32 ` Preeti U Murthy
2014-03-06 2:20 ` Preeti U Murthy
2014-03-06 2:20 ` Preeti U Murthy
2014-03-11 12:40 ` [tip:sched/core] " tip-bot for Bjorn Helgaas
2014-03-04 21:07 ` [PATCH 2/2] sparc64: Remove unused sparc64_multi_core Bjorn Helgaas
2014-03-04 21:07 ` Bjorn Helgaas
2014-03-04 21:07 ` Bjorn Helgaas
2014-03-04 21:07 ` Bjorn Helgaas
2014-03-04 21:48 ` David Miller
2014-03-04 21:48 ` David Miller
2014-03-04 21:48 ` David Miller
2014-03-04 21:48 ` David Miller
2014-03-04 21:48 ` David Miller
2014-03-11 12:40 ` [tip:sched/core] sparc64, sched: " tip-bot for Bjorn Helgaas
2014-03-05 11:16 ` [PATCH 0/2] sched: Removed unused mc_capable() and smt_capable() Peter Zijlstra
2014-03-05 11:16 ` Peter Zijlstra
2014-03-05 11:16 ` Peter Zijlstra
2014-03-05 11:16 ` Peter Zijlstra
2014-03-05 11:16 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5317DB5B.60109@linux.vnet.ibm.com \
--to=preeti@linux.vnet.ibm.com \
--cc=bhelgaas@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.