rpms/kernel/devel/configs config-x86-generic, 1.34, 1.35 config-x86_64-generic, 1.30, 1.31 config-xen-generic, 1.7, 1.8 config-xen-x86_64, 1.1, 1.2 config-xen-xen0, 1.3, 1.4 config-xen-xenU, 1.2, 1.3

Mon Feb 13 21:17:52 UTC 2006

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv8637/configs

Modified Files:
	config-x86-generic config-x86_64-generic config-xen-generic 
	config-xen-x86_64 config-xen-xen0 config-xen-xenU 
Log Message:
Merge kernel-xen back to kernel



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35

--- config-x86-generic	13 Feb 2006 00:33:52 -0000	1.34
+++ config-x86-generic	13 Feb 2006 21:17:48 -0000	1.35
@@ -1,4 +1,5 @@
 CONFIG_UID16=y
+CONFIG_X86_64_XEN is not set
 #
 # Processor type and features
 #
@@ -48,6 +49,7 @@
 CONFIG_HPET_EMULATE_RTC=y
 # CONFIG_HPET_RTC_IRQ is not set
 # CONFIG_HPET_MMAP is not set
+# CONFIG_SMP_ALTERNATIVES is not set
 CONFIG_NR_CPUS=8
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- config-x86_64-generic	13 Feb 2006 00:33:52 -0000	1.30
+++ config-x86_64-generic	13 Feb 2006 21:17:48 -0000	1.31
@@ -1,4 +1,5 @@
 CONFIG_UID16=y
+# CONFIG_X86_64_XEN is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-xen-generic	24 Aug 2005 02:28:49 -0000	1.7
+++ config-xen-generic	13 Feb 2006 21:17:48 -0000	1.8
@@ -1,7 +1,6 @@
 #
 # XEN
 #
-CONFIG_XEN=y
 CONFIG_ARCH_XEN=y
 CONFIG_NO_IDLE_HZ=y
 CONFIG_XEN_WRITABLE_PAGETABLES=y
@@ -15,13 +14,12 @@
 # CONFIG_XEN_NETDEV_GRANT_TX is not set
 # CONFIG_XEN_NETDEV_GRANT_RX is not set
 # CONFIG_SMP_ALTERNATIVES is not set
-CONFIG_X86=y
-# CONFIG_X86_64 is not set
 
 #
 # X86 Processor Configuration
 #
-CONFIG_XENARCH="i386"
+CONFIG_X86_XEN=y
+# CONFIG_X86_PC is not set
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_GENERIC_ISA_DMA=y
@@ -57,9 +55,9 @@
 # Firmware Drivers
 #
 # CONFIG_EDD is not set
-CONFIG_NOHIGHMEM=y
-# CONFIG_HIGHMEM4G is not set
-# HIGHMEM64G is not set
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
 CONFIG_HAVE_DEC_LOCK=y
 # CONFIG_REGPARM is not set
 
@@ -75,6 +73,7 @@
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_4KSTACKS is not set
 # CONFIG_KPROBES is not set
+# CONFIG_DEBUG_RODATA is not set
 
 #
 # Disabled until I figure out a way to make next_ram_page work
@@ -103,3 +102,9 @@
 # Cryptographic options
 #
 CONFIG_CRYPTO_AES_586=m
+
+#
+# kexec does not work with Xen right now.
+#
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH is not set


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86_64,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-xen-x86_64	27 Apr 2005 20:57:41 -0000	1.1
+++ config-xen-x86_64	13 Feb 2006 21:17:48 -0000	1.2
@@ -3,8 +3,8 @@
 # CONFIG_X86 is not set
 CONFIG_X86_64=y
 
-# CONFIG_XEN_X86 is not set
-CONFIG_XEN_X86_64=y
+# CONFIG_X86_XEN is not set
+CONFIG_X86_64_XEN=y
 
 CONFIG_XENARCH="x86_64"
 # CONFIG_MPSC is not set


Index: config-xen-xen0
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xen0,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-xen-xen0	23 Feb 2005 21:50:59 -0000	1.3
+++ config-xen-xen0	13 Feb 2006 21:17:48 -0000	1.4
@@ -5,9 +5,10 @@
 CONFIG_XEN_PHYSDEV_ACCESS=y
 CONFIG_XEN_BLKDEV_BACKEND=y
 CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
+# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -49,6 +50,7 @@
 #
 CONFIG_SERIAL_8250=m
 # CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_XEN_DISABLE_SERIAL is not set
 
 # CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
@@ -57,3 +59,15 @@
 # FIR device drivers
 #
 # CONFIG_TOSHIBA_FIR is not set
+
+# 
+# TPM
+# 
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+
+#
+# Power management bits that don't work in Xen:
+#
+# CONFIG_X86_POWERNOW_K7 is not set
+# CONFIG_X86_P4_CLOCKMOD is not set


Index: config-xen-xenU
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xenU,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-xenU	12 Feb 2005 16:32:18 -0000	1.2
+++ config-xen-xenU	13 Feb 2006 21:17:48 -0000	1.3
@@ -6,8 +6,9 @@
 # CONFIG_XEN_BLKDEV_BACKEND is not set
 # CONFIG_XEN_NETDEV_BACKEND is not set
 CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_FRONTEND=m
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
+CONFIG_XEN_DISABLE_SERIAL=y
 
 #
 # Disable the non-xen drivers, since unprivileged guests
@@ -69,3 +70,11 @@
 #
 # CONFIG_ATMEL is not set
 # CONFIG_IEEE80211 is not set
+
+# 
+# TPM
+# 
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+
+# CONFIG_TOSHIBA is not set
+# CONFIG_MICROCODE is not set


