From 9702785a747aa27baf46ff504beab6528f21f2dd Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:16:51 +0200 Subject: [PATCH] i386: move xen Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/i386/Kconfig | 2 +- arch/i386/Makefile | 2 +- arch/i386/kernel/head_32.S | 2 +- arch/i386/kernel/vsyscall-note_32.S | 2 +- arch/{i386 => x86}/xen/Kconfig | 0 arch/{i386 => x86}/xen/Makefile | 0 arch/{i386 => x86}/xen/enlighten.c | 0 arch/{i386 => x86}/xen/events.c | 0 arch/{i386 => x86}/xen/features.c | 0 arch/{i386 => x86}/xen/manage.c | 0 arch/{i386 => x86}/xen/mmu.c | 0 arch/{i386 => x86}/xen/mmu.h | 0 arch/{i386 => x86}/xen/multicalls.c | 0 arch/{i386 => x86}/xen/multicalls.h | 0 arch/{i386 => x86}/xen/setup.c | 0 arch/{i386 => x86}/xen/smp.c | 0 arch/{i386 => x86}/xen/time.c | 0 arch/{i386 => x86}/xen/vdso.h | 0 arch/{i386 => x86}/xen/xen-asm.S | 0 arch/{i386 => x86}/xen/xen-head.S | 0 arch/{i386 => x86}/xen/xen-ops.h | 0 21 files changed, 4 insertions(+), 4 deletions(-) rename arch/{i386 => x86}/xen/Kconfig (100%) rename arch/{i386 => x86}/xen/Makefile (100%) rename arch/{i386 => x86}/xen/enlighten.c (100%) rename arch/{i386 => x86}/xen/events.c (100%) rename arch/{i386 => x86}/xen/features.c (100%) rename arch/{i386 => x86}/xen/manage.c (100%) rename arch/{i386 => x86}/xen/mmu.c (100%) rename arch/{i386 => x86}/xen/mmu.h (100%) rename arch/{i386 => x86}/xen/multicalls.c (100%) rename arch/{i386 => x86}/xen/multicalls.h (100%) rename arch/{i386 => x86}/xen/setup.c (100%) rename arch/{i386 => x86}/xen/smp.c (100%) rename arch/{i386 => x86}/xen/time.c (100%) rename arch/{i386 => x86}/xen/vdso.h (100%) rename arch/{i386 => x86}/xen/xen-asm.S (100%) rename arch/{i386 => x86}/xen/xen-head.S (100%) rename arch/{i386 => x86}/xen/xen-ops.h (100%) diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 561cc21914b2..0f6186f03034 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -226,7 +226,7 @@ config PARAVIRT However, when run without a hypervisor the kernel is theoretically slower. If in doubt, say N. -source "arch/i386/xen/Kconfig" +source "arch/x86/xen/Kconfig" config VMI bool "VMI Paravirt-ops support" diff --git a/arch/i386/Makefile b/arch/i386/Makefile index c462803a4db2..fc85d6674fcb 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -94,7 +94,7 @@ mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/ # Xen paravirtualization support -core-$(CONFIG_XEN) += arch/i386/xen/ +core-$(CONFIG_XEN) += arch/x86/xen/ # default subarch .h files mflags-y += -Iinclude/asm-i386/mach-default diff --git a/arch/i386/kernel/head_32.S b/arch/i386/kernel/head_32.S index 8f0382161c91..9150ca9b5f80 100644 --- a/arch/i386/kernel/head_32.S +++ b/arch/i386/kernel/head_32.S @@ -537,7 +537,7 @@ fault_msg: .ascii "Int %d: CR2 %p err %p EIP %p CS %p flags %p\n" .asciz "Stack: %p %p %p %p %p %p %p %p\n" -#include "../xen/xen-head.S" +#include "../../x86/xen/xen-head.S" /* * The IDT and GDT 'descriptors' are a strange 48-bit object diff --git a/arch/i386/kernel/vsyscall-note_32.S b/arch/i386/kernel/vsyscall-note_32.S index 07c0daf78237..fcf376a37f79 100644 --- a/arch/i386/kernel/vsyscall-note_32.S +++ b/arch/i386/kernel/vsyscall-note_32.S @@ -33,7 +33,7 @@ ELFNOTE_END * at boot time we set VDSO_NOTE_NONEGSEG_BIT if running under Xen. */ -#include "../xen/vdso.h" /* Defines VDSO_NOTE_NONEGSEG_BIT. */ +#include "../../x86/xen/vdso.h" /* Defines VDSO_NOTE_NONEGSEG_BIT. */ .globl VDSO_NOTE_MASK ELFNOTE_START(GNU, 2, "a") diff --git a/arch/i386/xen/Kconfig b/arch/x86/xen/Kconfig similarity index 100% rename from arch/i386/xen/Kconfig rename to arch/x86/xen/Kconfig diff --git a/arch/i386/xen/Makefile b/arch/x86/xen/Makefile similarity index 100% rename from arch/i386/xen/Makefile rename to arch/x86/xen/Makefile diff --git a/arch/i386/xen/enlighten.c b/arch/x86/xen/enlighten.c similarity index 100% rename from arch/i386/xen/enlighten.c rename to arch/x86/xen/enlighten.c diff --git a/arch/i386/xen/events.c b/arch/x86/xen/events.c similarity index 100% rename from arch/i386/xen/events.c rename to arch/x86/xen/events.c diff --git a/arch/i386/xen/features.c b/arch/x86/xen/features.c similarity index 100% rename from arch/i386/xen/features.c rename to arch/x86/xen/features.c diff --git a/arch/i386/xen/manage.c b/arch/x86/xen/manage.c similarity index 100% rename from arch/i386/xen/manage.c rename to arch/x86/xen/manage.c diff --git a/arch/i386/xen/mmu.c b/arch/x86/xen/mmu.c similarity index 100% rename from arch/i386/xen/mmu.c rename to arch/x86/xen/mmu.c diff --git a/arch/i386/xen/mmu.h b/arch/x86/xen/mmu.h similarity index 100% rename from arch/i386/xen/mmu.h rename to arch/x86/xen/mmu.h diff --git a/arch/i386/xen/multicalls.c b/arch/x86/xen/multicalls.c similarity index 100% rename from arch/i386/xen/multicalls.c rename to arch/x86/xen/multicalls.c diff --git a/arch/i386/xen/multicalls.h b/arch/x86/xen/multicalls.h similarity index 100% rename from arch/i386/xen/multicalls.h rename to arch/x86/xen/multicalls.h diff --git a/arch/i386/xen/setup.c b/arch/x86/xen/setup.c similarity index 100% rename from arch/i386/xen/setup.c rename to arch/x86/xen/setup.c diff --git a/arch/i386/xen/smp.c b/arch/x86/xen/smp.c similarity index 100% rename from arch/i386/xen/smp.c rename to arch/x86/xen/smp.c diff --git a/arch/i386/xen/time.c b/arch/x86/xen/time.c similarity index 100% rename from arch/i386/xen/time.c rename to arch/x86/xen/time.c diff --git a/arch/i386/xen/vdso.h b/arch/x86/xen/vdso.h similarity index 100% rename from arch/i386/xen/vdso.h rename to arch/x86/xen/vdso.h diff --git a/arch/i386/xen/xen-asm.S b/arch/x86/xen/xen-asm.S similarity index 100% rename from arch/i386/xen/xen-asm.S rename to arch/x86/xen/xen-asm.S diff --git a/arch/i386/xen/xen-head.S b/arch/x86/xen/xen-head.S similarity index 100% rename from arch/i386/xen/xen-head.S rename to arch/x86/xen/xen-head.S diff --git a/arch/i386/xen/xen-ops.h b/arch/x86/xen/xen-ops.h similarity index 100% rename from arch/i386/xen/xen-ops.h rename to arch/x86/xen/xen-ops.h