Messages in this thread Patch in this message | | | Date | Tue, 27 Nov 2007 18:53:22 -0800 | From | Andrew Morton <> | Subject | Re: [patch] Fix hpet wrong values |
| |
On Tue, 27 Nov 2007 13:23:08 +0100 Pavel Machek <pavel@ucw.cz> wrote:
> If hpet is not enabled in config, its init should not pretend to work, > and people should not try to get time from it. > > Signed-off-by: Pavel Machek <pavel@suse.cz> > > diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h > index b1f3c1e..1777d68 100644 > --- a/include/asm-x86/hpet.h > +++ b/include/asm-x86/hpet.h > @@ -81,8 +81,8 @@ #endif /* CONFIG_HPET_EMULATE_RTC */ > > #else > > -static inline int hpet_enable(void) { return 0; } > -static inline unsigned long hpet_readl(unsigned long a) { return 0; } > +static inline int hpet_enable(void) { return -ENODEV; } > +static inline unsigned long hpet_readl(unsigned long a) { BUG(); } > > #endif /* CONFIG_HPET_TIMER */ > #endif /* ASM_X86_HPET_H */ >
Dare I point out Documentation/SubmitChecklist?
include/asm/hpet.h: In function 'hpet_readl': include/asm/hpet.h:86: warning: no return statement in function returning non-void
just delete it and rely on -Werror-implicit-function-declaration
--- a/include/asm-x86/hpet.h~fix-hpet-wrong-values-fix +++ a/include/asm-x86/hpet.h @@ -82,7 +82,6 @@ extern irqreturn_t hpet_rtc_interrupt(in #else static inline int hpet_enable(void) { return -ENODEV; } -static inline unsigned long hpet_readl(unsigned long a) { BUG(); } #endif /* CONFIG_HPET_TIMER */ #endif /* ASM_X86_HPET_H */ _
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |