diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-05-27 13:07:47 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-05-27 13:07:47 +0200 |
| commit | 5522e9f7b0fbe2a0cb89c199b574523becc8c3ab (patch) | |
| tree | 9615e9f60c8f157869dc3812b8c3f7f66298eb1d /include/linux/bits.h | |
| parent | 9a91e5e0af5e03940d0eec72c36364a1701de240 (diff) | |
| parent | c4681547bcce777daf576925a966ffa824edd09d (diff) | |
Merge v5.13-rc3 into drm-next
drm/i915 is extremely on fire without the below revert from -rc3:
commit 293837b9ac8d3021657f44c9d7a14948ec01c5d0
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed May 19 05:55:57 2021 -1000
Revert "i915: fix remap_io_sg to verify the pgprot"
Backmerge so we don't have a too wide bisect window for anything
that's a more involved workload than booting the driver.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/linux/bits.h')
| -rw-r--r-- | include/linux/bits.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bits.h b/include/linux/bits.h index 7f475d59a097..87d112650dfb 100644 --- a/include/linux/bits.h +++ b/include/linux/bits.h @@ -22,7 +22,7 @@ #include <linux/build_bug.h> #define GENMASK_INPUT_CHECK(h, l) \ (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \ - __builtin_constant_p((l) > (h)), (l) > (h), 0))) + __is_constexpr((l) > (h)), (l) > (h), 0))) #else /* * BUILD_BUG_ON_ZERO is not available in h files included from asm files, |