| Message ID | 20210521085849.37676-3-joerichey94@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Don't use BIT() macro in UAPI headers | expand |
On 21/05/21 10:58, Joe Richey wrote: > From: Joe Richey <joerichey@google.com> > > Replace BIT() in KVM's UPAI header with _BITUL(). BIT() is not defined > in the UAPI headers and its usage may cause userspace build errors. > > Fixes: fb04a1eddb1a ("KVM: X86: Implement ring-based dirty memory tracking") > Signed-off-by: Joe Richey <joerichey@google.com> > --- > include/uapi/linux/kvm.h | 5 +++-- > tools/include/uapi/linux/kvm.h | 5 +++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 3fd9a7e9d90c..79d9c44d1ad7 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -8,6 +8,7 @@ > * Note: you must update KVM_API_VERSION if you change this interface. > */ > > +#include <linux/const.h> > #include <linux/types.h> > #include <linux/compiler.h> > #include <linux/ioctl.h> > @@ -1879,8 +1880,8 @@ struct kvm_hyperv_eventfd { > * conversion after harvesting an entry. Also, it must not skip any > * dirty bits, so that dirty bits are always harvested in sequence. > */ > -#define KVM_DIRTY_GFN_F_DIRTY BIT(0) > -#define KVM_DIRTY_GFN_F_RESET BIT(1) > +#define KVM_DIRTY_GFN_F_DIRTY _BITUL(0) > +#define KVM_DIRTY_GFN_F_RESET _BITUL(1) > #define KVM_DIRTY_GFN_F_MASK 0x3 > > /* > diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h > index 3fd9a7e9d90c..79d9c44d1ad7 100644 > --- a/tools/include/uapi/linux/kvm.h > +++ b/tools/include/uapi/linux/kvm.h > @@ -8,6 +8,7 @@ > * Note: you must update KVM_API_VERSION if you change this interface. > */ > > +#include <linux/const.h> > #include <linux/types.h> > #include <linux/compiler.h> > #include <linux/ioctl.h> > @@ -1879,8 +1880,8 @@ struct kvm_hyperv_eventfd { > * conversion after harvesting an entry. Also, it must not skip any > * dirty bits, so that dirty bits are always harvested in sequence. > */ > -#define KVM_DIRTY_GFN_F_DIRTY BIT(0) > -#define KVM_DIRTY_GFN_F_RESET BIT(1) > +#define KVM_DIRTY_GFN_F_DIRTY _BITUL(0) > +#define KVM_DIRTY_GFN_F_RESET _BITUL(1) > #define KVM_DIRTY_GFN_F_MASK 0x3 > > /* > Queued thi sone, thanks. Paolo
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 3fd9a7e9d90c..79d9c44d1ad7 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -8,6 +8,7 @@ * Note: you must update KVM_API_VERSION if you change this interface. */ +#include <linux/const.h> #include <linux/types.h> #include <linux/compiler.h> #include <linux/ioctl.h> @@ -1879,8 +1880,8 @@ struct kvm_hyperv_eventfd { * conversion after harvesting an entry. Also, it must not skip any * dirty bits, so that dirty bits are always harvested in sequence. */ -#define KVM_DIRTY_GFN_F_DIRTY BIT(0) -#define KVM_DIRTY_GFN_F_RESET BIT(1) +#define KVM_DIRTY_GFN_F_DIRTY _BITUL(0) +#define KVM_DIRTY_GFN_F_RESET _BITUL(1) #define KVM_DIRTY_GFN_F_MASK 0x3 /* diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h index 3fd9a7e9d90c..79d9c44d1ad7 100644 --- a/tools/include/uapi/linux/kvm.h +++ b/tools/include/uapi/linux/kvm.h @@ -8,6 +8,7 @@ * Note: you must update KVM_API_VERSION if you change this interface. */ +#include <linux/const.h> #include <linux/types.h> #include <linux/compiler.h> #include <linux/ioctl.h> @@ -1879,8 +1880,8 @@ struct kvm_hyperv_eventfd { * conversion after harvesting an entry. Also, it must not skip any * dirty bits, so that dirty bits are always harvested in sequence. */ -#define KVM_DIRTY_GFN_F_DIRTY BIT(0) -#define KVM_DIRTY_GFN_F_RESET BIT(1) +#define KVM_DIRTY_GFN_F_DIRTY _BITUL(0) +#define KVM_DIRTY_GFN_F_RESET _BITUL(1) #define KVM_DIRTY_GFN_F_MASK 0x3 /*