diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-02-08 08:47:06 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-02-08 08:47:06 -0500 |
| commit | 693270471d96a63897bd132df15e00da826fa84b (patch) | |
| tree | fc383f7526e1386ba7dedc1576e793039d302661 /include/linux/bits.h | |
| parent | 047371968ffc470769f541d6933e262dc7085456 (diff) | |
| parent | db7d6fbc10447090bab8691a907a7c383ec66f58 (diff) | |
| download | linux-693270471d96a63897bd132df15e00da826fa84b.tar.gz linux-693270471d96a63897bd132df15e00da826fa84b.tar.bz2 linux-693270471d96a63897bd132df15e00da826fa84b.zip | |
Merge branch 'kvm-uapi'
More cleanups of KVM's main header:
* remove thoroughly obsolete APIs
* move architecture-dependent stuff to uapi/asm/kvm.h
* small cleanups to __KVM_HAVE_* symbols
Diffstat (limited to 'include/linux/bits.h')
| -rw-r--r-- | include/linux/bits.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/bits.h b/include/linux/bits.h index 7c0cf5031abe..0eb24d21aac2 100644 --- a/include/linux/bits.h +++ b/include/linux/bits.h @@ -4,6 +4,7 @@ #include <linux/const.h> #include <vdso/bits.h> +#include <uapi/linux/bits.h> #include <asm/bitsperlong.h> #define BIT_MASK(nr) (UL(1) << ((nr) % BITS_PER_LONG)) @@ -30,15 +31,8 @@ #define GENMASK_INPUT_CHECK(h, l) 0 #endif -#define __GENMASK(h, l) \ - (((~UL(0)) - (UL(1) << (l)) + 1) & \ - (~UL(0) >> (BITS_PER_LONG - 1 - (h)))) #define GENMASK(h, l) \ (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l)) - -#define __GENMASK_ULL(h, l) \ - (((~ULL(0)) - (ULL(1) << (l)) + 1) & \ - (~ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h)))) #define GENMASK_ULL(h, l) \ (GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l)) |