thr3ads.net - Xen devel - [PATCH] xen: remove duplicate #includes [Dec 2013]

If this information is useful, please help other people find it:
Share via:

Matthew Daley

2013-Dec-05 06:10 UTC

[PATCH] xen: remove duplicate #includes

Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
---
Build-tested.

 xen/arch/arm/time.c                    |    1 -
 xen/arch/x86/acpi/boot.c               |    1 -
 xen/arch/x86/acpi/power.c              |    1 -
 xen/arch/x86/hvm/intercept.c           |    1 -
 xen/arch/x86/hvm/svm/svm.c             |    1 -
 xen/arch/x86/setup.c                   |    1 -
 xen/arch/x86/time.c                    |    1 -
 xen/arch/x86/x86_64/acpi_mmcfg.c       |    1 -
 xen/arch/x86/x86_64/traps.c            |    1 -
 xen/common/device_tree.c               |    1 -
 xen/common/gdbstub.c                   |    1 -
 xen/common/kexec.c                     |    1 -
 xen/common/schedule.c                  |    1 -
 xen/drivers/cpufreq/cpufreq_ondemand.c |    1 -
 xen/drivers/cpufreq/utility.c          |    1 -
 xen/drivers/passthrough/vtd/iommu.c    |    1 -
 xen/include/asm-x86/hvm/vpt.h          |    1 -
 17 files changed, 17 deletions(-)

diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 81e3e28..89c4166 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -27,7 +27,6 @@
 #include <xen/softirq.h>
 #include <xen/sched.h>
 #include <xen/time.h>
-#include <xen/sched.h>
 #include <xen/event.h>
 #include <asm/system.h>
 #include <asm/time.h>
diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index 6d7984f..7a9b2cd 100644
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -34,7 +34,6 @@
 #include <asm/page.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
-#include <asm/apic.h>
 #include <asm/io.h>
 #include <asm/mpspec.h>
 #include <asm/processor.h>
diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c
index f41f0de..26d3f70 100644
--- a/xen/arch/x86/acpi/power.c
+++ b/xen/arch/x86/acpi/power.c
@@ -20,7 +20,6 @@
 #include <asm/irq.h>
 #include <asm/init.h>
 #include <xen/spinlock.h>
-#include <xen/sched.h>
 #include <xen/domain.h>
 #include <xen/console.h>
 #include <xen/iommu.h>
diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c
index 7cc13b5..24746c8 100644
--- a/xen/arch/x86/hvm/intercept.c
+++ b/xen/arch/x86/hvm/intercept.c
@@ -26,7 +26,6 @@
 #include <asm/hvm/support.h>
 #include <asm/hvm/domain.h>
 #include <xen/lib.h>
-#include <xen/sched.h>
 #include <asm/current.h>
 #include <io_ports.h>
 #include <xen/event.h>
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 406d394..7eb2f40 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -46,7 +46,6 @@
 #include <asm/hvm/hvm.h>
 #include <asm/hvm/support.h>
 #include <asm/hvm/io.h>
-#include <asm/hvm/emulate.h>
 #include <asm/hvm/svm/asid.h>
 #include <asm/hvm/svm/svm.h>
 #include <asm/hvm/svm/vmcb.h>
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index f07ee2b..1544011 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -10,7 +10,6 @@
 #include <xen/acpi.h>
 #include <xen/efi.h>
 #include <xen/console.h>
-#include <xen/serial.h>
 #include <xen/trace.h>
 #include <xen/multiboot.h>
 #include <xen/domain_page.h>
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index e463600..b590f68 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -14,7 +14,6 @@
 #include <xen/event.h>
 #include <xen/sched.h>
 #include <xen/lib.h>
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/time.h>
 #include <xen/timer.h>
diff --git a/xen/arch/x86/x86_64/acpi_mmcfg.c b/xen/arch/x86/x86_64/acpi_mmcfg.c
index 3666193..7416633 100644
--- a/xen/arch/x86/x86_64/acpi_mmcfg.c
+++ b/xen/arch/x86/x86_64/acpi_mmcfg.c
@@ -35,7 +35,6 @@
 #include <asm/page.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
-#include <asm/apic.h>
 #include <asm/io.h>
 #include <asm/mpspec.h>
 #include <asm/processor.h>
diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index ad09415..85eee45 100644
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -9,7 +9,6 @@
 #include <xen/irq.h>
 #include <xen/symbols.h>
 #include <xen/console.h>
-#include <xen/sched.h>
 #include <xen/shutdown.h>
 #include <xen/nmi.h>
 #include <xen/guest_access.h>
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 943b181..8db083b 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -22,7 +22,6 @@
 #include <xen/string.h>
 #include <xen/cpumask.h>
 #include <xen/ctype.h>
-#include <xen/lib.h>
 #include <asm/early_printk.h>
 
 struct dt_early_info __initdata early_info;
diff --git a/xen/common/gdbstub.c b/xen/common/gdbstub.c
index 67ff726..0bcc696 100644
--- a/xen/common/gdbstub.c
+++ b/xen/common/gdbstub.c
@@ -45,7 +45,6 @@
 #include <xen/console.h>
 #include <xen/errno.h>
 #include <xen/delay.h>
-#include <xen/init.h>
 #include <asm/byteorder.h>
 
 /* Printk isn''t particularly safe just after we''ve trapped to
the
diff --git a/xen/common/kexec.c b/xen/common/kexec.c
index 481b0c2..95ae820 100644
--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -24,7 +24,6 @@
 #include <xen/spinlock.h>
 #include <xen/version.h>
 #include <xen/console.h>
-#include <xen/kexec.h>
 #include <xen/kimage.h>
 #include <public/elfnote.h>
 #include <xsm/xsm.h>
diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index 1192fe2..da28817 100644
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -34,7 +34,6 @@
 #include <xen/multicall.h>
 #include <xen/cpu.h>
 #include <xen/preempt.h>
-#include <xen/event.h>
 #include <public/sched.h>
 #include <xsm/xsm.h>
 
diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c
b/xen/drivers/cpufreq/cpufreq_ondemand.c
index 7fdba03..c0fbc95 100644
--- a/xen/drivers/cpufreq/cpufreq_ondemand.c
+++ b/xen/drivers/cpufreq/cpufreq_ondemand.c
@@ -15,7 +15,6 @@
 #include <xen/types.h>
 #include <xen/percpu.h>
 #include <xen/cpumask.h>
-#include <xen/types.h>
 #include <xen/sched.h>
 #include <xen/timer.h>
 #include <acpi/cpufreq/cpufreq.h>
diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c
index 519f862..b244f7a 100644
--- a/xen/drivers/cpufreq/utility.c
+++ b/xen/drivers/cpufreq/utility.c
@@ -24,7 +24,6 @@
 #include <xen/types.h>
 #include <xen/spinlock.h>
 #include <xen/percpu.h>
-#include <xen/types.h>
 #include <xen/sched.h>
 #include <xen/timer.h>
 #include <xen/trace.h>
diff --git a/xen/drivers/passthrough/vtd/iommu.c
b/xen/drivers/passthrough/vtd/iommu.c
index b6b48e2..ce7df71 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -31,7 +31,6 @@
 #include <xen/pci.h>
 #include <xen/pci_regs.h>
 #include <xen/keyhandler.h>
-#include <xen/softirq.h>
 #include <asm/msi.h>
 #include <asm/irq.h>
 #include <asm/hvm/vmx/vmx.h>
diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h
index 87c3a66..4cde482 100644
--- a/xen/include/asm-x86/hvm/vpt.h
+++ b/xen/include/asm-x86/hvm/vpt.h
@@ -25,7 +25,6 @@
 #include <xen/lib.h>
 #include <xen/time.h>
 #include <xen/errno.h>
-#include <xen/time.h>
 #include <xen/timer.h>
 #include <xen/list.h>
 #include <asm/hvm/vpic.h>
-- 
1.7.10.4

George Dunlap

2013-Dec-05 10:58 UTC

head link

Re: [PATCH] xen: remove duplicate #includes

On 12/05/2013 06:10 AM, Matthew Daley wrote:> Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
Is this actually causing any problems at the moment?

Although it''s pretty unlikely, there is a very small chance that this 
could cause a build breakage somewhere down the line; so if the "cost"
of the redundant includes is just a few extra lines and a few extra file 
opens during compile, I''m inclined to say this should wait until 4.5.

  -George

Matthew Daley

2013-Dec-05 12:34 UTC

head link

Re: [PATCH] xen: remove duplicate #includes

On Thu, Dec 5, 2013 at 11:58 PM, George Dunlap
<george.dunlap@eu.citrix.com> wrote:> On 12/05/2013 06:10 AM, Matthew Daley wrote:
>>
>> Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
>
>
> Is this actually causing any problems at the moment?
No, it''s just cleanup.
>
> Although it''s pretty unlikely, there is a very small chance that
this could
> cause a build breakage somewhere down the line; so if the "cost"
of the
> redundant includes is just a few extra lines and a few extra file opens
> during compile, I''m inclined to say this should wait until 4.5.
I agree that it can wait until 4.5; I''ll repost it then. Thanks!

- Matthew

Xen devel - Dec 2013 - [PATCH] xen: remove duplicate #includes

[PATCH] xen: remove duplicate #includes

Re: [PATCH] xen: remove duplicate #includes

Re: [PATCH] xen: remove duplicate #includes