diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-07-26 00:35:26 -0700 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-07-26 09:17:07 +0000 |
| commit | 36a26c69b4c70396ef569c3452690fba0c1dec08 (patch) | |
| tree | 42b19666615bae3490c894bd0c2e78e1ac752f3a /include/linux/kernel.h | |
| parent | e48354ce078c079996f89d715dfa44814b4eba01 (diff) | |
| download | linux-3.10-36a26c69b4c70396ef569c3452690fba0c1dec08.tar.gz linux-3.10-36a26c69b4c70396ef569c3452690fba0c1dec08.tar.bz2 linux-3.10-36a26c69b4c70396ef569c3452690fba0c1dec08.zip | |
kernel.h: Add DIV_ROUND_UP_ULL and DIV_ROUND_UP_SECTOR_T macro usage
Add new DIV_ROUND_UP_SECTOR_T macro usage for 32-bit architectures requiring
a new DIV_ROUND_UP_ULL, and existing 64-bit usage with DIV_ROUND_UP.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 567a6f7bbee..2642497c36f 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -56,6 +56,14 @@ #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) +#define DIV_ROUND_UP_ULL(ll,d) \ + ({ unsigned long long _tmp = (ll)+(d)-1; do_div(_tmp, d); _tmp; }) + +#if BITS_PER_LONG == 32 +# define DIV_ROUND_UP_SECTOR_T(ll,d) DIV_ROUND_UP_ULL(ll, d) +#else +# define DIV_ROUND_UP_SECTOR_T(ll,d) DIV_ROUND_UP(ll,d) +#endif /* The `const' in roundup() prevents gcc-3.3 from calling __divdi3 */ #define roundup(x, y) ( \ |