* Sasha Levin <levinsasha928@xxxxxxxxx> wrote: > The local kernel.h may redefine macros already > defined otherwise, wrap it with #ifdef. > > Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx> > --- > tools/kvm/include/linux/kernel.h | 7 +++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/tools/kvm/include/linux/kernel.h b/tools/kvm/include/linux/kernel.h > index 8d83037..fccb624 100644 > --- a/tools/kvm/include/linux/kernel.h > +++ b/tools/kvm/include/linux/kernel.h > @@ -1,10 +1,17 @@ > #ifndef KVM__LINUX_KERNEL_H_ > #define KVM__LINUX_KERNEL_H_ > > +#ifndef DIV_ROUND_UP > #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) > +#endif > > +#ifndef ALIGN > #define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) > +#endif > + > +#ifndef __ALIGN_MASK > #define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) > +#endif Hm, how can duplicate definitions happen? Only one place should define them - otherwise we might end up with incompatible definitions ... Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
