* [PATCH] booke_wdt: Fix build (unconstify watchdog_info)
@ 2010-04-26 17:43 Anton Vorontsov
2010-04-27 6:37 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 4+ messages in thread
From: Anton Vorontsov @ 2010-04-26 17:43 UTC (permalink / raw)
To: Wim Van Sebroeck, Kumar Gala; +Cc: linuxppc-dev, Andrew Morton
commit 42747d712de56cf2087b702d2ad90af114c53138 ("[WATCHDOG]
watchdog_info constify") introduced the following build failure:
CC booke_wdt.o
booke_wdt.c: In function 'booke_wdt_init':
booke_wdt.c:220: error: assignment of read-only variable 'ident'
Fix this by removing 'const' qualifier from watchdog_info struct.
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
---
drivers/watchdog/booke_wdt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index 500d383..801ead1 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -121,7 +121,7 @@ static ssize_t booke_wdt_write(struct file *file, const char __user *buf,
return count;
}
-static const struct watchdog_info ident = {
+static struct watchdog_info ident = {
.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
.identity = "PowerPC Book-E Watchdog",
};
--
1.7.0.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] booke_wdt: Fix build (unconstify watchdog_info)
2010-04-26 17:43 [PATCH] booke_wdt: Fix build (unconstify watchdog_info) Anton Vorontsov
@ 2010-04-27 6:37 ` Benjamin Herrenschmidt
2010-04-27 7:42 ` Wim Van Sebroeck
0 siblings, 1 reply; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2010-04-27 6:37 UTC (permalink / raw)
To: Anton Vorontsov; +Cc: linuxppc-dev, Wim Van Sebroeck, Andrew Morton
On Mon, 2010-04-26 at 21:43 +0400, Anton Vorontsov wrote:
> commit 42747d712de56cf2087b702d2ad90af114c53138 ("[WATCHDOG]
> watchdog_info constify") introduced the following build failure:
>
> CC booke_wdt.o
> booke_wdt.c: In function 'booke_wdt_init':
> booke_wdt.c:220: error: assignment of read-only variable 'ident'
>
> Fix this by removing 'const' qualifier from watchdog_info struct.
Should this go via powerpc.git ? If yes, I'll send to Linus asap.
Cheers,
Ben.
> Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
> ---
> drivers/watchdog/booke_wdt.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-
>
> diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
> index 500d383..801ead1 100644
> --- a/drivers/watchdog/booke_wdt.c
> +++ b/drivers/watchdog/booke_wdt.c
> @@ -121,7 +121,7 @@ static ssize_t booke_wdt_write(struct file *file, const char __user *buf,
> return count;
> }
>
> -static const struct watchdog_info ident = {
> +static struct watchdog_info ident = {
> .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
> .identity = "PowerPC Book-E Watchdog",
> };
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] booke_wdt: Fix build (unconstify watchdog_info)
2010-04-27 6:37 ` Benjamin Herrenschmidt
@ 2010-04-27 7:42 ` Wim Van Sebroeck
2010-04-27 7:45 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 4+ messages in thread
From: Wim Van Sebroeck @ 2010-04-27 7:42 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, Andrew Morton, Anton Vorontsov
Hi Ben,
> > commit 42747d712de56cf2087b702d2ad90af114c53138 ("[WATCHDOG]
> > watchdog_info constify") introduced the following build failure:
> >
> > CC booke_wdt.o
> > booke_wdt.c: In function 'booke_wdt_init':
> > booke_wdt.c:220: error: assignment of read-only variable 'ident'
> >
> > Fix this by removing 'const' qualifier from watchdog_info struct.
>
> Should this go via powerpc.git ? If yes, I'll send to Linus asap.
I'm sending watchdog related patches to Linus today. This one will be included.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] booke_wdt: Fix build (unconstify watchdog_info)
2010-04-27 7:42 ` Wim Van Sebroeck
@ 2010-04-27 7:45 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2010-04-27 7:45 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linuxppc-dev, Andrew Morton, Anton Vorontsov
On Tue, 2010-04-27 at 09:42 +0200, Wim Van Sebroeck wrote:
> Hi Ben,
>
> > > commit 42747d712de56cf2087b702d2ad90af114c53138 ("[WATCHDOG]
> > > watchdog_info constify") introduced the following build failure:
> > >
> > > CC booke_wdt.o
> > > booke_wdt.c: In function 'booke_wdt_init':
> > > booke_wdt.c:220: error: assignment of read-only variable 'ident'
> > >
> > > Fix this by removing 'const' qualifier from watchdog_info struct.
> >
> > Should this go via powerpc.git ? If yes, I'll send to Linus asap.
>
> I'm sending watchdog related patches to Linus today. This one will be included.
Thanks !
Cheers,
Ben.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-04-27 7:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-26 17:43 [PATCH] booke_wdt: Fix build (unconstify watchdog_info) Anton Vorontsov
2010-04-27 6:37 ` Benjamin Herrenschmidt
2010-04-27 7:42 ` Wim Van Sebroeck
2010-04-27 7:45 ` Benjamin Herrenschmidt
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).