diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2021-05-27 14:32:13 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-05-27 14:32:13 +0200 |
| commit | ffa52910faff64f2070af42c22d782c4572d889e (patch) | |
| tree | 18c103f25a1467d02af1ebf27d7f0a8b177f5825 /include/linux/minmax.h | |
| parent | 5ccbb2ee039f0bd81e2b34b670718186753a4e17 (diff) | |
| parent | 5522e9f7b0fbe2a0cb89c199b574523becc8c3ab (diff) | |
Merge drm/drm-next into drm-misc-next
i915 is broken without -rc3, let's bring that tag in to fix it.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/linux/minmax.h')
| -rw-r--r-- | include/linux/minmax.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/minmax.h b/include/linux/minmax.h index c0f57b0c64d9..5433c08fcc68 100644 --- a/include/linux/minmax.h +++ b/include/linux/minmax.h @@ -2,6 +2,8 @@ #ifndef _LINUX_MINMAX_H #define _LINUX_MINMAX_H +#include <linux/const.h> + /* * min()/max()/clamp() macros must accomplish three things: * @@ -17,14 +19,6 @@ #define __typecheck(x, y) \ (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1))) -/* - * This returns a constant expression while determining if an argument is - * a constant expression, most importantly without evaluating the argument. - * Glory to Martin Uecker <Martin.Uecker@med.uni-goettingen.de> - */ -#define __is_constexpr(x) \ - (sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8))) - #define __no_side_effects(x, y) \ (__is_constexpr(x) && __is_constexpr(y)) |