Now for 2.5.50-bk7.

The changes for the new sys_call restart now allow one
restart function to handle both nanosleep and
clock_nanosleep.  Saves a bit of code, nice.

All the requested changes and Lindent too :).

I also broke clock_nanosleep() apart much the same way
nanosleep() was with the bk5 changes.  

This is still this way.  Should be easy to do the compat
stuff.

George


Linus Torvalds wrote:
> 
> Ok, finally starting to look at merging this, however:
> 
> This must go (we already have a timespec, there's no way it should be
> here in <asm/signal.h>):
> 
>         +#ifndef _STRUCT_TIMESPEC
>         +#define _STRUCT_TIMESPEC
>         +struct timespec {
>         +       time_t  tv_sec;         /* seconds */
>         +       long    tv_nsec;        /* nanoseconds */
>         +};
>         +#endif /* _STRUCT_TIMESPEC */

OK.
> 
> and you have things like
> 
>         +       if ((flags & TIMER_ABSTIME) &&
>         +           (clock->clock_get != do_posix_clock_monotonic_gettime)) {
>         +       }else{
>         +       }

A hang over from the high res code, I will remove the empty
else.
> 
> and
> 
>         +if (!p) {
>         +printk("in sub_remove for id=%d called with null pointer.\n", id);
>         +return(0);
>         +}

That is in there!?  I will check into and fix it.
> 
> and obviously the "nanosleep()" thing and the CLOCK_NANOSLEEP_ENTRY()
> stuff has been discussed in the unrelated thread (ie it doesn't work for
> alpha or other architectures).

Right!  I am merging this now.

-- 
George Anzinger   george@mvista.com
High-res-timers: 
http://sourceforge.net/projects/high-res-timers/
Preemption patch:
http://www.kernel.org/pub/linux/kernel/people/rml