[PATCH] fix __SI_CODE

[PATCH] fix __SI_CODE

[Stephen Rothwell]

Hi Linus,

This small patch is extracted from George Anzinger's High-res-timer
patches.  Even if George's patches do not go in, this patch is necessary
to fix up something I missed when I consolidated the siginfo stuff.

Thanks, George.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff -ruN 2.5.41-1.715/include/asm-generic/siginfo.h 2.5.41-1.715-si.2/include/asm-generic/siginfo.h
--- 2.5.41-1.715/include/asm-generic/siginfo.h	2002-06-09 16:12:33.000000000 +1000
+++ 2.5.41-1.715-si.2/include/asm-generic/siginfo.h	2002-10-10 12:26:46.000000000 +1000
@@ -91,7 +91,7 @@
 #define __SI_FAULT	(3 << 16)
 #define __SI_CHLD	(4 << 16)
 #define __SI_RT		(5 << 16)
-#define __SI_CODE(T,N)	((T) << 16 | ((N) & 0xffff))
+#define __SI_CODE(T,N)	((T) | ((N) & 0xffff))
 #else
 #define __SI_KILL	0
 #define __SI_TIMER	0

Re: [PATCH] fix __SI_CODE

[george anzinger]

Stephen Rothwell wrote:
> 
> Hi Linus,
> 
> This small patch is extracted from George Anzinger's High-res-timer
> patches.  Even if George's patches do not go in, this patch is necessary
> to fix up something I missed when I consolidated the siginfo stuff.

Yeah, that has been there for a long time.  The fix to
nano_sleep should also go in.  I am sure there are others...

You might try this on a 2.5.4x system:

time sleep 60

Now remember the standard says NO timer should finish
early.  On most boxes this will sleep less than 60 seconds.

Bad Bad timer :)

-g
> 
> Thanks, George.
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> diff -ruN 2.5.41-1.715/include/asm-generic/siginfo.h 2.5.41-1.715-si.2/include/asm-generic/siginfo.h
> --- 2.5.41-1.715/include/asm-generic/siginfo.h  2002-06-09 16:12:33.000000000 +1000
> +++ 2.5.41-1.715-si.2/include/asm-generic/siginfo.h     2002-10-10 12:26:46.000000000 +1000
> @@ -91,7 +91,7 @@
>  #define __SI_FAULT     (3 << 16)
>  #define __SI_CHLD      (4 << 16)
>  #define __SI_RT                (5 << 16)
> -#define __SI_CODE(T,N) ((T) << 16 | ((N) & 0xffff))
> +#define __SI_CODE(T,N) ((T) | ((N) & 0xffff))
>  #else
>  #define __SI_KILL      0
>  #define __SI_TIMER     0
> -
> 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/

-- 
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