lkml.org 
[lkml]   [2008]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [2.6.28-rc1 regression] wmifinfo dockapp takes 100% of cpu (bisected)
one more thing:

On Sat, Oct 25, 2008 at 08:29:29PM +0200, Carlos R. Mafra wrote:
> > > > diff --git a/fs/compat.c b/fs/compat.c
> > > > index fe3c9bf..95ceee6 100644
> > > > --- a/fs/compat.c
> > > > +++ b/fs/compat.c
> > > > @@ -1680,9 +1680,16 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
> > > > int ret;
> > > >
> > > > if (tvp) {
> > > > + int i;

"i" should be initialized to 0

> > > > if (copy_from_user(&tv, tvp, sizeof(tv)))
> > > > return -EFAULT;
> > > >
> > > > + while (tv.tv_usec > USEC_PER_SEC && i < 1000) {
> > ^
> > should be >=
> >
> > > > + i++;
> > > > + tv.tv_sec ++;
> > > > + tv.tv_usec -= USEC_PER_SEC;
> > > > + }
> > > > +
> > > > to = &end_time;
> > > > if (poll_select_set_timeout(to, tv.tv_sec,
> > > > tv.tv_usec * NSEC_PER_USEC))
> > > > diff --git a/fs/select.c b/fs/select.c
> > > > index 448e440..e4e7cdb 100644
> > > > --- a/fs/select.c
> > > > +++ b/fs/select.c
> > > > @@ -515,9 +515,16 @@ asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp,
> > > > int ret;
> > > >
> > > > if (tvp) {
> > > > + int i = 0;
> > > > if (copy_from_user(&tv, tvp, sizeof(tv)))
> > > > return -EFAULT;
> > > >
> > > > + while (tv.tv_usec > USEC_PER_SEC && i < 1000) {
> >
> > and here too
>
>
> Yes, changing to >= solves the problem here.
>
> Thanks Arjan and Marcin!
>
>
> > > > + i++;
> > > > + tv.tv_sec ++;
> > > > + tv.tv_usec -= USEC_PER_SEC;
> > > > + }
> > > > +
> > > > to = &end_time;
> > > > if (poll_select_set_timeout(to, tv.tv_sec,
> > > > tv.tv_usec * NSEC_PER_USEC))
> > > >
> > > > --


\
 
 \ /
  Last update: 2008-10-26 00:15    [from the cache]
©2003-2011 Jasper Spaans