All of lore.kernel.org
 help / color / mirror / Atom feed
From: van.freenix@gmail.com (Peng Fan)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: Do not overwrite __machine_arch_type
Date: Tue, 19 Aug 2014 11:21:31 +0800	[thread overview]
Message-ID: <1408418491-29330-1-git-send-email-van.freenix@gmail.com> (raw)

If using DT_MACHINE_START when enabled CONFIG_OF, the nr of mdesc is ~0.
The value of __machine_arch_type is passsed from bootloader using reigster
r1, and assigned in head-common.S. Remove this line to avoid overwrite it.

Signed-off-by: Peng Fan <van.freenix@gmail.com>
---
 arch/arm/kernel/devtree.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 11c54de..3a04486 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -243,8 +243,5 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
 
 	early_init_dt_scan_nodes();
 
-	/* Change machine number to match the mdesc we're using */
-	__machine_arch_type = mdesc->nr;
-
 	return mdesc;
 }
-- 
1.8.4

WARNING: multiple messages have this Message-ID (diff)
From: Peng Fan <van.freenix@gmail.com>
To: Russell King <linux@arm.linux.org.uk>,
	Rob Herring <robh@kernel.org>,
	Laura Abbott <lauraa@codeaurora.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>,
	Stephen Boyd <sboyd@codeaurora.org>
Cc: <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] arm: Do not overwrite __machine_arch_type
Date: Tue, 19 Aug 2014 11:21:31 +0800	[thread overview]
Message-ID: <1408418491-29330-1-git-send-email-van.freenix@gmail.com> (raw)

If using DT_MACHINE_START when enabled CONFIG_OF, the nr of mdesc is ~0.
The value of __machine_arch_type is passsed from bootloader using reigster
r1, and assigned in head-common.S. Remove this line to avoid overwrite it.

Signed-off-by: Peng Fan <van.freenix@gmail.com>
---
 arch/arm/kernel/devtree.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 11c54de..3a04486 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -243,8 +243,5 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
 
 	early_init_dt_scan_nodes();
 
-	/* Change machine number to match the mdesc we're using */
-	__machine_arch_type = mdesc->nr;
-
 	return mdesc;
 }
-- 
1.8.4



             reply	other threads:[~2014-08-19  3:21 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-19  3:21 Peng Fan [this message]
2014-08-19  3:21 ` [PATCH] arm: Do not overwrite __machine_arch_type Peng Fan
2014-08-19  7:43 ` Russell King - ARM Linux
2014-08-19  7:43   ` Russell King - ARM Linux
2014-08-19  8:12   ` Peng Fan
2014-08-19  8:12     ` Peng Fan

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=1408418491-29330-1-git-send-email-van.freenix@gmail.com \
    --to=van.freenix@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.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.