On Fri Jun 6, 2025 at 8:52 AM CEST, Jan Beulich wrote: > On 05.06.2025 21:47, Alejandro Vallejo wrote: >> --- a/xen/common/grant_table.c >> +++ b/xen/common/grant_table.c >> @@ -42,8 +42,10 @@ >> #include <xen/xvmalloc.h> >> #include <xen/nospec.h> >> #include <xsm/xsm.h> >> + >> #include <asm/flushtlb.h> >> #include <asm/guest_atomics.h> >> +#include <asm/grant_table.h> >> >> #ifdef CONFIG_PV_SHIM >> #include <asm/guest.h> >> --- a/xen/include/xen/grant_table.h >> +++ b/xen/include/xen/grant_table.h >> @@ -27,10 +27,6 @@ >> #include <xen/rwlock.h> >> #include <public/grant_table.h> >> >> -#ifdef CONFIG_GRANT_TABLE >> -#include <asm/grant_table.h> >> -#endif >> - >> struct grant_table; >> >> /* Seed a gnttab entry for Hyperlaunch/dom0less. */ > > The description doesn't make clear why these two files need changing. > > Jan
What sort of description? I removed a conditional include and added it to one of the few places it didn't include it already along with xen/grant_table.h. The title does say the patch removes the crossed includes in asm/grant_table.h and xen/grant_table.h. It's, I hope, self-explanatory regular spring cleanup. Cheers, Alejandro