From: tip-bot for Bjorn Helgaas <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
bhelgaas@google.com, peterz@infradead.org, tglx@linutronix.de,
davem@davemloft.net
Subject: [tip:sched/core] sparc64, sched: Remove unused sparc64_multi_core
Date: Tue, 11 Mar 2014 05:40:37 -0700 [thread overview]
Message-ID: <tip-070826820daf423eee83ee4e90bf3daf2cdd85c2@git.kernel.org> (raw)
In-Reply-To: <20140304210744.16893.75929.stgit@bhelgaas-glaptop.roam.corp.google.com>
Commit-ID: 070826820daf423eee83ee4e90bf3daf2cdd85c2
Gitweb: http://git.kernel.org/tip/070826820daf423eee83ee4e90bf3daf2cdd85c2
Author: Bjorn Helgaas <bhelgaas@google.com>
AuthorDate: Tue, 4 Mar 2014 14:07:44 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 11 Mar 2014 12:05:47 +0100
sparc64, sched: Remove unused sparc64_multi_core
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 <bhelgaas@google.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: David S. Miller <davem@davemloft.net>
Link: http://lkml.kernel.org/r/20140304210744.16893.75929.stgit@bhelgaas-glaptop.roam.corp.google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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 dd3bef4..0571039 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 b90bf23..a1a4400 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 6b39125..9a690d3 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 b085311..9781048 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 };
next prev parent reply other threads:[~2014-03-11 12:41 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
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-bot for Bjorn Helgaas [this message]
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=tip-070826820daf423eee83ee4e90bf3daf2cdd85c2@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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.