1 files changed, 9 insertions, 3 deletions

diff --git a/include/linux/overflow.h b/include/linux/overflow.h
index 6534a727cadb..659045046468 100644
--- a/include/linux/overflow.h
+++ b/include/linux/overflow.h
@@ -36,6 +36,12 @@
 #define type_max(T) ((T)((__type_half_max(T) - 1) + __type_half_max(T)))
 #define type_min(T) ((T)((T)-type_max(T)-(T)1))
 
+/*
+ * Avoids triggering -Wtype-limits compilation warning,
+ * while using unsigned data types to check a < 0.
+ */
+#define is_non_negative(a) ((a) > 0 || (a) == 0)
+#define is_negative(a) (!(is_non_negative(a)))
 
 #ifdef COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW
 /*
@@ -227,10 +233,10 @@
         typeof(d) _d = d;                                               \
         u64 _a_full = _a;                                               \
         unsigned int _to_shift =                                        \
-                _s >= 0 && _s < 8 * sizeof(*d) ? _s : 0;                \
+                is_non_negative(_s) && _s < 8 * sizeof(*d) ? _s : 0;    \
         *_d = (_a_full << _to_shift);                                   \
-        (_to_shift != _s || *_d < 0 || _a < 0 ||                        \
-                (*_d >> _to_shift) != _a);                              \
+        (_to_shift != _s || is_negative(*_d) || is_negative(_a) ||      \
+        (*_d >> _to_shift) != _a);                                      \
 })
 
 /**