2011-05-25 22:08:06

by Anca Emanuel

[permalink] [raw]
Subject: Re: CPU used at 100% in 2.6.39-git10

On Thu, May 26, 2011 at 12:08 AM, Thomas Gleixner <[email protected]> wrote:
> On Wed, 25 May 2011, Linus Torvalds wrote:
>
>> On Wed, May 25, 2011 at 1:37 PM, Thomas Gleixner <[email protected]> wrote:
>> >
>> > /me blushes
>> >
>> > Does the patch below fix it ?
>>
>> Yup, that seems to fix it for me. Commit log and sign-off?
>>
>> ? ? ? ? ? ? ? ? ? ? ? ? Linus
>
> ---->
> hrtimers: Fix moronic typo
>
> commit 9ec2690758a5 ("timerfd: Manage cancelable timers in timerfd")
> introduced a CONFIG_HIGHRES_TIMERS (should be CONFIG_HIGH_RES_TIMERS)
> typo, which caused applications depending on CLOCK_REALTIME timers to
> become sluggy due to the fact that the time base of the realtime
> timers was not updated when the wall clock time was set.
>
> Reported-by: Anca Emanuel <[email protected]>
> Fatfingered-by: Thomas Gleixner <[email protected]>
> Signed-off-by: Thomas Gleixner <[email protected]>
>
> diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
> index c541ee5..a9205e3 100644
> --- a/kernel/hrtimer.c
> +++ b/kernel/hrtimer.c
> @@ -748,7 +748,7 @@ static inline void retrigger_next_event(void *arg) { }
> ?*/
> ?void clock_was_set(void)
> ?{
> -#ifdef CONFIG_HIGHRES_TIMERS
> +#ifdef CONFIG_HIGH_RES_TIMERS
> ? ? ? ?/* Retrigger the CPU local events everywhere */
> ? ? ? ?on_each_cpu(retrigger_next_event, NULL, 1);
> ?#endif
>

Tested-by: Anca Emanuel <[email protected]>

Linus, Thomas, this solves the problem, thanks very much for your help.