Re: [Xen-devel] Was: Re: [GIT PULL] timer changes for v3.6, Is: Regression introduced by 1e75fa8be9fb61e1af46b5b3b176347a4c958ca1

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

> Does the following resolve it? If not I have a debug patch I'll send
> you to try to chase this down.

Yup. That makes it boot without crash and without any WARN_ON.  I am going
to run it overnight on some other machines but so far it looks to have
fixed the regression. So please attach:

Reported-and-Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

> 
> thanks
> -john
> 
> 
> diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
> index f045cc5..cf364db 100644
> --- a/kernel/time/timekeeping.c
> +++ b/kernel/time/timekeeping.c
> @@ -108,13 +108,13 @@ static struct timespec tk_xtime(struct timekeeper *tk)
>  static void tk_set_xtime(struct timekeeper *tk, const struct timespec *ts)
>  {
>  	tk->xtime_sec = ts->tv_sec;
> -	tk->xtime_nsec = ts->tv_nsec << tk->shift;
> +	tk->xtime_nsec = (u64)ts->tv_nsec << tk->shift;
>  }
>  static void tk_xtime_add(struct timekeeper *tk, const struct timespec *ts)
>  {
>  	tk->xtime_sec += ts->tv_sec;
> -	tk->xtime_nsec += ts->tv_nsec << tk->shift;
> +	tk->xtime_nsec += (u64)ts->tv_nsec << tk->shift;
>  }
>  /**
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel