* debian/arch/amd64/defines, debian/arch/i386/defines:

Enable xen and xen-vserver subarch.
* debian/arch/i386/xen/defines: Cleanup.
* debian/arch/amd64/xen/config,
  debian/arch/amd64/xen/config.amd64-k8,
  debian/arch/amd64/xen/config.em64t-p4,
  debian/arch/amd64/xen-vserver/config,
  debian/arch/amd64/xen-vserver/config.amd64-k8,
  debian/arch/i386/xen/config,
  debian/arch/i386/xen/config.686,
  debian/arch/i386/xen/config.k7: Update.
* debian/arch/i386/xen-vserver: Add.

svn path=/dists/sid/linux-2.6/; revision=6495

debian/arch/amd64/defines

@@ -9,6 +9,8 @@ kernel-arch: x86_64
 kernel-header-dirs: x86_64 i386
 subarches:
  vserver
+ xen
+ xen-vserver
 
 [image]
 conflicts: grub (<= 0.95+cvs20040624-17)

debian/arch/amd64/xen-vserver/config

@@ -2,6 +2,7 @@ CONFIG_X86_64_XEN=y
 CONFIG_XEN_PCIDEV_FRONTEND=y
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
 # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
@@ -18,6 +19,7 @@ CONFIG_XEN_NETDEV_LOOPBACK=y
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
+CONFIG_XEN_SYSFS=y
 CONFIG_VSERVER=y
 CONFIG_VSERVER_SECURITY=y
 CONFIG_VSERVER_LEGACYNET=y

debian/arch/amd64/xen-vserver/config.amd64-k8

@@ -20,6 +20,7 @@ CONFIG_FB_MATROX_MAVEN=m
 # CONFIG_SOUND_AWE32_SYNTH is not set
 CONFIG_FS_MBCACHE=m
 CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_HOTPLUG_CPU is not set
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_DIGIEPCA=m
 CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
@@ -32,3 +33,4 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_ACPI_NUMA=y
 CONFIG_MIGRATION=y
+# CONFIG_HOTPLUG_CPU is not set

debian/arch/amd64/xen/config

@@ -2,6 +2,7 @@ CONFIG_X86_64_XEN=y
 CONFIG_XEN_PCIDEV_FRONTEND=y
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
 # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
@@ -18,3 +19,4 @@ CONFIG_XEN_NETDEV_LOOPBACK=y
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
+CONFIG_XEN_SYSFS=y

debian/arch/amd64/xen/config.amd64-k8

@@ -20,6 +20,7 @@ CONFIG_FB_MATROX_MAVEN=m
 # CONFIG_SOUND_AWE32_SYNTH is not set
 CONFIG_FS_MBCACHE=m
 CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_HOTPLUG_CPU is not set
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_DIGIEPCA=m
 CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
@@ -32,3 +33,4 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_ACPI_NUMA=y
 CONFIG_MIGRATION=y
+# CONFIG_HOTPLUG_CPU is not set

debian/arch/amd64/xen/config.em64t-p4

@@ -20,8 +20,10 @@ CONFIG_R8169_VLAN=y
 CONFIG_SOUND_AWE32_SYNTH=m
 CONFIG_FS_MBCACHE=m
 CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_HOTPLUG_CPU is not set
 CONFIG_DIGIEPCA=m
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_X86_MCE_AMD is not set
+# CONFIG_HOTPLUG_CPU is not set

debian/arch/i386/defines

@@ -9,6 +9,8 @@ kernel-arch: i386
 kernel-header-dirs: i386
 subarches:
  vserver
+ xen
+ xen-vserver
 
 [image]
 conflicts: grub (<= 0.95+cvs20040624-17)

debian/arch/i386/xen-vserver/config

@@ -0,0 +1,50 @@
+# CONFIG_X86_PC is not set
+CONFIG_X86_XEN=y
+CONFIG_XEN_PCIDEV_FRONTEND=y
+# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
+CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_BACKEND=y
+CONFIG_XEN_PCIDEV_BACKEND=y
+CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
+# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
+# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
+CONFIG_XEN_BLKDEV_BACKEND=y
+# CONFIG_XEN_BLKDEV_TAP_BE is not set
+CONFIG_XEN_NETDEV_BACKEND=y
+# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_FRONTEND=y
+# CONFIG_XEN_BLKDEV_TAP is not set
+CONFIG_XEN_NETDEV_LOOPBACK=y
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DISABLE_SERIAL=y
+CONFIG_XEN_SYSFS=y
+# CONFIG_SMP_ALTERNATIVES is not set
+# CONFIG_PCI_GOXEN_FE is not set
+CONFIG_VSERVER=y
+CONFIG_VSERVER_SECURITY=y
+CONFIG_VSERVER_LEGACYNET=y
+CONFIG_VSERVER_LEGACY=y
+# CONFIG_VSERVER_LEGACY_VERSION is not set
+CONFIG_VSERVER_DYNAMIC_IDS=y
+# CONFIG_VSERVER_NGNET is not set
+CONFIG_VSERVER_COWBL=y
+CONFIG_VSERVER_PROC_SECURE=y
+# CONFIG_VSERVER_HARDCPU is not set
+# CONFIG_INOXID_NONE is not set
+# CONFIG_INOXID_UID16 is not set
+# CONFIG_INOXID_GID16 is not set
+CONFIG_INOXID_UGID24=y
+# CONFIG_INOXID_INTERN is not set
+# CONFIG_INOXID_RUNTIME is not set
+# CONFIG_XID_TAG_NFSD is not set
+# CONFIG_XID_PROPAGATE is not set
+# CONFIG_VSERVER_DEBUG is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_25G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_15G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_BLK_DEV_VROOT=y

debian/arch/i386/xen-vserver/config.686

@@ -0,0 +1,72 @@
+CONFIG_LOCK_KERNEL=y
+# CONFIG_CPUSETS is not set
+CONFIG_STOP_MACHINE=y
+# CONFIG_M386 is not set
+CONFIG_M686=y
+# CONFIG_MK7 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_X86_TSC=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_NONFATAL=m
+CONFIG_X86_MCE_P4THERMAL=y
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_IRQBALANCE is not set
+CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+# CONFIG_SBPCD is not set
+# CONFIG_CM206 is not set
+# CONFIG_CDU31A is not set
+# CONFIG_DMASCC is not set
+# CONFIG_IRPORT_SIR is not set
+# CONFIG_NI5010 is not set
+# CONFIG_PCMCIA_XIRTULIP is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_HYSDN is not set
+# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
+# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
+# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
+# CONFIG_ISDN_DRV_AVMB1_C4 is not set
+# CONFIG_COMPUTONE is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_SX is not set
+# CONFIG_RIO is not set
+# CONFIG_STALLION is not set
+# CONFIG_ISTALLION is not set
+# CONFIG_FTAPE is not set
+# CONFIG_I2C_ELEKTOR is not set
+CONFIG_I2C_STUB=m
+# CONFIG_USB_W9968CF is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_CMPXCHG64=y
+# CONFIG_M486 is not set
+# CONFIG_HOTPLUG_CPU is not set

debian/arch/i386/xen-vserver/defines

@@ -0,0 +1,12 @@
+[base]
+flavours:
+ 686
+
+[image]
+recommends: libc6-i686
+type: plain-xen
+
+[686]
+class: PPro/Celeron/PII/PIII/P4
+longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
+

debian/arch/i386/xen/config

@@ -3,6 +3,7 @@ CONFIG_X86_XEN=y
 CONFIG_XEN_PCIDEV_FRONTEND=y
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
 # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
@@ -19,5 +20,6 @@ CONFIG_XEN_NETDEV_LOOPBACK=y
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
+CONFIG_XEN_SYSFS=y
 # CONFIG_SMP_ALTERNATIVES is not set
 # CONFIG_PCI_GOXEN_FE is not set

debian/arch/i386/xen/config.686

@@ -69,3 +69,4 @@ CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
+# CONFIG_HOTPLUG_CPU is not set

debian/arch/i386/xen/config.k7

@@ -70,3 +70,4 @@ CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
+# CONFIG_HOTPLUG_CPU is not set

debian/arch/i386/xen/defines

@@ -4,15 +4,14 @@ flavours:
  k7
 
 [image]
+recommends: libc6-i686
 type: plain-xen
 
 [686]
 class: PPro/Celeron/PII/PIII/P4
 longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
-recommends: libc6-i686
 
 [k7]
 class: AMD K7
 longclass: 32bit AMD Duron/Athlon/AthlonXP
-recommends: libc6-i686