[Xen-changelog] [xen master] x86/smp: unify header includes in smp.h

[patchbot@xxxxxxx]

commit 465614a6b9a41a6e20b219308079f829ec6869fe
Author:     Roger Pau Monne <roger.pau@xxxxxxxxxx>
AuthorDate: Mon Feb 17 19:43:19 2020 +0100
Commit:     Wei Liu <wl@xxxxxxx>
CommitDate: Tue Feb 18 12:33:33 2020 +0000

    x86/smp: unify header includes in smp.h
    
    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@xxxxxxxxxx>
    Reviewed-by: Wei Liu <wl@xxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/include/asm-x86/smp.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog