| Message ID | 20200212164949.56434-2-roger.pau@citrix.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | x86: fixes/improvements for scratch cpumask | expand |
On Wed, Feb 12, 2020 at 05:49:47PM +0100, Roger Pau Monne wrote: > Unify the two adjacent header includes that are both gated with ifndef > __ASSEMBLY__. > > No functional change intended. > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Wei Liu <wl@xen.org>
On 13.02.2020 00:05, Wei Liu wrote: > On Wed, Feb 12, 2020 at 05:49:47PM +0100, Roger Pau Monne wrote: >> Unify the two adjacent header includes that are both gated with ifndef >> __ASSEMBLY__. >> >> No functional change intended. >> >> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> > > Reviewed-by: Wei Liu <wl@xen.org> Acked-by: Jan Beulich <jbeulich@suse.com>
diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h index 1aa55d41e1..92d69a5ea0 100644 --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -5,13 +5,10 @@ * We need the APIC definitions automatically as part of 'smp.h' */ #ifndef __ASSEMBLY__ +#include <xen/bitops.h> #include <xen/kernel.h> #include <xen/cpumask.h> #include <asm/current.h> -#endif - -#ifndef __ASSEMBLY__ -#include <xen/bitops.h> #include <asm/mpspec.h> #endif
Unify the two adjacent header includes that are both gated with ifndef __ASSEMBLY__. No functional change intended. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- xen/include/asm-x86/smp.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)