diff options
| author | Richard Henderson <rth@are.twiddle.net> | 2002-02-13 07:45:46 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@are.twiddle.net> | 2002-02-13 07:45:46 -0800 |
| commit | 9492bb64740b16042ae6d8845876e97ecd444bc2 (patch) | |
| tree | 74897b95d8ad4a66442a47f96d50ba9d746f6e36 /include | |
| parent | 7994321a1382436bd3698e2eb9d2990a0979bf23 (diff) | |
| parent | 87c270dc46e0ec19902103712ff95649c5ea50e8 (diff) | |
Merge http://linux.bkbits.net:8080/linux-2.5
into are.twiddle.net:/home/rth/BK/linux-alpha-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/mmu_context.h | 9 | ||||
| -rw-r--r-- | include/math-emu/op-4.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h index 94d26e7b60f3..8bfa7d172fb5 100644 --- a/include/asm-alpha/mmu_context.h +++ b/include/asm-alpha/mmu_context.h @@ -24,13 +24,10 @@ /* ??? This does not belong here. */ /* * Every architecture must define this function. It's the fastest - * way of searching a 168-bit bitmap where the first 128 bits are - * unlikely to be set. It's guaranteed that at least one of the 168 - * bits is set. + * way of searching a 140-bit bitmap where the first 100 bits are + * unlikely to be set. It's guaranteed that at least one of the 140 + * bits is cleared. */ -#if MAX_RT_PRIO != 128 || MAX_PRIO > 192 -# error update this function. -#endif static inline int sched_find_first_bit(unsigned long *b) diff --git a/include/math-emu/op-4.h b/include/math-emu/op-4.h index 2aa1356325ad..bb0305e59f63 100644 --- a/include/math-emu/op-4.h +++ b/include/math-emu/op-4.h @@ -645,7 +645,7 @@ X##_f[1] = (rsize <= _FP_W_TYPE_SIZE ? 0 : r >> _FP_W_TYPE_SIZE); \ X##_f[2] = (rsize <= 2*_FP_W_TYPE_SIZE ? 0 : r >> 2*_FP_W_TYPE_SIZE); \ X##_f[3] = (rsize <= 3*_FP_W_TYPE_SIZE ? 0 : r >> 3*_FP_W_TYPE_SIZE); \ - } while (0); + } while (0) #define _FP_FRAC_CONV_4_1(dfs, sfs, D, S) \ do { \ |