diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/linux/log2.h | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/linux/log2.h')
| -rw-r--r-- | include/linux/log2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/log2.h b/include/linux/log2.h index 57e641e19a81..1b8a2c1cb0e3 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h | |||
| @@ -159,7 +159,7 @@ unsigned long __roundup_pow_of_two(unsigned long n) | |||
| 159 | #define roundup_pow_of_two(n) \ | 159 | #define roundup_pow_of_two(n) \ |
| 160 | ( \ | 160 | ( \ |
| 161 | __builtin_constant_p(n) ? ( \ | 161 | __builtin_constant_p(n) ? ( \ |
| 162 | (n == 1) ? 0 : \ | 162 | (n == 1) ? 1 : \ |
| 163 | (1UL << (ilog2((n) - 1) + 1)) \ | 163 | (1UL << (ilog2((n) - 1) + 1)) \ |
| 164 | ) : \ | 164 | ) : \ |
| 165 | __roundup_pow_of_two(n) \ | 165 | __roundup_pow_of_two(n) \ |