From b4b86416712d79a77cdc53756751b3b91fbb7a3d Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 10 Jul 2008 15:25:21 +0200 Subject: [PATCH] x86, VisWS: turn into generic arch, create include/asm-x86/visws/ move the include/asm-x86/mach-visws/ VISWS specific hardware details include files into include/asm-x86/visws, to be used from generic code. No code changed. Signed-off-by: Ingo Molnar --- arch/x86/mach-visws/setup_visws.c | 4 ++-- arch/x86/mach-visws/traps.c | 6 +++--- arch/x86/mach-visws/visws_apic.c | 3 +-- arch/x86/pci/visws.c | 4 ++-- include/asm-x86/{mach-visws => visws}/cobalt.h | 0 include/asm-x86/{mach-visws => visws}/lithium.h | 0 include/asm-x86/{mach-visws => visws}/piix4.h | 0 7 files changed, 8 insertions(+), 9 deletions(-) rename include/asm-x86/{mach-visws => visws}/cobalt.h (100%) rename include/asm-x86/{mach-visws => visws}/lithium.h (100%) rename include/asm-x86/{mach-visws => visws}/piix4.h (100%) diff --git a/arch/x86/mach-visws/setup_visws.c b/arch/x86/mach-visws/setup_visws.c index bbc149f78a4..e95e9499c8c 100644 --- a/arch/x86/mach-visws/setup_visws.c +++ b/arch/x86/mach-visws/setup_visws.c @@ -8,6 +8,8 @@ #include #include +#include +#include #include #include #include @@ -18,8 +20,6 @@ #include -#include "cobalt.h" -#include "piix4.h" #include "mach_apic.h" #include diff --git a/arch/x86/mach-visws/traps.c b/arch/x86/mach-visws/traps.c index 8a160ec147f..e5e6492c267 100644 --- a/arch/x86/mach-visws/traps.c +++ b/arch/x86/mach-visws/traps.c @@ -7,10 +7,10 @@ #include #include -#include #include -#include "cobalt.h" -#include "lithium.h" +#include +#include +#include #define A01234 (LI_INTA_0 | LI_INTA_1 | LI_INTA_2 | LI_INTA_3 | LI_INTA_4) diff --git a/arch/x86/mach-visws/visws_apic.c b/arch/x86/mach-visws/visws_apic.c index d8b2cfd85d9..6c02c8d0993 100644 --- a/arch/x86/mach-visws/visws_apic.c +++ b/arch/x86/mach-visws/visws_apic.c @@ -22,8 +22,7 @@ #include #include #include - -#include "cobalt.h" +#include static DEFINE_SPINLOCK(cobalt_lock); diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c index 9b883890c0b..1a7bed492bb 100644 --- a/arch/x86/pci/visws.c +++ b/arch/x86/pci/visws.c @@ -9,8 +9,8 @@ #include #include -#include "cobalt.h" -#include "lithium.h" +#include +#include #include "pci.h" diff --git a/include/asm-x86/mach-visws/cobalt.h b/include/asm-x86/visws/cobalt.h similarity index 100% rename from include/asm-x86/mach-visws/cobalt.h rename to include/asm-x86/visws/cobalt.h diff --git a/include/asm-x86/mach-visws/lithium.h b/include/asm-x86/visws/lithium.h similarity index 100% rename from include/asm-x86/mach-visws/lithium.h rename to include/asm-x86/visws/lithium.h diff --git a/include/asm-x86/mach-visws/piix4.h b/include/asm-x86/visws/piix4.h similarity index 100% rename from include/asm-x86/mach-visws/piix4.h rename to include/asm-x86/visws/piix4.h -- 2.46.0