diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 10:04:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 10:04:50 +0000 |
| commit | 2bb42693d59581b9540871184eeb199906dd48f9 (patch) | |
| tree | 18e183d0a867d2a36c2f29750aa99974fb4f6ae1 /target/linux/x86/xen_domu | |
| parent | 9be4a77bf79040bce165d48251f17fe93d13557f (diff) | |
| download | upstream-2bb42693d59581b9540871184eeb199906dd48f9.tar.gz upstream-2bb42693d59581b9540871184eeb199906dd48f9.tar.bz2 upstream-2bb42693d59581b9540871184eeb199906dd48f9.zip | |
x86: update to linux 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43559 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/xen_domu')
| -rw-r--r-- | target/linux/x86/xen_domu/config-default | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/target/linux/x86/xen_domu/config-default b/target/linux/x86/xen_domu/config-default index fc86036b5f..11ffdab4ad 100644 --- a/target/linux/x86/xen_domu/config-default +++ b/target/linux/x86/xen_domu/config-default @@ -1,5 +1,5 @@ # CONFIG_APM is not set -CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set CONFIG_CPU_RMAP=y @@ -14,6 +14,7 @@ CONFIG_HVC_IRQ=y CONFIG_HVC_XEN=y CONFIG_HVC_XEN_FRONTEND=y CONFIG_HYPERVISOR_GUEST=y +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_IOMMU_HELPER=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set @@ -22,6 +23,7 @@ CONFIG_KERNEL_GZIP=y CONFIG_MMU_NOTIFIER=y CONFIG_MPENTIUM4=y CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_NET_FLOW_LIMIT=y CONFIG_NR_CPUS=4 CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y @@ -38,14 +40,16 @@ CONFIG_RCU_STALL_COMMON=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_SCHED_MC=y +CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SMP=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_UNINLINE_SPIN_UNLOCK=y # CONFIG_VMWARE_BALLOON is not set +CONFIG_VT_CONSOLE_SLEEP=y CONFIG_X86_32_SMP=y # CONFIG_X86_BIGSMP is not set CONFIG_X86_CMOV=y |