aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/xen_domu
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-05-16 10:44:49 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-05-16 10:44:49 +0000
commit8ace34552a49064d6f781dfe23a5fb4ff2b88c35 (patch)
tree6c1f01e3f74e696493d15b79e4396c32e03e750b /target/linux/x86/xen_domu
parent4cd69e320c6e4f7448191fa42c7c8fdc71b76046 (diff)
downloadupstream-8ace34552a49064d6f781dfe23a5fb4ff2b88c35.tar.gz
upstream-8ace34552a49064d6f781dfe23a5fb4ff2b88c35.tar.bz2
upstream-8ace34552a49064d6f781dfe23a5fb4ff2b88c35.zip
x86: sync 2.6.39 configs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31749 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/xen_domu')
-rw-r--r--target/linux/x86/xen_domu/config-default46
1 files changed, 27 insertions, 19 deletions
diff --git a/target/linux/x86/xen_domu/config-default b/target/linux/x86/xen_domu/config-default
index a42c6f3823..cd885f3a6d 100644
--- a/target/linux/x86/xen_domu/config-default
+++ b/target/linux/x86/xen_domu/config-default
@@ -1,67 +1,75 @@
# CONFIG_APM is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CPU_RMAP=y
CONFIG_FREEZER=y
CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HIBERNATE_CALLBACKS=y
+# CONFIG_HIGHMEM64G is not set
CONFIG_HOTPLUG_CPU=y
CONFIG_HVC_DRIVER=y
CONFIG_HVC_IRQ=y
CONFIG_HVC_XEN=y
-CONFIG_ISA_DMA_API=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_XZ is not set
+CONFIG_IOMMU_HELPER=y
# CONFIG_KVM_CLOCK is not set
-# CONFIG_KVM_GUEST is not set
# CONFIG_LGUEST_GUEST is not set
-CONFIG_LOCK_KERNEL=y
# CONFIG_M486 is not set
+CONFIG_MMU_NOTIFIER=y
CONFIG_MPENTIUM4=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NR_CPUS=4
CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_CLOCK=y
CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_PCI_XEN=y
CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
+CONFIG_RFS_ACCEL=y
+CONFIG_RPS=y
CONFIG_SCHED_MC=y
# CONFIG_SCHED_SMT is not set
CONFIG_SMP=y
CONFIG_SPARSE_IRQ=y
CONFIG_STOP_MACHINE=y
+CONFIG_SWIOTLB=y
+CONFIG_SWIOTLB_XEN=y
CONFIG_SYS_HYPERVISOR=y
+CONFIG_TREE_RCU=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
-# CONFIG_VMI is not set
CONFIG_X86_32_SMP=y
# CONFIG_X86_BIGSMP is not set
CONFIG_X86_CMOV=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_DEBUGCTLMSR=y
-# CONFIG_X86_DS is not set
CONFIG_X86_HT=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=7
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_X86_MINIMUM_CPU_FAMILY=5
CONFIG_X86_PAE=y
-CONFIG_X86_TRAMPOLINE=y
CONFIG_X86_TSC=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_XEN=y
# CONFIG_XENFS is not set
CONFIG_XEN_BALLOON=y
CONFIG_XEN_BLKDEV_FRONTEND=y
+# CONFIG_XEN_DEBUG is not set
CONFIG_XEN_DEBUG_FS=y
# CONFIG_XEN_DEV_EVTCHN is not set
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_XEN_MAX_DOMAIN_MEMORY=128
# CONFIG_XEN_NETDEV_FRONTEND is not set
+CONFIG_XEN_PCIDEV_FRONTEND=y
+CONFIG_XEN_PLATFORM_PCI=m
+# CONFIG_XEN_PRIVILEGED_GUEST is not set
+CONFIG_XEN_PVHVM=y
CONFIG_XEN_SAVE_RESTORE=y
CONFIG_XEN_SCRUB_PAGES=y
CONFIG_XEN_SYS_HYPERVISOR=y
+# CONFIG_XEN_WDT is not set
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XPS=y