diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:25:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:26:00 -0400 |
| commit | 5af8c4e0fac9838428bd718040b664043a05f37c (patch) | |
| tree | 75a01d98ed244db45fe3c734c4a81c1a3d92ac37 /arch/powerpc/include/asm/sfp-machine.h | |
| parent | 46e0bb9c12f4bab539736f1714cbf16600f681ec (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into sched/urgent
Merge reason: update to latest upstream to queue up fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/include/asm/sfp-machine.h')
| -rw-r--r-- | arch/powerpc/include/asm/sfp-machine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/sfp-machine.h b/arch/powerpc/include/asm/sfp-machine.h index 3d9f831c3c55..3a7a67a0d006 100644 --- a/arch/powerpc/include/asm/sfp-machine.h +++ b/arch/powerpc/include/asm/sfp-machine.h | |||
| @@ -29,9 +29,9 @@ | |||
| 29 | 29 | ||
| 30 | /* basic word size definitions */ | 30 | /* basic word size definitions */ |
| 31 | #define _FP_W_TYPE_SIZE 32 | 31 | #define _FP_W_TYPE_SIZE 32 |
| 32 | #define _FP_W_TYPE unsigned long | 32 | #define _FP_W_TYPE unsigned int |
| 33 | #define _FP_WS_TYPE signed long | 33 | #define _FP_WS_TYPE signed int |
| 34 | #define _FP_I_TYPE long | 34 | #define _FP_I_TYPE int |
| 35 | 35 | ||
| 36 | #define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2)) | 36 | #define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2)) |
| 37 | #define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1)) | 37 | #define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1)) |