summaryrefslogtreecommitdiff
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorRodrigo Vivi <rodrigo.vivi@intel.com>2019-07-29 08:51:48 -0700
committerRodrigo Vivi <rodrigo.vivi@intel.com>2019-07-29 08:51:48 -0700
commited32f8d42cee118b075e4372a55c7739a11094b2 (patch)
tree5a806c5168d4177e0536b98b6bda30ec4bdbac43 /include/linux/kernel.h
parent60a4233a4952729089e4df152e730f8f4d0e82ce (diff)
parent5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff)
Merge drm/drm-next into drm-intel-next-queued
Catching up with 5.3-rc* Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 74b1ee9027f5..4fa360a13c1e 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -88,12 +88,15 @@
*/
#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
+#define typeof_member(T, m) typeof(((T*)0)->m)
+
#define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP
#define DIV_ROUND_DOWN_ULL(ll, d) \
({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; })
-#define DIV_ROUND_UP_ULL(ll, d) DIV_ROUND_DOWN_ULL((ll) + (d) - 1, (d))
+#define DIV_ROUND_UP_ULL(ll, d) \
+ DIV_ROUND_DOWN_ULL((unsigned long long)(ll) + (d) - 1, (d))
#if BITS_PER_LONG == 32
# define DIV_ROUND_UP_SECTOR_T(ll,d) DIV_ROUND_UP_ULL(ll, d)