From 57ce359ffbe02e57f3174daac33abbe9e660d9dc Mon Sep 17 00:00:00 2001 From: Jakub Jermar Date: Sun, 22 Oct 2006 18:27:57 +0000 Subject: [PATCH] Rename xen32 to ia32xen. The name seems to be more logical as Xen supports more host architectures. --- HelenOS.config | 2 +- Makefile | 6 +++--- boot/arch/{xen32 => ia32xen}/Makefile.inc | 0 boot/arch/{xen32 => ia32xen}/grub/COPYING | 0 boot/arch/{xen32 => ia32xen}/grub/README | 0 boot/arch/{xen32 => ia32xen}/grub/menu.debug.lst | 2 +- boot/arch/{xen32 => ia32xen}/grub/menu.lst | 2 +- boot/arch/{xen32 => ia32xen}/grub/stage2_eltorito | Bin boot/arch/{xen32 => ia32xen}/grub/xen.debug.gz | Bin boot/arch/{xen32 => ia32xen}/grub/xen.gz | Bin boot/boot.config | 2 +- kernel/arch/{xen32 => ia32xen}/Makefile.inc | 0 kernel/arch/{xen32 => ia32xen}/_link.ld.in | 0 kernel/arch/{xen32 => ia32xen}/include/arch.h | 0 kernel/arch/{xen32 => ia32xen}/include/arg.h | 0 kernel/arch/{xen32 => ia32xen}/include/asm.h | 6 +++--- kernel/arch/{xen32 => ia32xen}/include/atomic.h | 0 kernel/arch/{xen32 => ia32xen}/include/barrier.h | 0 kernel/arch/{xen32 => ia32xen}/include/bios | 0 kernel/arch/{xen32 => ia32xen}/include/boot/boot.h | 8 ++++---- kernel/arch/{xen32 => ia32xen}/include/byteorder.h | 0 kernel/arch/{xen32 => ia32xen}/include/context.h | 0 kernel/arch/{xen32 => ia32xen}/include/cpu.h | 0 kernel/arch/{xen32 => ia32xen}/include/cpuid.h | 0 kernel/arch/{xen32 => ia32xen}/include/ddi | 0 kernel/arch/{xen32 => ia32xen}/include/debug.h | 0 kernel/arch/{xen32 => ia32xen}/include/debugger.h | 0 .../{xen32 => ia32xen}/include/drivers/xconsole.h | 6 +++--- kernel/arch/{xen32 => ia32xen}/include/elf.h | 0 kernel/arch/{xen32 => ia32xen}/include/faddr.h | 0 kernel/arch/{xen32 => ia32xen}/include/fpu_context.h | 0 kernel/arch/{xen32 => ia32xen}/include/hypercall.h | 4 ++-- kernel/arch/{xen32 => ia32xen}/include/interrupt.h | 0 kernel/arch/{xen32 => ia32xen}/include/memstr.h | 0 kernel/arch/{xen32 => ia32xen}/include/mm/as.h | 6 +++--- kernel/arch/{xen32 => ia32xen}/include/mm/asid.h | 10 +++++----- kernel/arch/{xen32 => ia32xen}/include/mm/frame.h | 6 +++--- .../arch/{xen32 => ia32xen}/include/mm/memory_init.h | 8 ++++---- kernel/arch/{xen32 => ia32xen}/include/mm/page.h | 6 +++--- kernel/arch/{xen32 => ia32xen}/include/mm/tlb.h | 6 +++--- kernel/arch/{xen32 => ia32xen}/include/pm.h | 6 +++--- kernel/arch/{xen32 => ia32xen}/include/proc | 0 kernel/arch/{xen32 => ia32xen}/include/smp | 0 kernel/arch/{xen32 => ia32xen}/include/types.h | 6 +++--- kernel/arch/{xen32 => ia32xen}/src/asm.S | 0 kernel/arch/{xen32 => ia32xen}/src/atomic.S | 0 kernel/arch/{xen32 => ia32xen}/src/bios | 0 kernel/arch/{xen32 => ia32xen}/src/boot/boot.S | 0 kernel/arch/{xen32 => ia32xen}/src/context.s | 0 kernel/arch/{xen32 => ia32xen}/src/cpu | 0 kernel/arch/{xen32 => ia32xen}/src/ddi | 0 kernel/arch/{xen32 => ia32xen}/src/debug | 0 kernel/arch/{xen32 => ia32xen}/src/debugger.c | 0 kernel/arch/{xen32 => ia32xen}/src/delay.s | 0 kernel/arch/{xen32 => ia32xen}/src/drivers/xconsole.c | 4 ++-- kernel/arch/{xen32 => ia32xen}/src/fpu_context.c | 0 kernel/arch/{xen32 => ia32xen}/src/interrupt.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/mm/as.c | 4 ++-- kernel/arch/{xen32 => ia32xen}/src/mm/frame.c | 4 ++-- kernel/arch/{xen32 => ia32xen}/src/mm/memory_init.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/mm/page.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/mm/tlb.c | 4 ++-- kernel/arch/{xen32 => ia32xen}/src/pm.c | 4 ++-- kernel/arch/{xen32 => ia32xen}/src/proc/scheduler.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/proc/task.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/proc/thread.c | 4 ++-- kernel/arch/{xen32 => ia32xen}/src/smp/apic.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/smp/ipi.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/smp/mps.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/smp/smp.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/userspace.c | 2 +- kernel/arch/{xen32 => ia32xen}/src/xen32.c | 2 +- kernel/kernel.config | 18 +++++++++--------- 73 files changed, 78 insertions(+), 78 deletions(-) rename boot/arch/{xen32 => ia32xen}/Makefile.inc (100%) rename boot/arch/{xen32 => ia32xen}/grub/COPYING (100%) rename boot/arch/{xen32 => ia32xen}/grub/README (100%) rename boot/arch/{xen32 => ia32xen}/grub/menu.debug.lst (92%) rename boot/arch/{xen32 => ia32xen}/grub/menu.lst (91%) rename boot/arch/{xen32 => ia32xen}/grub/stage2_eltorito (100%) rename boot/arch/{xen32 => ia32xen}/grub/xen.debug.gz (100%) rename boot/arch/{xen32 => ia32xen}/grub/xen.gz (100%) rename kernel/arch/{xen32 => ia32xen}/Makefile.inc (100%) rename kernel/arch/{xen32 => ia32xen}/_link.ld.in (100%) rename kernel/arch/{xen32 => ia32xen}/include/arch.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/arg.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/asm.h (98%) rename kernel/arch/{xen32 => ia32xen}/include/atomic.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/barrier.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/bios (100%) rename kernel/arch/{xen32 => ia32xen}/include/boot/boot.h (97%) rename kernel/arch/{xen32 => ia32xen}/include/byteorder.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/context.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/cpu.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/cpuid.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/ddi (100%) rename kernel/arch/{xen32 => ia32xen}/include/debug.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/debugger.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/drivers/xconsole.h (95%) rename kernel/arch/{xen32 => ia32xen}/include/elf.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/faddr.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/fpu_context.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/hypercall.h (98%) rename kernel/arch/{xen32 => ia32xen}/include/interrupt.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/memstr.h (100%) rename kernel/arch/{xen32 => ia32xen}/include/mm/as.h (96%) rename kernel/arch/{xen32 => ia32xen}/include/mm/asid.h (90%) rename kernel/arch/{xen32 => ia32xen}/include/mm/frame.h (95%) rename kernel/arch/{xen32 => ia32xen}/include/mm/memory_init.h (92%) rename kernel/arch/{xen32 => ia32xen}/include/mm/page.h (98%) rename kernel/arch/{xen32 => ia32xen}/include/mm/tlb.h (94%) rename kernel/arch/{xen32 => ia32xen}/include/pm.h (98%) rename kernel/arch/{xen32 => ia32xen}/include/proc (100%) rename kernel/arch/{xen32 => ia32xen}/include/smp (100%) rename kernel/arch/{xen32 => ia32xen}/include/types.h (95%) rename kernel/arch/{xen32 => ia32xen}/src/asm.S (100%) rename kernel/arch/{xen32 => ia32xen}/src/atomic.S (100%) rename kernel/arch/{xen32 => ia32xen}/src/bios (100%) rename kernel/arch/{xen32 => ia32xen}/src/boot/boot.S (100%) rename kernel/arch/{xen32 => ia32xen}/src/context.s (100%) rename kernel/arch/{xen32 => ia32xen}/src/cpu (100%) rename kernel/arch/{xen32 => ia32xen}/src/ddi (100%) rename kernel/arch/{xen32 => ia32xen}/src/debug (100%) rename kernel/arch/{xen32 => ia32xen}/src/debugger.c (100%) rename kernel/arch/{xen32 => ia32xen}/src/delay.s (100%) rename kernel/arch/{xen32 => ia32xen}/src/drivers/xconsole.c (97%) rename kernel/arch/{xen32 => ia32xen}/src/fpu_context.c (100%) rename kernel/arch/{xen32 => ia32xen}/src/interrupt.c (99%) rename kernel/arch/{xen32 => ia32xen}/src/mm/as.c (97%) rename kernel/arch/{xen32 => ia32xen}/src/mm/frame.c (97%) rename kernel/arch/{xen32 => ia32xen}/src/mm/memory_init.c (98%) rename kernel/arch/{xen32 => ia32xen}/src/mm/page.c (98%) rename kernel/arch/{xen32 => ia32xen}/src/mm/tlb.c (97%) rename kernel/arch/{xen32 => ia32xen}/src/pm.c (98%) rename kernel/arch/{xen32 => ia32xen}/src/proc/scheduler.c (98%) rename kernel/arch/{xen32 => ia32xen}/src/proc/task.c (98%) rename kernel/arch/{xen32 => ia32xen}/src/proc/thread.c (95%) rename kernel/arch/{xen32 => ia32xen}/src/smp/apic.c (99%) rename kernel/arch/{xen32 => ia32xen}/src/smp/ipi.c (98%) rename kernel/arch/{xen32 => ia32xen}/src/smp/mps.c (99%) rename kernel/arch/{xen32 => ia32xen}/src/smp/smp.c (99%) rename kernel/arch/{xen32 => ia32xen}/src/userspace.c (99%) rename kernel/arch/{xen32 => ia32xen}/src/xen32.c (99%) diff --git a/HelenOS.config b/HelenOS.config index 3945983a5..2a9896164 100644 --- a/HelenOS.config +++ b/HelenOS.config @@ -3,6 +3,7 @@ # Platform @ "amd64" AMD64/Intel EM64T (PC) @ "ia32" Intel IA-32 (PC) +@ "ia32xen" Intel IA-32 on Xen hypervisor @ "ia64" Intel IA-64 (Ski) @ "mips32msim" MIPS 32-bit (MSIM) @ "mips32sim" MIPS 32-bit (Simics) @@ -12,7 +13,6 @@ @ "ppc32" PowerPC 32-bit (iMac G4) @ "ppc64" PowerPC 64-bit (iMac G5) @ "sparc64" Sun UltraSPARC 64-bit -@ "xen32" Xen 32-bit (PC) ! PLATFORM (choice) # Compiler diff --git a/Makefile b/Makefile index 5280c73d4..3aed81322 100644 --- a/Makefile +++ b/Makefile @@ -111,10 +111,10 @@ ifeq ($(PLATFORM),sparc64) BARCH = sparc64 endif -ifeq ($(PLATFORM),xen32) - KARCH = xen32 +ifeq ($(PLATFORM),ia32xen) + KARCH = ia32xen UARCH = ia32 - BARCH = xen32 + BARCH = ia32xen endif .PHONY: all build config distclean clean diff --git a/boot/arch/xen32/Makefile.inc b/boot/arch/ia32xen/Makefile.inc similarity index 100% rename from boot/arch/xen32/Makefile.inc rename to boot/arch/ia32xen/Makefile.inc diff --git a/boot/arch/xen32/grub/COPYING b/boot/arch/ia32xen/grub/COPYING similarity index 100% rename from boot/arch/xen32/grub/COPYING rename to boot/arch/ia32xen/grub/COPYING diff --git a/boot/arch/xen32/grub/README b/boot/arch/ia32xen/grub/README similarity index 100% rename from boot/arch/xen32/grub/README rename to boot/arch/ia32xen/grub/README diff --git a/boot/arch/xen32/grub/menu.debug.lst b/boot/arch/ia32xen/grub/menu.debug.lst similarity index 92% rename from boot/arch/xen32/grub/menu.debug.lst rename to boot/arch/ia32xen/grub/menu.debug.lst index 0a52ed627..457543c8a 100644 --- a/boot/arch/xen32/grub/menu.debug.lst +++ b/boot/arch/ia32xen/grub/menu.debug.lst @@ -1,7 +1,7 @@ default 0 timeout 10 -title=HelenOS/Xen +title=HelenOS/ia32xen root (cd) kernel /boot/xen.gz noreboot console=com1,vga com1=auto,8n1,0x3f8 module /boot/kernel.bin diff --git a/boot/arch/xen32/grub/menu.lst b/boot/arch/ia32xen/grub/menu.lst similarity index 91% rename from boot/arch/xen32/grub/menu.lst rename to boot/arch/ia32xen/grub/menu.lst index 3fab7a7a1..69b07e0c1 100644 --- a/boot/arch/xen32/grub/menu.lst +++ b/boot/arch/ia32xen/grub/menu.lst @@ -1,7 +1,7 @@ default 0 timeout 10 -title=HelenOS/Xen +title=HelenOS/ia32xen root (cd) kernel /boot/xen.gz module /boot/kernel.bin diff --git a/boot/arch/xen32/grub/stage2_eltorito b/boot/arch/ia32xen/grub/stage2_eltorito similarity index 100% rename from boot/arch/xen32/grub/stage2_eltorito rename to boot/arch/ia32xen/grub/stage2_eltorito diff --git a/boot/arch/xen32/grub/xen.debug.gz b/boot/arch/ia32xen/grub/xen.debug.gz similarity index 100% rename from boot/arch/xen32/grub/xen.debug.gz rename to boot/arch/ia32xen/grub/xen.debug.gz diff --git a/boot/arch/xen32/grub/xen.gz b/boot/arch/ia32xen/grub/xen.gz similarity index 100% rename from boot/arch/xen32/grub/xen.gz rename to boot/arch/ia32xen/grub/xen.gz diff --git a/boot/boot.config b/boot/boot.config index 8471dfd30..fb09c74e8 100644 --- a/boot/boot.config +++ b/boot/boot.config @@ -3,12 +3,12 @@ # Architecture @ "amd64" AMD64/Intel EM64T @ "ia32" Intel IA-32 +@ "ia32xen" Intel IA-32 on Xen hypervisor @ "ia64" Intel IA-64 @ "mips32" MIPS 32-bit @ "ppc32" PowerPC 32-bit @ "ppc64" PowerPC 64-bit @ "sparc64" Sun UltraSPARC -@ "xen32" Xen 32-bit ! ARCH (choice) # Compiler diff --git a/kernel/arch/xen32/Makefile.inc b/kernel/arch/ia32xen/Makefile.inc similarity index 100% rename from kernel/arch/xen32/Makefile.inc rename to kernel/arch/ia32xen/Makefile.inc diff --git a/kernel/arch/xen32/_link.ld.in b/kernel/arch/ia32xen/_link.ld.in similarity index 100% rename from kernel/arch/xen32/_link.ld.in rename to kernel/arch/ia32xen/_link.ld.in diff --git a/kernel/arch/xen32/include/arch.h b/kernel/arch/ia32xen/include/arch.h similarity index 100% rename from kernel/arch/xen32/include/arch.h rename to kernel/arch/ia32xen/include/arch.h diff --git a/kernel/arch/xen32/include/arg.h b/kernel/arch/ia32xen/include/arg.h similarity index 100% rename from kernel/arch/xen32/include/arg.h rename to kernel/arch/ia32xen/include/arg.h diff --git a/kernel/arch/xen32/include/asm.h b/kernel/arch/ia32xen/include/asm.h similarity index 98% rename from kernel/arch/xen32/include/asm.h rename to kernel/arch/ia32xen/include/asm.h index 5396e13c1..913dcfd35 100644 --- a/kernel/arch/xen32/include/asm.h +++ b/kernel/arch/ia32xen/include/asm.h @@ -28,14 +28,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file */ -#ifndef KERN_xen32_ASM_H_ -#define KERN_xen32_ASM_H_ +#ifndef KERN_ia32xen_ASM_H_ +#define KERN_ia32xen_ASM_H_ #include #include diff --git a/kernel/arch/xen32/include/atomic.h b/kernel/arch/ia32xen/include/atomic.h similarity index 100% rename from kernel/arch/xen32/include/atomic.h rename to kernel/arch/ia32xen/include/atomic.h diff --git a/kernel/arch/xen32/include/barrier.h b/kernel/arch/ia32xen/include/barrier.h similarity index 100% rename from kernel/arch/xen32/include/barrier.h rename to kernel/arch/ia32xen/include/barrier.h diff --git a/kernel/arch/xen32/include/bios b/kernel/arch/ia32xen/include/bios similarity index 100% rename from kernel/arch/xen32/include/bios rename to kernel/arch/ia32xen/include/bios diff --git a/kernel/arch/xen32/include/boot/boot.h b/kernel/arch/ia32xen/include/boot/boot.h similarity index 97% rename from kernel/arch/xen32/include/boot/boot.h rename to kernel/arch/ia32xen/include/boot/boot.h index 50d632eb9..4297b9dda 100644 --- a/kernel/arch/xen32/include/boot/boot.h +++ b/kernel/arch/ia32xen/include/boot/boot.h @@ -26,17 +26,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file */ -#ifndef KERN_xen32_BOOT_H_ -#define KERN_xen32_BOOT_H_ +#ifndef KERN_ia32xen_BOOT_H_ +#define KERN_ia32xen_BOOT_H_ #define GUEST_CMDLINE 1024 -#define VIRT_CPUS 32 +#define VIRT_CPUS 32 #define START_INFO_SIZE 1104 #define BOOT_OFFSET 0x0000 diff --git a/kernel/arch/xen32/include/byteorder.h b/kernel/arch/ia32xen/include/byteorder.h similarity index 100% rename from kernel/arch/xen32/include/byteorder.h rename to kernel/arch/ia32xen/include/byteorder.h diff --git a/kernel/arch/xen32/include/context.h b/kernel/arch/ia32xen/include/context.h similarity index 100% rename from kernel/arch/xen32/include/context.h rename to kernel/arch/ia32xen/include/context.h diff --git a/kernel/arch/xen32/include/cpu.h b/kernel/arch/ia32xen/include/cpu.h similarity index 100% rename from kernel/arch/xen32/include/cpu.h rename to kernel/arch/ia32xen/include/cpu.h diff --git a/kernel/arch/xen32/include/cpuid.h b/kernel/arch/ia32xen/include/cpuid.h similarity index 100% rename from kernel/arch/xen32/include/cpuid.h rename to kernel/arch/ia32xen/include/cpuid.h diff --git a/kernel/arch/xen32/include/ddi b/kernel/arch/ia32xen/include/ddi similarity index 100% rename from kernel/arch/xen32/include/ddi rename to kernel/arch/ia32xen/include/ddi diff --git a/kernel/arch/xen32/include/debug.h b/kernel/arch/ia32xen/include/debug.h similarity index 100% rename from kernel/arch/xen32/include/debug.h rename to kernel/arch/ia32xen/include/debug.h diff --git a/kernel/arch/xen32/include/debugger.h b/kernel/arch/ia32xen/include/debugger.h similarity index 100% rename from kernel/arch/xen32/include/debugger.h rename to kernel/arch/ia32xen/include/debugger.h diff --git a/kernel/arch/xen32/include/drivers/xconsole.h b/kernel/arch/ia32xen/include/drivers/xconsole.h similarity index 95% rename from kernel/arch/xen32/include/drivers/xconsole.h rename to kernel/arch/ia32xen/include/drivers/xconsole.h index 087293f96..99b4ba3ae 100644 --- a/kernel/arch/xen32/include/drivers/xconsole.h +++ b/kernel/arch/ia32xen/include/drivers/xconsole.h @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file */ -#ifndef KERN_xen32_XCONSOLE_H_ -#define KERN_xen32_XCONSOLE_H_ +#ifndef KERN_ia32xen_XCONSOLE_H_ +#define KERN_ia32xen_XCONSOLE_H_ #include diff --git a/kernel/arch/xen32/include/elf.h b/kernel/arch/ia32xen/include/elf.h similarity index 100% rename from kernel/arch/xen32/include/elf.h rename to kernel/arch/ia32xen/include/elf.h diff --git a/kernel/arch/xen32/include/faddr.h b/kernel/arch/ia32xen/include/faddr.h similarity index 100% rename from kernel/arch/xen32/include/faddr.h rename to kernel/arch/ia32xen/include/faddr.h diff --git a/kernel/arch/xen32/include/fpu_context.h b/kernel/arch/ia32xen/include/fpu_context.h similarity index 100% rename from kernel/arch/xen32/include/fpu_context.h rename to kernel/arch/ia32xen/include/fpu_context.h diff --git a/kernel/arch/xen32/include/hypercall.h b/kernel/arch/ia32xen/include/hypercall.h similarity index 98% rename from kernel/arch/xen32/include/hypercall.h rename to kernel/arch/ia32xen/include/hypercall.h index b021587b4..c9e715fe7 100644 --- a/kernel/arch/xen32/include/hypercall.h +++ b/kernel/arch/ia32xen/include/hypercall.h @@ -26,8 +26,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef KERN_xen32_HYPERCALL_H_ -#define KERN_xen32_HYPERCALL_H_ +#ifndef KERN_ia32xen_HYPERCALL_H_ +#define KERN_ia32xen_HYPERCALL_H_ #include #include diff --git a/kernel/arch/xen32/include/interrupt.h b/kernel/arch/ia32xen/include/interrupt.h similarity index 100% rename from kernel/arch/xen32/include/interrupt.h rename to kernel/arch/ia32xen/include/interrupt.h diff --git a/kernel/arch/xen32/include/memstr.h b/kernel/arch/ia32xen/include/memstr.h similarity index 100% rename from kernel/arch/xen32/include/memstr.h rename to kernel/arch/ia32xen/include/memstr.h diff --git a/kernel/arch/xen32/include/mm/as.h b/kernel/arch/ia32xen/include/mm/as.h similarity index 96% rename from kernel/arch/xen32/include/mm/as.h rename to kernel/arch/ia32xen/include/mm/as.h index 94a75ea22..a7b95fe91 100644 --- a/kernel/arch/xen32/include/mm/as.h +++ b/kernel/arch/ia32xen/include/mm/as.h @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file */ -#ifndef KERN_xen32_AS_H_ -#define KERN_xen32_AS_H_ +#ifndef KERN_ia32xen_AS_H_ +#define KERN_ia32xen_AS_H_ #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 diff --git a/kernel/arch/xen32/include/mm/asid.h b/kernel/arch/ia32xen/include/mm/asid.h similarity index 90% rename from kernel/arch/xen32/include/mm/asid.h rename to kernel/arch/ia32xen/include/mm/asid.h index b38bd0f67..858b56381 100644 --- a/kernel/arch/xen32/include/mm/asid.h +++ b/kernel/arch/ia32xen/include/mm/asid.h @@ -26,21 +26,21 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file - * @ingroup xen32mm + * @ingroup ia32xen_mm */ /* - * xen32 has no hardware support for address space identifiers. + * ia32xen has no hardware support for address space identifiers. * This file is provided to do nop-implementation of mm/asid.h * interface. */ -#ifndef KERN_xen32_ASID_H_ -#define KERN_xen32_ASID_H_ +#ifndef KERN_ia32xen_ASID_H_ +#define KERN_ia32xen_ASID_H_ typedef int asid_t; diff --git a/kernel/arch/xen32/include/mm/frame.h b/kernel/arch/ia32xen/include/mm/frame.h similarity index 95% rename from kernel/arch/xen32/include/mm/frame.h rename to kernel/arch/ia32xen/include/mm/frame.h index 54c59130b..d4a8eaab4 100644 --- a/kernel/arch/xen32/include/mm/frame.h +++ b/kernel/arch/ia32xen/include/mm/frame.h @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file */ -#ifndef KERN_xen32_FRAME_H_ -#define KERN_xen32_FRAME_H_ +#ifndef KERN_ia32xen_FRAME_H_ +#define KERN_ia32xen_FRAME_H_ #define FRAME_WIDTH 12 /* 4K */ #define FRAME_SIZE (1 << FRAME_WIDTH) diff --git a/kernel/arch/xen32/include/mm/memory_init.h b/kernel/arch/ia32xen/include/mm/memory_init.h similarity index 92% rename from kernel/arch/xen32/include/mm/memory_init.h rename to kernel/arch/ia32xen/include/mm/memory_init.h index 11db323c6..173b5ebc8 100644 --- a/kernel/arch/xen32/include/mm/memory_init.h +++ b/kernel/arch/ia32xen/include/mm/memory_init.h @@ -26,15 +26,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file - * @ingroup xen32mm + * @ingroup ia32xen_mm */ -#ifndef KERN_xen32_MEMORY_INIT_H_ -#define KERN_xen32_MEMORY_INIT_H_ +#ifndef KERN_ia32xen_MEMORY_INIT_H_ +#define KERN_ia32xen_MEMORY_INIT_H_ #include diff --git a/kernel/arch/xen32/include/mm/page.h b/kernel/arch/ia32xen/include/mm/page.h similarity index 98% rename from kernel/arch/xen32/include/mm/page.h rename to kernel/arch/ia32xen/include/mm/page.h index e92196656..760c8c7eb 100644 --- a/kernel/arch/xen32/include/mm/page.h +++ b/kernel/arch/ia32xen/include/mm/page.h @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file */ -#ifndef KERN_xen32_PAGE_H_ -#define KERN_xen32_PAGE_H_ +#ifndef KERN_ia32xen_PAGE_H_ +#define KERN_ia32xen_PAGE_H_ #include diff --git a/kernel/arch/xen32/include/mm/tlb.h b/kernel/arch/ia32xen/include/mm/tlb.h similarity index 94% rename from kernel/arch/xen32/include/mm/tlb.h rename to kernel/arch/ia32xen/include/mm/tlb.h index 4cbd5e49c..bfc633ede 100644 --- a/kernel/arch/xen32/include/mm/tlb.h +++ b/kernel/arch/ia32xen/include/mm/tlb.h @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file */ -#ifndef KERN_xen32_TLB_H_ -#define KERN_xen32_TLB_H_ +#ifndef KERN_ia32xen_TLB_H_ +#define KERN_ia32xen_TLB_H_ #define tlb_arch_init() #define tlb_print() diff --git a/kernel/arch/xen32/include/pm.h b/kernel/arch/ia32xen/include/pm.h similarity index 98% rename from kernel/arch/xen32/include/pm.h rename to kernel/arch/ia32xen/include/pm.h index aba33fcf4..903bcbc12 100644 --- a/kernel/arch/xen32/include/pm.h +++ b/kernel/arch/ia32xen/include/pm.h @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file */ -#ifndef KERN_xen32_PM_H_ -#define KERN_xen32_PM_H_ +#ifndef KERN_ia32xen_PM_H_ +#define KERN_ia32xen_PM_H_ #define IDT_ITEMS 64 #define GDT_ITEMS 7 diff --git a/kernel/arch/xen32/include/proc b/kernel/arch/ia32xen/include/proc similarity index 100% rename from kernel/arch/xen32/include/proc rename to kernel/arch/ia32xen/include/proc diff --git a/kernel/arch/xen32/include/smp b/kernel/arch/ia32xen/include/smp similarity index 100% rename from kernel/arch/xen32/include/smp rename to kernel/arch/ia32xen/include/smp diff --git a/kernel/arch/xen32/include/types.h b/kernel/arch/ia32xen/include/types.h similarity index 95% rename from kernel/arch/xen32/include/types.h rename to kernel/arch/ia32xen/include/types.h index f49a32b4b..1ba30fe32 100644 --- a/kernel/arch/xen32/include/types.h +++ b/kernel/arch/ia32xen/include/types.h @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file */ -#ifndef KERN_xen32_TYPES_H_ -#define KERN_xen32_TYPES_H_ +#ifndef KERN_ia32xen_TYPES_H_ +#define KERN_ia32xen_TYPES_H_ #define NULL 0 diff --git a/kernel/arch/xen32/src/asm.S b/kernel/arch/ia32xen/src/asm.S similarity index 100% rename from kernel/arch/xen32/src/asm.S rename to kernel/arch/ia32xen/src/asm.S diff --git a/kernel/arch/xen32/src/atomic.S b/kernel/arch/ia32xen/src/atomic.S similarity index 100% rename from kernel/arch/xen32/src/atomic.S rename to kernel/arch/ia32xen/src/atomic.S diff --git a/kernel/arch/xen32/src/bios b/kernel/arch/ia32xen/src/bios similarity index 100% rename from kernel/arch/xen32/src/bios rename to kernel/arch/ia32xen/src/bios diff --git a/kernel/arch/xen32/src/boot/boot.S b/kernel/arch/ia32xen/src/boot/boot.S similarity index 100% rename from kernel/arch/xen32/src/boot/boot.S rename to kernel/arch/ia32xen/src/boot/boot.S diff --git a/kernel/arch/xen32/src/context.s b/kernel/arch/ia32xen/src/context.s similarity index 100% rename from kernel/arch/xen32/src/context.s rename to kernel/arch/ia32xen/src/context.s diff --git a/kernel/arch/xen32/src/cpu b/kernel/arch/ia32xen/src/cpu similarity index 100% rename from kernel/arch/xen32/src/cpu rename to kernel/arch/ia32xen/src/cpu diff --git a/kernel/arch/xen32/src/ddi b/kernel/arch/ia32xen/src/ddi similarity index 100% rename from kernel/arch/xen32/src/ddi rename to kernel/arch/ia32xen/src/ddi diff --git a/kernel/arch/xen32/src/debug b/kernel/arch/ia32xen/src/debug similarity index 100% rename from kernel/arch/xen32/src/debug rename to kernel/arch/ia32xen/src/debug diff --git a/kernel/arch/xen32/src/debugger.c b/kernel/arch/ia32xen/src/debugger.c similarity index 100% rename from kernel/arch/xen32/src/debugger.c rename to kernel/arch/ia32xen/src/debugger.c diff --git a/kernel/arch/xen32/src/delay.s b/kernel/arch/ia32xen/src/delay.s similarity index 100% rename from kernel/arch/xen32/src/delay.s rename to kernel/arch/ia32xen/src/delay.s diff --git a/kernel/arch/xen32/src/drivers/xconsole.c b/kernel/arch/ia32xen/src/drivers/xconsole.c similarity index 97% rename from kernel/arch/xen32/src/drivers/xconsole.c rename to kernel/arch/ia32xen/src/drivers/xconsole.c index 2597875ac..df7797dbd 100644 --- a/kernel/arch/xen32/src/drivers/xconsole.c +++ b/kernel/arch/ia32xen/src/drivers/xconsole.c @@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** * @file - * @brief Xen32 console driver. + * @brief ia32xen console driver. */ #include diff --git a/kernel/arch/xen32/src/fpu_context.c b/kernel/arch/ia32xen/src/fpu_context.c similarity index 100% rename from kernel/arch/xen32/src/fpu_context.c rename to kernel/arch/ia32xen/src/fpu_context.c diff --git a/kernel/arch/xen32/src/interrupt.c b/kernel/arch/ia32xen/src/interrupt.c similarity index 99% rename from kernel/arch/xen32/src/interrupt.c rename to kernel/arch/ia32xen/src/interrupt.c index ae0439871..3429b7a9b 100644 --- a/kernel/arch/xen32/src/interrupt.c +++ b/kernel/arch/ia32xen/src/interrupt.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32interrupt +/** @addtogroup ia32xen_interrupt * @{ */ /** @file diff --git a/kernel/arch/xen32/src/mm/as.c b/kernel/arch/ia32xen/src/mm/as.c similarity index 97% rename from kernel/arch/xen32/src/mm/as.c rename to kernel/arch/ia32xen/src/mm/as.c index 0ce3cd4a6..4685ac6da 100644 --- a/kernel/arch/xen32/src/mm/as.c +++ b/kernel/arch/ia32xen/src/mm/as.c @@ -26,11 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file - * @ingroup xen32mm + * @ingroup ia32xen_mm */ #include diff --git a/kernel/arch/xen32/src/mm/frame.c b/kernel/arch/ia32xen/src/mm/frame.c similarity index 97% rename from kernel/arch/xen32/src/mm/frame.c rename to kernel/arch/ia32xen/src/mm/frame.c index 341c2d5ce..d3557660a 100644 --- a/kernel/arch/xen32/src/mm/frame.c +++ b/kernel/arch/ia32xen/src/mm/frame.c @@ -26,11 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file - * @ingroup xen32mm + * @ingroup ia32xen_mm */ #include diff --git a/kernel/arch/xen32/src/mm/memory_init.c b/kernel/arch/ia32xen/src/mm/memory_init.c similarity index 98% rename from kernel/arch/xen32/src/mm/memory_init.c rename to kernel/arch/ia32xen/src/mm/memory_init.c index 9b0e8f14e..c3332bc18 100644 --- a/kernel/arch/xen32/src/mm/memory_init.c +++ b/kernel/arch/ia32xen/src/mm/memory_init.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file diff --git a/kernel/arch/xen32/src/mm/page.c b/kernel/arch/ia32xen/src/mm/page.c similarity index 98% rename from kernel/arch/xen32/src/mm/page.c rename to kernel/arch/ia32xen/src/mm/page.c index d27cf5a6d..9c44f53a8 100644 --- a/kernel/arch/xen32/src/mm/page.c +++ b/kernel/arch/ia32xen/src/mm/page.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file diff --git a/kernel/arch/xen32/src/mm/tlb.c b/kernel/arch/ia32xen/src/mm/tlb.c similarity index 97% rename from kernel/arch/xen32/src/mm/tlb.c rename to kernel/arch/ia32xen/src/mm/tlb.c index f7e67ebc8..afd5cc218 100644 --- a/kernel/arch/xen32/src/mm/tlb.c +++ b/kernel/arch/ia32xen/src/mm/tlb.c @@ -26,11 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32mm +/** @addtogroup ia32xen_mm * @{ */ /** @file - * @ingroup xen32mm + * @ingroup ia32xen_mm */ #include diff --git a/kernel/arch/xen32/src/pm.c b/kernel/arch/ia32xen/src/pm.c similarity index 98% rename from kernel/arch/xen32/src/pm.c rename to kernel/arch/ia32xen/src/pm.c index 72a151832..5a19e85ae 100644 --- a/kernel/arch/xen32/src/pm.c +++ b/kernel/arch/ia32xen/src/pm.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file @@ -47,7 +47,7 @@ #include /* - * Early xen32 configuration functions and data structures. + * Early ia32xen configuration functions and data structures. */ /* diff --git a/kernel/arch/xen32/src/proc/scheduler.c b/kernel/arch/ia32xen/src/proc/scheduler.c similarity index 98% rename from kernel/arch/xen32/src/proc/scheduler.c rename to kernel/arch/ia32xen/src/proc/scheduler.c index 67a4159e9..a317c0477 100644 --- a/kernel/arch/xen32/src/proc/scheduler.c +++ b/kernel/arch/ia32xen/src/proc/scheduler.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32proc +/** @addtogroup ia32xen_proc * @{ */ /** @file diff --git a/kernel/arch/xen32/src/proc/task.c b/kernel/arch/ia32xen/src/proc/task.c similarity index 98% rename from kernel/arch/xen32/src/proc/task.c rename to kernel/arch/ia32xen/src/proc/task.c index 02d281593..714054c9c 100644 --- a/kernel/arch/xen32/src/proc/task.c +++ b/kernel/arch/ia32xen/src/proc/task.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32proc +/** @addtogroup ia32xen_proc * @{ */ /** @file diff --git a/kernel/arch/xen32/src/proc/thread.c b/kernel/arch/ia32xen/src/proc/thread.c similarity index 95% rename from kernel/arch/xen32/src/proc/thread.c rename to kernel/arch/ia32xen/src/proc/thread.c index 1dedbe63c..4318ad225 100644 --- a/kernel/arch/xen32/src/proc/thread.c +++ b/kernel/arch/ia32xen/src/proc/thread.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32proc +/** @addtogroup ia32xen_proc * @{ */ /** @file @@ -34,7 +34,7 @@ #include -/** Perform xen32 specific thread initialization. +/** Perform ia32xen specific thread initialization. * * @param t Thread to be initialized. */ diff --git a/kernel/arch/xen32/src/smp/apic.c b/kernel/arch/ia32xen/src/smp/apic.c similarity index 99% rename from kernel/arch/xen32/src/smp/apic.c rename to kernel/arch/ia32xen/src/smp/apic.c index 0191f0600..2662c3b67 100644 --- a/kernel/arch/xen32/src/smp/apic.c +++ b/kernel/arch/ia32xen/src/smp/apic.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file diff --git a/kernel/arch/xen32/src/smp/ipi.c b/kernel/arch/ia32xen/src/smp/ipi.c similarity index 98% rename from kernel/arch/xen32/src/smp/ipi.c rename to kernel/arch/ia32xen/src/smp/ipi.c index 0520d3672..38993606f 100644 --- a/kernel/arch/xen32/src/smp/ipi.c +++ b/kernel/arch/ia32xen/src/smp/ipi.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file diff --git a/kernel/arch/xen32/src/smp/mps.c b/kernel/arch/ia32xen/src/smp/mps.c similarity index 99% rename from kernel/arch/xen32/src/smp/mps.c rename to kernel/arch/ia32xen/src/smp/mps.c index 50011a7e8..26db51878 100644 --- a/kernel/arch/xen32/src/smp/mps.c +++ b/kernel/arch/ia32xen/src/smp/mps.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file diff --git a/kernel/arch/xen32/src/smp/smp.c b/kernel/arch/ia32xen/src/smp/smp.c similarity index 99% rename from kernel/arch/xen32/src/smp/smp.c rename to kernel/arch/ia32xen/src/smp/smp.c index 41cf8251b..88659cbcb 100644 --- a/kernel/arch/xen32/src/smp/smp.c +++ b/kernel/arch/ia32xen/src/smp/smp.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file diff --git a/kernel/arch/xen32/src/userspace.c b/kernel/arch/ia32xen/src/userspace.c similarity index 99% rename from kernel/arch/xen32/src/userspace.c rename to kernel/arch/ia32xen/src/userspace.c index 16a4ef77a..8b16cd730 100644 --- a/kernel/arch/xen32/src/userspace.c +++ b/kernel/arch/ia32xen/src/userspace.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file diff --git a/kernel/arch/xen32/src/xen32.c b/kernel/arch/ia32xen/src/xen32.c similarity index 99% rename from kernel/arch/xen32/src/xen32.c rename to kernel/arch/ia32xen/src/xen32.c index 22578c61a..2b621b373 100644 --- a/kernel/arch/xen32/src/xen32.c +++ b/kernel/arch/ia32xen/src/xen32.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup xen32 +/** @addtogroup ia32xen * @{ */ /** @file diff --git a/kernel/kernel.config b/kernel/kernel.config index 298f74f0e..0e497b23a 100644 --- a/kernel/kernel.config +++ b/kernel/kernel.config @@ -3,12 +3,12 @@ # Architecture @ "amd64" AMD64/Intel EM64T @ "ia32" Intel IA-32 +@ "ia32xen" Intel IA-32 on Xen hypervisor @ "ia64" Intel IA-64 @ "mips32" MIPS 32-bit @ "ppc32" PowerPC 32-bit @ "ppc64" PowerPC 64-bit @ "sparc64" Sun UltraSPARC 64-bit -@ "xen32" Xen 32-bit ! ARCH (choice) # Compiler @@ -22,7 +22,7 @@ @ "athlon-xp" Athlon XP @ "athlon-mp" Athlon MP @ "prescott" Prescott -! [ARCH=ia32|ARCH=xen32] MACHINE (choice) +! [ARCH=ia32|ARCH=ia32xen] MACHINE (choice) # CPU type @ "opteron" Opteron @@ -71,16 +71,16 @@ ! [(ARCH=ia32|ARCH=amd64)&CONFIG_FB=y] CONFIG_VESA_BPP (choice) # Support for SMP -! [ARCH=ia32|ARCH=amd64|ARCH=xen32|ARCH=sparc64] CONFIG_SMP (y/n) +! [ARCH=ia32|ARCH=amd64|ARCH=ia32xen|ARCH=sparc64] CONFIG_SMP (y/n) # Improved support for hyperthreading -! [(ARCH=ia32|ARCH=amd64|ARCH=xen32)&CONFIG_SMP=y] CONFIG_HT (y/n) +! [(ARCH=ia32|ARCH=amd64|ARCH=ia32xen)&CONFIG_SMP=y] CONFIG_HT (y/n) # Simics BIOS AP boot fix ! [(ARCH=ia32|ARCH=amd64)&CONFIG_SMP=y] CONFIG_SIMICS_FIX (y/n) # Lazy FPU context switching -! [(ARCH=mips32&MACHINE!=msim&MACHINE!=simics)|ARCH=amd64|ARCH=ia32|ARCH=ia64|ARCH=sparc64|ARCH=xen32] CONFIG_FPU_LAZY (y/n) +! [(ARCH=mips32&MACHINE!=msim&MACHINE!=simics)|ARCH=amd64|ARCH=ia32|ARCH=ia64|ARCH=sparc64|ARCH=ia32xen] CONFIG_FPU_LAZY (y/n) # Power off on halt ! [ARCH=ppc32] CONFIG_POWEROFF (n/y) @@ -94,10 +94,10 @@ ! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n) # Watchpoint on rewriting AS with zero -! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=ia32|ARCH=xen32)] CONFIG_DEBUG_AS_WATCHPOINT (y/n) +! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=ia32|ARCH=ia32xen)] CONFIG_DEBUG_AS_WATCHPOINT (y/n) # Save all interrupt registers -! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=mips32|ARCH=ia32|ARCH=xen32)] CONFIG_DEBUG_ALLREGS (y/n) +! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=mips32|ARCH=ia32|ARCH=ia32xen)] CONFIG_DEBUG_ALLREGS (y/n) # Use VHPT ! [ARCH=ia64] CONFIG_VHPT (n/y) @@ -124,8 +124,8 @@ @ "synch/rwlock5" Read write test 5 @ "synch/semaphore1" Semaphore test 1 @ "synch/semaphore2" Sempahore test 2 -@ [ARCH=ia32|ARCH=amd64|ARCH=ia64|ARCH=xen32] "fpu/fpu1" Intel FPU test 1 -@ [ARCH=ia32|ARCH=amd64|ARCH=xen32] "fpu/sse1" Intel SSE test 1 +@ [ARCH=ia32|ARCH=amd64|ARCH=ia64|ARCH=ia32xen] "fpu/fpu1" Intel FPU test 1 +@ [ARCH=ia32|ARCH=amd64|ARCH=ia32xen] "fpu/sse1" Intel SSE test 1 @ [ARCH=mips32&MACHINE!=msim&MACHINE!=simics] "fpu/mips1" MIPS FPU test 1 @ "print/print1" Printf test 1 @ "thread/thread1" Thread test 1 -- 2.11.4.GIT