Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36a26c69 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Reported-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarNicholas A. Bellinger <nab@linux-iscsi.org>
parent e48354ce

include/linux/kernel.h

+8 −0
Original line number Diff line number Diff line
@@ -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) (					\