As nothing should be writing to the clocksource name string, make the
clocksource name pointer const. Build-tested on ARM Versatile Express.
Signed-off-by: Russell King <[email protected]>
---
include/linux/clocksource.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index c37b21a..94c1f38 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -161,7 +161,7 @@ struct clocksource {
/*
* First part of structure is read mostly
*/
- char *name;
+ const char *name;
struct list_head list;
int rating;
cycle_t (*read)(struct clocksource *cs);
On Sat, 2011-02-19 at 15:34 +0000, Russell King - ARM Linux wrote:
> As nothing should be writing to the clocksource name string, make the
> clocksource name pointer const. Build-tested on ARM Versatile Express.
>
> Signed-off-by: Russell King <[email protected]>
Sounds good. I'll add it to my queue for 2.6.39
Acked-by: John Stultz <[email protected]>
thanks
-john
Has this patch been rejected?
On Sat, Feb 19, 2011 at 03:34:50PM +0000, Russell King - ARM Linux wrote:
> As nothing should be writing to the clocksource name string, make the
> clocksource name pointer const. Build-tested on ARM Versatile Express.
>
> Signed-off-by: Russell King <[email protected]>
> ---
> include/linux/clocksource.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
> index c37b21a..94c1f38 100644
> --- a/include/linux/clocksource.h
> +++ b/include/linux/clocksource.h
> @@ -161,7 +161,7 @@ struct clocksource {
> /*
> * First part of structure is read mostly
> */
> - char *name;
> + const char *name;
> struct list_head list;
> int rating;
> cycle_t (*read)(struct clocksource *cs);
On Sat, 2 Apr 2011, Russell King - ARM Linux wrote:
> Has this patch been rejected?
No, I think it just got lost. Will pick it up.
> On Sat, Feb 19, 2011 at 03:34:50PM +0000, Russell King - ARM Linux wrote:
> > As nothing should be writing to the clocksource name string, make the
> > clocksource name pointer const. Build-tested on ARM Versatile Express.
> >
> > Signed-off-by: Russell King <[email protected]>
> > ---
> > include/linux/clocksource.h | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
> > index c37b21a..94c1f38 100644
> > --- a/include/linux/clocksource.h
> > +++ b/include/linux/clocksource.h
> > @@ -161,7 +161,7 @@ struct clocksource {
> > /*
> > * First part of structure is read mostly
> > */
> > - char *name;
> > + const char *name;
> > struct list_head list;
> > int rating;
> > cycle_t (*read)(struct clocksource *cs);
>
On Sat, 2 Apr 2011, Thomas Gleixner wrote:
> On Sat, 2 Apr 2011, Russell King - ARM Linux wrote:
>
> > Has this patch been rejected?
>
> No, I think it just got lost. Will pick it up.
Weird, I don't have it at all. Could you please resend?
Thanks,
tglx
On Sat, 2011-04-02 at 15:11 +0100, Russell King - ARM Linux wrote:
> Has this patch been rejected?
No, just my clocksource cleanups tree didn't get pulled for 2.6.39.
Thomas: The commit can be found here:
http://git.linaro.org/gitweb?p=people/jstultz/linux.git;a=commit;h=36d8593ec74dc04d3bd7c1c897a7b7cfbd0b0dc6
thanks
-john
On Mon, 4 Apr 2011, john stultz wrote:
> On Sat, 2011-04-02 at 15:11 +0100, Russell King - ARM Linux wrote:
> > Has this patch been rejected?
>
> No, just my clocksource cleanups tree didn't get pulled for 2.6.39.
Crap.
> Thomas: The commit can be found here:
> http://git.linaro.org/gitweb?p=people/jstultz/linux.git;a=commit;h=36d8593ec74dc04d3bd7c1c897a7b7cfbd0b0dc6
Is there more stuff pending ?
Thanks,
tglx
On Mon, 2011-04-04 at 19:44 +0200, Thomas Gleixner wrote:
> On Mon, 4 Apr 2011, john stultz wrote:
>
> > On Sat, 2011-04-02 at 15:11 +0100, Russell King - ARM Linux wrote:
> > > Has this patch been rejected?
> >
> > No, just my clocksource cleanups tree didn't get pulled for 2.6.39.
>
> Crap.
Sorry, I probably should have nagged you a bit more.
> > Thomas: The commit can be found here:
> > http://git.linaro.org/gitweb?p=people/jstultz/linux.git;a=commit;h=36d8593ec74dc04d3bd7c1c897a7b7cfbd0b0dc6
>
> Is there more stuff pending ?
Just clocksource_register_hz/khz bits, but those aren't critical, and
can be moved in slowly via arch maintainers if you're not comfortable
with them. I also need to refresh some of them, as there were some
collisions in the merge window.
thanks
-john
On Mon, 4 Apr 2011, john stultz wrote:
> On Mon, 2011-04-04 at 19:44 +0200, Thomas Gleixner wrote:
> > On Mon, 4 Apr 2011, john stultz wrote:
> >
> > > On Sat, 2011-04-02 at 15:11 +0100, Russell King - ARM Linux wrote:
> > > > Has this patch been rejected?
> > >
> > > No, just my clocksource cleanups tree didn't get pulled for 2.6.39.
> >
> > Crap.
>
> Sorry, I probably should have nagged you a bit more.
>
>
> > > Thomas: The commit can be found here:
> > > http://git.linaro.org/gitweb?p=people/jstultz/linux.git;a=commit;h=36d8593ec74dc04d3bd7c1c897a7b7cfbd0b0dc6
> >
> > Is there more stuff pending ?
>
> Just clocksource_register_hz/khz bits, but those aren't critical, and
> can be moved in slowly via arch maintainers if you're not comfortable
> with them. I also need to refresh some of them, as there were some
> collisions in the merge window.
Just tried merging linus head into it, but that does not show any
conflicts.
Thanks,
tglx
On Mon, Apr 04, 2011 at 09:07:03PM +0200, Thomas Gleixner wrote:
> On Mon, 4 Apr 2011, john stultz wrote:
>
> > On Mon, 2011-04-04 at 19:44 +0200, Thomas Gleixner wrote:
> > > On Mon, 4 Apr 2011, john stultz wrote:
> > >
> > > > On Sat, 2011-04-02 at 15:11 +0100, Russell King - ARM Linux wrote:
> > > > > Has this patch been rejected?
> > > >
> > > > No, just my clocksource cleanups tree didn't get pulled for 2.6.39.
> > >
> > > Crap.
> >
> > Sorry, I probably should have nagged you a bit more.
> >
> >
> > > > Thomas: The commit can be found here:
> > > > http://git.linaro.org/gitweb?p=people/jstultz/linux.git;a=commit;h=36d8593ec74dc04d3bd7c1c897a7b7cfbd0b0dc6
> > >
> > > Is there more stuff pending ?
How about the 'RTC: Fix early irqs caused by calling rtc_set_alarm too early'?
I tried to search by the git commit dc6b812d1cde06df5c1acba394a79ca80785c776
but didn't find it anymore?
It fixes a regression which inhibits Xen guests booting in 2.6.39.
On Mon, 2011-04-04 at 16:25 -0400, Konrad Rzeszutek Wilk wrote:
> On Mon, Apr 04, 2011 at 09:07:03PM +0200, Thomas Gleixner wrote:
> > On Mon, 4 Apr 2011, john stultz wrote:
> >
> > > On Mon, 2011-04-04 at 19:44 +0200, Thomas Gleixner wrote:
> > > > On Mon, 4 Apr 2011, john stultz wrote:
> > > >
> > > > > On Sat, 2011-04-02 at 15:11 +0100, Russell King - ARM Linux wrote:
> > > > > > Has this patch been rejected?
> > > > >
> > > > > No, just my clocksource cleanups tree didn't get pulled for 2.6.39.
> > > >
> > > > Crap.
> > >
> > > Sorry, I probably should have nagged you a bit more.
> > >
> > >
> > > > > Thomas: The commit can be found here:
> > > > > http://git.linaro.org/gitweb?p=people/jstultz/linux.git;a=commit;h=36d8593ec74dc04d3bd7c1c897a7b7cfbd0b0dc6
> > > >
> > > > Is there more stuff pending ?
>
> How about the 'RTC: Fix early irqs caused by calling rtc_set_alarm too early'?
> I tried to search by the git commit dc6b812d1cde06df5c1acba394a79ca80785c776
> but didn't find it anymore?
>
> It fixes a regression which inhibits Xen guests booting in 2.6.39.
Yep. That's still pending along with other RTC fixes, but in a different
branch:
http://git.linaro.org/gitweb?p=people/jstultz/linux.git;a=shortlog;h=refs/heads/fortglx/39/tip/timers/rtc
thanks
-john