| Message ID | 20221216114853.8227-2-julien@xen.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove the directmap | expand |
On 16.12.2022 12:48, Julien Grall wrote: > From: Julien Grall <jgrall@amazon.com> > > Order the includes with the xen headers first, then asm headers and > last public headers. Within each category, they are sorted alphabetically. > > Note that the includes in protected by CONFIG_X86 hasn't been sorted > to avoid adding multiple #ifdef. > > Signed-off-by: Julien Grall <jgrall@amazon.com> Acked-by: Jan Beulich <jbeulich@suse.com> > ---- > > I am open to add sort the includes protected by CONFIG_X86 > and add multiple #ifdef if this is preferred. I, for one, prefer it the way you've done it. Jan
Hi Jan, On 16/12/2022 12:03, Jan Beulich wrote: > On 16.12.2022 12:48, Julien Grall wrote: >> From: Julien Grall <jgrall@amazon.com> >> >> Order the includes with the xen headers first, then asm headers and >> last public headers. Within each category, they are sorted alphabetically. >> >> Note that the includes in protected by CONFIG_X86 hasn't been sorted >> to avoid adding multiple #ifdef. >> >> Signed-off-by: Julien Grall <jgrall@amazon.com> > > Acked-by: Jan Beulich <jbeulich@suse.com> Thanks! > >> ---- >> >> I am open to add sort the includes protected by CONFIG_X86 >> and add multiple #ifdef if this is preferred. > > I, for one, prefer it the way you've done it. Ok. I have committed the patch as-is . Cheers,
On Fri, 16 Dec 2022, Julien Grall wrote: > From: Julien Grall <jgrall@amazon.com> > > Order the includes with the xen headers first, then asm headers and > last public headers. Within each category, they are sorted alphabetically. > > Note that the includes in protected by CONFIG_X86 hasn't been sorted > to avoid adding multiple #ifdef. > > Signed-off-by: Julien Grall <jgrall@amazon.com> This patch doesn't apply as is any longer. Assuming it gets ported to the latest staging appropriately: Acked-by: Stefano Stabellini <sstabellini@kernel.org> > ---- > > I am open to add sort the includes protected by CONFIG_X86 > and add multiple #ifdef if this is preferred. > --- > xen/common/page_alloc.c | 29 ++++++++++++++++------------- > 1 file changed, 16 insertions(+), 13 deletions(-) > > diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c > index 0c93a1078702..0a950288e241 100644 > --- a/xen/common/page_alloc.c > +++ b/xen/common/page_alloc.c > @@ -120,27 +120,30 @@ > * regions within it. > */ > > +#include <xen/domain_page.h> > +#include <xen/event.h> > #include <xen/init.h> > -#include <xen/types.h> > +#include <xen/irq.h> > +#include <xen/keyhandler.h> > #include <xen/lib.h> > -#include <xen/sched.h> > -#include <xen/spinlock.h> > #include <xen/mm.h> > +#include <xen/nodemask.h> > +#include <xen/numa.h> > #include <xen/param.h> > -#include <xen/irq.h> > -#include <xen/softirq.h> > -#include <xen/domain_page.h> > -#include <xen/keyhandler.h> > #include <xen/perfc.h> > #include <xen/pfn.h> > -#include <xen/numa.h> > -#include <xen/nodemask.h> > -#include <xen/event.h> > +#include <xen/types.h> > +#include <xen/sched.h> > +#include <xen/softirq.h> > +#include <xen/spinlock.h> > + > +#include <asm/flushtlb.h> > +#include <asm/numa.h> > +#include <asm/page.h> > + > #include <public/sysctl.h> > #include <public/sched.h> > -#include <asm/page.h> > -#include <asm/numa.h> > -#include <asm/flushtlb.h> > + > #ifdef CONFIG_X86 > #include <asm/guest.h> > #include <asm/p2m.h> > -- > 2.38.1 >
Hi Stefano, On 23/01/2023 21:29, Stefano Stabellini wrote: > On Fri, 16 Dec 2022, Julien Grall wrote: >> From: Julien Grall <jgrall@amazon.com> >> >> Order the includes with the xen headers first, then asm headers and >> last public headers. Within each category, they are sorted alphabetically. >> >> Note that the includes in protected by CONFIG_X86 hasn't been sorted >> to avoid adding multiple #ifdef. >> >> Signed-off-by: Julien Grall <jgrall@amazon.com> > > This patch doesn't apply as is any longer. That's expected given that I committed this patch a month ago (see my answer to Jan's e-mail on the 23rd December). Cheers,
diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 0c93a1078702..0a950288e241 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -120,27 +120,30 @@ * regions within it. */ +#include <xen/domain_page.h> +#include <xen/event.h> #include <xen/init.h> -#include <xen/types.h> +#include <xen/irq.h> +#include <xen/keyhandler.h> #include <xen/lib.h> -#include <xen/sched.h> -#include <xen/spinlock.h> #include <xen/mm.h> +#include <xen/nodemask.h> +#include <xen/numa.h> #include <xen/param.h> -#include <xen/irq.h> -#include <xen/softirq.h> -#include <xen/domain_page.h> -#include <xen/keyhandler.h> #include <xen/perfc.h> #include <xen/pfn.h> -#include <xen/numa.h> -#include <xen/nodemask.h> -#include <xen/event.h> +#include <xen/types.h> +#include <xen/sched.h> +#include <xen/softirq.h> +#include <xen/spinlock.h> + +#include <asm/flushtlb.h> +#include <asm/numa.h> +#include <asm/page.h> + #include <public/sysctl.h> #include <public/sched.h> -#include <asm/page.h> -#include <asm/numa.h> -#include <asm/flushtlb.h> + #ifdef CONFIG_X86 #include <asm/guest.h> #include <asm/p2m.h>