| To: | Ralf Baechle <ralf@linux-mips.org> |
|---|---|
| Subject: | [urgent] [loongson] machtype: Fixup of prom_init_machtype() |
| From: | Wu Zhangjin <wuzhangjin@gmail.com> |
| Date: | Sun, 22 Nov 2009 15:37:53 +0800 |
| Cc: | linux-mips@linux-mips.org, Wu Zhangjin <wuzhangjin@gmail.com> |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=8hFOXkZEEv74cczBky5s7ezplDUM6mIimLiEzcR3qjw=; b=UT9HexokBgw9HxPVFWcclCWJ5jVnWCbSLFcfk6hC6zD9PEK8QS28WVkgpus6hZbOu0 iehchgFOdFUoTk6Vd7sPUPsccAk/C+hqEr2v50LdBj2XK96CMd+/FFOI77Bs7TfnN9BV WLqLT+fSmsvTQHM56LyDkQtOBw/lqLJQgJ0TA= |
| Domainkey-signature: | a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=WBEaxZn0CJTxzuGGQ/JIuQt7Wrom3pGh+wy5DcLkcYT9poIOc9BafExJ7BWoMbJg1y 3dk+ilx5mFNePDzbtFEIvqYvuFOXvLUJWzMdwUH/WNgdCz6YGS0sGmCXMf7EiNGf4Rm5 hzx3U33/rg+fAl7WrueuaBvY1g0bHzmL+yzts= |
| Original-recipient: | rfc822;linux-mips@linux-mips.org |
| Sender: | linux-mips-bounce@linux-mips.org |
From: Wu Zhangjin <wuzhangjin@gmail.com>
The old version cut off everything of arcs_cmdline after machtype=xxxx,
which is totally wrong, we need to copy out the machtype=xxxx and then
operate it.
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
---
arch/mips/loongson/common/machtype.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/mips/loongson/common/machtype.c
b/arch/mips/loongson/common/machtype.c
index 2a46b4d..0ed52b3 100644
--- a/arch/mips/loongson/common/machtype.c
+++ b/arch/mips/loongson/common/machtype.c
@@ -15,6 +15,9 @@
#include <loongson.h>
#include <machine.h>
+/* please ensure the length of the machtype string is less than 50 */
+#define MACHTYPE_LEN 50
+
static const char *system_types[] = {
[MACH_LOONGSON_UNKNOWN] "unknown loongson machine",
[MACH_LEMOTE_FL2E] "lemote-fuloong-2e-box",
@@ -34,18 +37,19 @@ const char *get_system_type(void)
void __init prom_init_machtype(void)
{
- char *str, *p;
+ char *p, str[MACHTYPE_LEN];
int machtype = MACH_LEMOTE_FL2E;
mips_machtype = LOONGSON_MACHTYPE;
- str = strstr(arcs_cmdline, "machtype=");
- if (!str)
+ p = strstr(arcs_cmdline, "machtype=");
+ if (!p)
return;
- str += strlen("machtype=");
+ p += strlen("machtype=");
+ strncpy(str, p, MACHTYPE_LEN);
p = strstr(str, " ");
if (p)
- *p++ = '\0';
+ *p = '\0';
for (; system_types[machtype]; machtype++)
if (strstr(system_types[machtype], str)) {
--
1.6.2.1
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: [PATCH v9 07/10] tracing: add dynamic function graph tracer for MIPS, Wu Zhangjin |
|---|---|
| Next by Date: | [PATCH v3] [loongson] yeeloong2f: add platform specific support, Wu Zhangjin |
| Previous by Thread: | [PATCH] [MIPS] Fix and enhance built-in kernel command line, Dmitri Vorobiev |
| Next by Thread: | Re: [urgent] [loongson] machtype: Fixup of prom_init_machtype(), Ralf Baechle |
| Indexes: | [Date] [Thread] [Top] [All Lists] |