On 17/05/2025 12:21 am, Stefano Stabellini wrote: > diff --git a/xen/include/xen/err.h b/xen/include/xen/err.h > index cbdd1bf7f8..5bdf8b215c 100644 > --- a/xen/include/xen/err.h > +++ b/xen/include/xen/err.h > @@ -1,5 +1,7 @@ > -#if !defined(__XEN_ERR_H__) && !defined(__ASSEMBLY__) > -#define __XEN_ERR_H__ > +#if !defined(XEN_ERR_H) > +#define XEN_ERR_H
I know this is just rearranging the existing like, but both the defined()'s should turn into the more normal #ifndef's now they're split. Same for softirq.h > + > +#if !defined(__ASSEMBLY__) > > #include <xen/compiler.h> > #include <xen/errno.h> > @@ -41,4 +43,6 @@ static inline int __must_check PTR_RET(const void *ptr) > return IS_ERR(ptr) ? PTR_ERR(ptr) : 0; > } > > -#endif /* __XEN_ERR_H__ */ > +#endif /* __ASSEMBLY__ */ > + > +#endif /* XEN_ERR_H */ I realise this is personal preference, but for the end of a header like this where each is annotated properly, I don't see much value having the extra blank line. ~Andrew
