[PATCH] timekeeping: Fix build when generic clockevents are enabled

[PATCH] timekeeping: Fix build when generic clockevents are enabled

[Mark Brown]

Commit a2c204 (timekeeping: Add suspend and resume of clock event devices)
added suspend and resume operations for clockevents but did not provide
stubs for these functions, breaking the build when clockevents are not
being built. Add the stubs.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 include/linux/clockchips.h |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index ca060db..4f9c280 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -170,6 +170,8 @@ extern void clockevents_notify(unsigned long reason, void *arg);
 #else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */
 
 #define clockevents_notify(reason, arg) do { } while (0)
+#define clockevents_suspend() do { } while (0)
+#define clockevents_resume() do { } while (0)
 
 #endif
 
-- 
1.7.10.4

Re: [PATCH] timekeeping: Fix build when generic clockevents are enabled

[Rafael J. Wysocki]

On Thursday, August 09, 2012, Mark Brown wrote:
> Commit a2c204 (timekeeping: Add suspend and resume of clock event devices)
> added suspend and resume operations for clockevents but did not provide
> stubs for these functions, breaking the build when clockevents are not
> being built. Add the stubs.
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

I've fixed that already in my tree.

Thanks,
Rafael


> ---
>  include/linux/clockchips.h |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
> index ca060db..4f9c280 100644
> --- a/include/linux/clockchips.h
> +++ b/include/linux/clockchips.h
> @@ -170,6 +170,8 @@ extern void clockevents_notify(unsigned long reason, void *arg);
>  #else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */
>  
>  #define clockevents_notify(reason, arg) do { } while (0)
> +#define clockevents_suspend() do { } while (0)
> +#define clockevents_resume() do { } while (0)
>  
>  #endif
>  
> 

Re: [PATCH] timekeeping: Fix build when generic clockevents are enabled

[Rafael J. Wysocki]

On Thursday, August 09, 2012, Mark Brown wrote:
> Commit a2c204 (timekeeping: Add suspend and resume of clock event devices)
> added suspend and resume operations for clockevents but did not provide
> stubs for these functions, breaking the build when clockevents are not
> being built. Add the stubs.

By the way, if you use commit IDs in changelogs like this, please say that
they are linux-next commits if that's the case.  Otherwise it may look like
you're fixing a mainline issue, which is not the case here.

This particular commit is not present in any pulished tree except for
linux-next (yet), which is deliberate, because it's going to be rebased in
the future and its hash will change.

Thanks,
Rafael

Re: [PATCH] timekeeping: Fix build when generic clockevents are enabled

[Thomas Gleixner]

On Thu, 9 Aug 2012, Mark Brown wrote:

> Commit a2c204 (timekeeping: Add suspend and resume of clock event devices)

Against which tree is that?

> added suspend and resume operations for clockevents but did not provide
> stubs for these functions, breaking the build when clockevents are not
> being built. Add the stubs.
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  include/linux/clockchips.h |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
> index ca060db..4f9c280 100644
> --- a/include/linux/clockchips.h
> +++ b/include/linux/clockchips.h
> @@ -170,6 +170,8 @@ extern void clockevents_notify(unsigned long reason, void *arg);
>  #else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */
>  
>  #define clockevents_notify(reason, arg) do { } while (0)
> +#define clockevents_suspend() do { } while (0)
> +#define clockevents_resume() do { } while (0)
>  
>  #endif
>  
> -- 
> 1.7.10.4
> 
> 

Re: [PATCH] timekeeping: Fix build when generic clockevents are enabled

[Mark Brown]

On Mon, Aug 13, 2012 at 05:07:06PM +0200, Thomas Gleixner wrote:
> On Thu, 9 Aug 2012, Mark Brown wrote:

> > Commit a2c204 (timekeeping: Add suspend and resume of clock event devices)

> Against which tree is that?

-next.  I think Raphael already folded it into the offending commit.

Re: [PATCH] timekeeping: Fix build when generic clockevents are enabled

[Rafael J. Wysocki]

On Monday, August 13, 2012, Mark Brown wrote:
> On Mon, Aug 13, 2012 at 05:07:06PM +0200, Thomas Gleixner wrote:
> > On Thu, 9 Aug 2012, Mark Brown wrote:
> 
> > > Commit a2c204 (timekeeping: Add suspend and resume of clock event devices)
> 
> > Against which tree is that?
> 
> -next.  I think Raphael already folded it into the offending commit.

In fact I'd applied the equivalent fix before I got your report. :-)