[Xen-devel,03/11] xen/arm: traps: Re-order the includes alphabetically

Message ID 20170811180257.5493-4-julien.grall@arm.com
State New
Headers show
Series
  • xen/arm: Clean-up traps.c
Related show

Commit Message

Julien Grall Aug. 11, 2017, 6:02 p.m.
Signed-off-by: Julien Grall <julien.grall@arm.com>
---
 xen/arch/arm/traps.c | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

Comments

Bhupinder Thakur Aug. 16, 2017, 6:44 a.m. | #1
Hi Julien,

On 11 August 2017 at 23:32, Julien Grall <julien.grall@arm.com> wrote:
> Signed-off-by: Julien Grall <julien.grall@arm.com>
> ---
>  xen/arch/arm/traps.c | 42 ++++++++++++++++++++++--------------------
>  1 file changed, 22 insertions(+), 20 deletions(-)
>
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index c07999b518..ca9bef712c 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -16,41 +16,43 @@
>   * GNU General Public License for more details.
>   */
>
> -#include <xen/init.h>
> -#include <xen/string.h>
> -#include <xen/version.h>
> -#include <xen/smp.h>
> -#include <xen/symbols.h>
> +#include <xen/domain_page.h>
> +#include <xen/errno.h>
> +#include <xen/hypercall.h>
>  #include <xen/irq.h>
> +#include <xen/init.h>
> +#include <xen/iocap.h>
The above two files should be before xen/irq.h.

>  #include <xen/lib.h>
>  #include <xen/livepatch.h>
> +#include <xen/mem_access.h>
>  #include <xen/mm.h>
> -#include <xen/errno.h>
> -#include <xen/hypercall.h>
> -#include <xen/softirq.h>
> -#include <xen/domain_page.h>
>  #include <xen/perfc.h>
> +#include <xen/smp.h>
> +#include <xen/softirq.h>
> +#include <xen/string.h>
> +#include <xen/symbols.h>
> +#include <xen/version.h>
>  #include <xen/virtual_region.h>
> -#include <xen/mem_access.h>
> -#include <xen/iocap.h>
> +
>  #include <public/sched.h>
>  #include <public/xen.h>
> -#include <asm/debugger.h>
> -#include <asm/event.h>
> -#include <asm/regs.h>
> +
> +#include <asm/acpi.h>
>  #include <asm/cpregs.h>
> -#include <asm/psci.h>
> -#include <asm/mmio.h>
> +#include <asm/cpuerrata.h>
>  #include <asm/cpufeature.h>
> +#include <asm/debugger.h>
> +#include <asm/event.h>
>  #include <asm/flushtlb.h>
> +#include <asm/gic.h>
> +#include <asm/psci.h>
>  #include <asm/monitor.h>
> +#include <asm/mmio.h>
The above two files should be before asm/psci.h with asm/mmio.h included first.

> +#include <asm/regs.h>
> +#include <asm/vgic.h>
>
>  #include "decode.h"
>  #include "vtimer.h"
> -#include <asm/gic.h>
> -#include <asm/vgic.h>
> -#include <asm/cpuerrata.h>
> -#include <asm/acpi.h>
>
>  /* The base of the stack must always be double-word aligned, which means
>   * that both the kernel half of struct cpu_user_regs (which is pushed in
> --
> 2.11.0
>

With these two changes.

Acked-by: Bhupinder Thakur <bhupinder.thakur@linaro.org>
Julien Grall Aug. 16, 2017, 11 a.m. | #2
Hi Bhupinder,

On 16/08/17 07:44, Bhupinder Thakur wrote:
> Hi Julien,
>
> On 11 August 2017 at 23:32, Julien Grall <julien.grall@arm.com> wrote:
>> Signed-off-by: Julien Grall <julien.grall@arm.com>
>> ---
>>  xen/arch/arm/traps.c | 42 ++++++++++++++++++++++--------------------
>>  1 file changed, 22 insertions(+), 20 deletions(-)
>>
>> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
>> index c07999b518..ca9bef712c 100644
>> --- a/xen/arch/arm/traps.c
>> +++ b/xen/arch/arm/traps.c
>> @@ -16,41 +16,43 @@
>>   * GNU General Public License for more details.
>>   */
>>
>> -#include <xen/init.h>
>> -#include <xen/string.h>
>> -#include <xen/version.h>
>> -#include <xen/smp.h>
>> -#include <xen/symbols.h>
>> +#include <xen/domain_page.h>
>> +#include <xen/errno.h>
>> +#include <xen/hypercall.h>
>>  #include <xen/irq.h>
>> +#include <xen/init.h>
>> +#include <xen/iocap.h>
> The above two files should be before xen/irq.h.

Got my alphabet wrong :/. Thank you for spotting it! I will fix it in 
the next version.

>
>>  #include <xen/lib.h>
>>  #include <xen/livepatch.h>
>> +#include <xen/mem_access.h>
>>  #include <xen/mm.h>
>> -#include <xen/errno.h>
>> -#include <xen/hypercall.h>
>> -#include <xen/softirq.h>
>> -#include <xen/domain_page.h>
>>  #include <xen/perfc.h>
>> +#include <xen/smp.h>
>> +#include <xen/softirq.h>
>> +#include <xen/string.h>
>> +#include <xen/symbols.h>
>> +#include <xen/version.h>
>>  #include <xen/virtual_region.h>
>> -#include <xen/mem_access.h>
>> -#include <xen/iocap.h>
>> +
>>  #include <public/sched.h>
>>  #include <public/xen.h>
>> -#include <asm/debugger.h>
>> -#include <asm/event.h>
>> -#include <asm/regs.h>
>> +
>> +#include <asm/acpi.h>
>>  #include <asm/cpregs.h>
>> -#include <asm/psci.h>
>> -#include <asm/mmio.h>
>> +#include <asm/cpuerrata.h>
>>  #include <asm/cpufeature.h>
>> +#include <asm/debugger.h>
>> +#include <asm/event.h>
>>  #include <asm/flushtlb.h>
>> +#include <asm/gic.h>
>> +#include <asm/psci.h>
>>  #include <asm/monitor.h>
>> +#include <asm/mmio.h>
> The above two files should be before asm/psci.h with asm/mmio.h included first.

Same here :/

>
>> +#include <asm/regs.h>
>> +#include <asm/vgic.h>
>>
>>  #include "decode.h"
>>  #include "vtimer.h"
>> -#include <asm/gic.h>
>> -#include <asm/vgic.h>
>> -#include <asm/cpuerrata.h>
>> -#include <asm/acpi.h>
>>
>>  /* The base of the stack must always be double-word aligned, which means
>>   * that both the kernel half of struct cpu_user_regs (which is pushed in
>> --
>> 2.11.0
>>
>
> With these two changes.
>
> Acked-by: Bhupinder Thakur <bhupinder.thakur@linaro.org>

Thank you for the review.

Cheers,

Patch

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index c07999b518..ca9bef712c 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -16,41 +16,43 @@ 
  * GNU General Public License for more details.
  */
 
-#include <xen/init.h>
-#include <xen/string.h>
-#include <xen/version.h>
-#include <xen/smp.h>
-#include <xen/symbols.h>
+#include <xen/domain_page.h>
+#include <xen/errno.h>
+#include <xen/hypercall.h>
 #include <xen/irq.h>
+#include <xen/init.h>
+#include <xen/iocap.h>
 #include <xen/lib.h>
 #include <xen/livepatch.h>
+#include <xen/mem_access.h>
 #include <xen/mm.h>
-#include <xen/errno.h>
-#include <xen/hypercall.h>
-#include <xen/softirq.h>
-#include <xen/domain_page.h>
 #include <xen/perfc.h>
+#include <xen/smp.h>
+#include <xen/softirq.h>
+#include <xen/string.h>
+#include <xen/symbols.h>
+#include <xen/version.h>
 #include <xen/virtual_region.h>
-#include <xen/mem_access.h>
-#include <xen/iocap.h>
+
 #include <public/sched.h>
 #include <public/xen.h>
-#include <asm/debugger.h>
-#include <asm/event.h>
-#include <asm/regs.h>
+
+#include <asm/acpi.h>
 #include <asm/cpregs.h>
-#include <asm/psci.h>
-#include <asm/mmio.h>
+#include <asm/cpuerrata.h>
 #include <asm/cpufeature.h>
+#include <asm/debugger.h>
+#include <asm/event.h>
 #include <asm/flushtlb.h>
+#include <asm/gic.h>
+#include <asm/psci.h>
 #include <asm/monitor.h>
+#include <asm/mmio.h>
+#include <asm/regs.h>
+#include <asm/vgic.h>
 
 #include "decode.h"
 #include "vtimer.h"
-#include <asm/gic.h>
-#include <asm/vgic.h>
-#include <asm/cpuerrata.h>
-#include <asm/acpi.h>
 
 /* The base of the stack must always be double-word aligned, which means
  * that both the kernel half of struct cpu_user_regs (which is pushed in