[x86] merge 2.6.31 and 2.6.32 configs

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19626 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 18 insertions, 85 deletions

diff --git a/target/linux/x86/xen_domu/config-2.6.31 b/target/linux/x86/xen_domu/config-2.6.31
deleted file mode 100644
index 3d24d1673b..0000000000
--- a/target/linux/x86/xen_domu/config-2.6.31
+++ /dev/null
@@ -1,84 +0,0 @@
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-# CONFIG_APM is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KVM_CLOCK is not set
-# CONFIG_KVM_GUEST is not set
-# CONFIG_LGUEST_GUEST is not set
-# CONFIG_M386 is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-# CONFIG_SCHED_SMT is not set
-# CONFIG_VMI is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_DS is not set
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_PLATFORM_DEVICES is not set
-# CONFIG_XENFS is not set
-# CONFIG_XEN_DEBUG_FS is not set
-# CONFIG_XEN_DEV_EVTCHN is not set
-# CONFIG_XEN_NETDEV_FRONTEND is not set
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_FREEZER=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_PERF_COUNTERS=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_HPET_TIMER=y
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_KERNEL_GZIP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_MARKERS=y
-CONFIG_MPENTIUM4=y
-CONFIG_NR_CPUS=2
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PNPACPI=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHED_MC=y
-CONFIG_SMP=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_STOP_MACHINE=y
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_THERMAL=y
-CONFIG_TRACEPOINTS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_X86_32_SMP=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_X86_HT=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_MINIMUM_CPU_FAMILY=4
-CONFIG_X86_PAE=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_X86_TSC=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_XADD=y
-CONFIG_XEN=y
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
-CONFIG_XEN_SAVE_RESTORE=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_SYS_HYPERVISOR=y
diff --git a/target/linux/x86/xen_domu/config-2.6.32 b/target/linux/x86/xen_domu/config-default
index 0e8a382f09..992d39da66 100644
--- a/target/linux/x86/xen_domu/config-2.6.32
+++ b/target/linux/x86/xen_domu/config-default
@@ -1,18 +1,35 @@
+# CONFIG_CLASSIC_RCU is not set
 # CONFIG_KERNEL_LZMA is not set
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_X86_CPU_DEBUG is not set
+# CONFIG_X86_OLD_MCE is not set
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_FREEZER=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
+CONFIG_HAVE_FTRACE_SYSCALLS=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_PERF_COUNTERS=y
+CONFIG_HOTPLUG_CPU=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
 CONFIG_KERNEL_GZIP=y
 CONFIG_LOCK_KERNEL=y
+CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 CONFIG_MPENTIUM4=y
 CONFIG_NR_CPUS=4
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_RCU_FANOUT=32
 CONFIG_SCHED_MC=y
 CONFIG_SMP=y
 CONFIG_SPARSE_IRQ=y
@@ -25,7 +42,7 @@ CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_X86_HT=y
 CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_NEW_MCE=y
 CONFIG_X86_PAE=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y