From: Ralf Baechle <ralf@linux-mips.org>
To: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Cc: linux-mips <linux-mips@linux-mips.org>
Subject: Re: [PATCH][MIPS] fix wrong prom_getcmdline() definition
Date: Tue, 31 Oct 2006 13:45:16 +0000 [thread overview]
Message-ID: <20061031134516.GA7795@linux-mips.org> (raw)
In-Reply-To: <200610310445.k9V4jFXT012552@mbox33.po.2iij.net>
On Tue, Oct 31, 2006 at 01:40:07PM +0900, Yoichi Yuasa wrote:
> This patch has fixed wrong prom_getcmdline() definition.
Fortunately an __init declaration of a function leaves the compiler
entirely unimpressed. Your patch only scratched the surface of the
problem; so I went for below patch. Further cleanup should be done but
that would be unsuitable for 2.6.19 now that -rc4 is out.
Ralf
diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/au1000/common/prom.c
index b4b010a..6fce60a 100644
--- a/arch/mips/au1000/common/prom.c
+++ b/arch/mips/au1000/common/prom.c
@@ -47,7 +47,7 @@ extern int prom_argc;
extern char **prom_argv, **prom_envp;
-char * prom_getcmdline(void)
+char * __init_or_module prom_getcmdline(void)
{
return &(arcs_cmdline[0]);
}
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index 377ae0d..919172d 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -43,7 +43,7 @@ #include <asm/pgtable.h>
#include <asm/mach-au1x00/au1000.h>
#include <asm/time.h>
-extern char * __init prom_getcmdline(void);
+extern char * prom_getcmdline(void);
extern void __init board_setup(void);
extern void au1000_restart(char *);
extern void au1000_halt(void);
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 4873dc6..7db3c8a 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -102,7 +102,7 @@ static void enable_mac(struct net_device
// externs
extern int get_ethernet_addr(char *ethernet_addr);
extern void str2eaddr(unsigned char *ea, unsigned char *str);
-extern char * __init prom_getcmdline(void);
+extern char * prom_getcmdline(void);
/*
* Theory of operation
diff --git a/drivers/net/gt64240eth.c b/drivers/net/gt64240eth.c
index f543930..7859202 100644
--- a/drivers/net/gt64240eth.c
+++ b/drivers/net/gt64240eth.c
@@ -127,7 +127,7 @@ static void gt64240_tx_timeout(struct ne
static void gt64240_set_rx_mode(struct net_device *dev);
static struct net_device_stats *gt64240_get_stats(struct net_device *dev);
-extern char *__init prom_getcmdline(void);
+extern char * prom_getcmdline(void);
extern int prom_get_mac_addrs(unsigned char
station_addr[NUM_INTERFACES][6]);
next prev parent reply other threads:[~2006-10-31 13:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-31 4:40 [PATCH][MIPS] fix wrong prom_getcmdline() definition Yoichi Yuasa
2006-10-31 13:45 ` Ralf Baechle [this message]
2006-10-31 22:42 ` Yoichi Yuasa
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=20061031134516.GA7795@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=linux-mips@linux-mips.org \
--cc=yoichi_yuasa@tripeaks.co.jp \
/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.