From: Grant Likely <grant.likely@secretlab.ca>
To: linuxppc-dev@lists.ozlabs.org,
devicetree-discuss@lists.ozlabs.org, sparclinux@vger.kernel.org,
microblaze-uclinux@itee.uq.edu.au, benh@kernel.crashing.org,
sfr@canb.auug.org.au, davem@davemloft.net, monstr@monstr.eu
Subject: [PATCH 10/11] microblaze: gut implementation of early_init_dt_scan_cpus()
Date: Tue, 24 Nov 2009 01:19:52 -0700 [thread overview]
Message-ID: <20091124081944.6216.41834.stgit@angua> (raw)
In-Reply-To: <20091124081316.6216.66310.stgit@angua>
Microblaze only has one CPU, it isn't SMP at all. This function is
effectively just a no-op, so remove it.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
arch/microblaze/kernel/prom.c | 54 -----------------------------------------
1 files changed, 0 insertions(+), 54 deletions(-)
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 8c00457..1f79e4d 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -50,60 +50,6 @@ struct device_node *of_chosen;
int __init early_init_dt_scan_cpus(unsigned long node, const char *uname,
int depth, void *data)
{
- static int logical_cpuid;
- char *type = of_get_flat_dt_prop(node, "device_type", NULL);
- const u32 *intserv;
- int i, nthreads;
- int found = 0;
-
- /* We are scanning "cpu" nodes only */
- if (type == NULL || strcmp(type, "cpu") != 0)
- return 0;
-
- /* Get physical cpuid */
- intserv = of_get_flat_dt_prop(node, "reg", NULL);
- nthreads = 1;
-
- /*
- * Now see if any of these threads match our boot cpu.
- * NOTE: This must match the parsing done in smp_setup_cpu_maps.
- */
- for (i = 0; i < nthreads; i++) {
- /*
- * version 2 of the kexec param format adds the phys cpuid of
- * booted proc.
- */
- if (initial_boot_params && initial_boot_params->version >= 2) {
- if (intserv[i] ==
- initial_boot_params->boot_cpuid_phys) {
- found = 1;
- break;
- }
- } else {
- /*
- * Check if it's the boot-cpu, set it's hw index now,
- * unfortunately this format did not support booting
- * off secondary threads.
- */
- if (of_get_flat_dt_prop(node,
- "linux,boot-cpu", NULL) != NULL) {
- found = 1;
- break;
- }
- }
-
-#ifdef CONFIG_SMP
- /* logical cpu id is always 0 on UP kernels */
- logical_cpuid++;
-#endif
- }
-
- if (found) {
- pr_debug("boot cpu: logical %d physical %d\n", logical_cpuid,
- intserv[i]);
- boot_cpuid = logical_cpuid;
- }
-
return 0;
}
next prev parent reply other threads:[~2009-11-24 8:19 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-24 8:17 [PATCH 00/11] Yet another series of OF merge patches Grant Likely
2009-11-24 8:17 ` [PATCH 01/11] of/flattree: Merge early_init_dt_check_for_initrd() Grant Likely
2009-11-26 3:51 ` Benjamin Herrenschmidt
2009-11-26 4:02 ` Grant Likely
2009-11-24 8:18 ` [PATCH 02/11] of/flattree: Merge earlyinit_dt_scan_root() Grant Likely
2009-11-26 3:54 ` Benjamin Herrenschmidt
2009-11-26 4:03 ` Grant Likely
2009-11-24 8:18 ` [PATCH 03/11] of/flattree: merge dt_mem_next_cell Grant Likely
2009-11-26 3:55 ` Benjamin Herrenschmidt
2009-11-24 8:18 ` [PATCH 04/11] of/flattree: eliminate cell_t typedef Grant Likely
2009-11-26 3:59 ` Benjamin Herrenschmidt
2009-11-26 4:05 ` Grant Likely
2009-11-26 5:27 ` Benjamin Herrenschmidt
2009-11-26 21:36 ` Segher Boessenkool
2009-11-26 21:40 ` Benjamin Herrenschmidt
2009-11-26 23:32 ` David Miller
2009-12-11 6:43 ` Grant Likely
2009-11-26 6:28 ` M. Warner Losh
2009-11-26 7:06 ` Benjamin Herrenschmidt
2009-11-26 7:52 ` Mitch Bradley
2009-11-24 8:18 ` [PATCH 05/11] of/flattree: merge early_init_dt_scan_chosen() Grant Likely
2009-11-24 8:19 ` [PATCH 06/11] of/flattree: merge early_init_devtree() and early_init_move_devtree() Grant Likely
2009-11-26 4:04 ` Benjamin Herrenschmidt
2009-12-11 6:19 ` Grant Likely
2009-12-07 7:08 ` Jeremy Kerr
2009-12-11 6:20 ` Grant Likely
2009-11-24 8:19 ` [PATCH 07/11] of: merge machine_is_compatible() Grant Likely
2009-11-26 4:05 ` Benjamin Herrenschmidt
2009-12-11 6:54 ` Grant Likely
2009-11-24 8:19 ` [PATCH 08/11] of: Merge of_node_get() and of_node_put() Grant Likely
2009-11-26 4:06 ` Benjamin Herrenschmidt
2009-11-24 8:19 ` [PATCH 09/11] of: merge of_attach_node() & of_detach_node() Grant Likely
2009-11-26 4:07 ` Benjamin Herrenschmidt
2009-12-10 22:21 ` Grant Likely
2009-11-24 8:19 ` Grant Likely [this message]
2009-11-24 8:20 ` [PATCH 11/11] of: unify phandle name in struct device_node Grant Likely
2009-11-24 17:37 ` David Miller
2009-11-24 20:33 ` Grant Likely
2009-11-24 21:10 ` David Miller
2009-11-24 21:06 ` Benjamin Herrenschmidt
2009-11-24 21:39 ` Grant Likely
2009-11-26 12:28 ` [PATCH 00/11] Yet another series of OF merge patches Wolfram Sang
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=20091124081944.6216.41834.stgit@angua \
--to=grant.likely@secretlab.ca \
--cc=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=microblaze-uclinux@itee.uq.edu.au \
--cc=monstr@monstr.eu \
--cc=sfr@canb.auug.org.au \
--cc=sparclinux@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).