From ed07ad5ec10addad88770a7d29ed0cfa9a25c1ad Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 May 2013 03:25:13 +0200 Subject: mmrnmhrm: Update kernel configuration to v3.10.0. Signed-off-by: aszlig --- machines/mmrnmhrm-kconf.nix | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) (limited to 'machines/mmrnmhrm-kconf.nix') diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index 4cb31324..ef5ed8a9 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -19,7 +19,6 @@ "CONFIG_RWSEM_XCHGADD_ALGORITHM" = "y"; "CONFIG_GENERIC_CALIBRATE_DELAY" = "y"; "CONFIG_ARCH_HAS_CPU_RELAX" = "y"; - "CONFIG_ARCH_HAS_DEFAULT_IDLE" = "y"; "CONFIG_ARCH_HAS_CACHE_LINE_SIZE" = "y"; "CONFIG_ARCH_HAS_CPU_AUTOPROBE" = "y"; "CONFIG_HAVE_SETUP_PER_CPU_AREA" = "y"; @@ -38,7 +37,6 @@ "CONFIG_DEFCONFIG_LIST" = "/lib/modules/$UNAME_RELEASE/.config"; "CONFIG_IRQ_WORK" = "y"; "CONFIG_BUILDTIME_EXTABLE_SORT" = "y"; - "CONFIG_EXPERIMENTAL" = "y"; "CONFIG_INIT_ENV_ARG_LIMIT" = "32"; "CONFIG_CROSS_COMPILE" = ""; "CONFIG_LOCALVERSION" = ""; @@ -65,7 +63,6 @@ "CONFIG_SPARSE_IRQ" = "y"; "CONFIG_CLOCKSOURCE_WATCHDOG" = "y"; "CONFIG_ARCH_CLOCKSOURCE_DATA" = "y"; - "CONFIG_ALWAYS_USE_PERSISTENT_CLOCK" = "y"; "CONFIG_GENERIC_TIME_VSYSCALL" = "y"; "CONFIG_GENERIC_CLOCKEVENTS" = "y"; "CONFIG_GENERIC_CLOCKEVENTS_BUILD" = "y"; @@ -73,6 +70,8 @@ "CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST" = "y"; "CONFIG_GENERIC_CMOS_UPDATE" = "y"; "CONFIG_TICK_ONESHOT" = "y"; + "CONFIG_NO_HZ_COMMON" = "y"; + "CONFIG_NO_HZ_IDLE" = "y"; "CONFIG_NO_HZ" = "y"; "CONFIG_HIGH_RES_TIMERS" = "y"; "CONFIG_TICK_CPU_ACCOUNTING" = "y"; @@ -125,15 +124,15 @@ "CONFIG_SYSCTL" = "y"; "CONFIG_ANON_INODES" = "y"; "CONFIG_HAVE_UID16" = "y"; - "CONFIG_UID16" = "y"; "CONFIG_SYSCTL_EXCEPTION_TRACE" = "y"; - "CONFIG_KALLSYMS" = "y"; "CONFIG_HOTPLUG" = "y"; + "CONFIG_HAVE_PCSPKR_PLATFORM" = "y"; + "CONFIG_UID16" = "y"; + "CONFIG_KALLSYMS" = "y"; "CONFIG_PRINTK" = "y"; "CONFIG_BUG" = "y"; "CONFIG_ELF_CORE" = "y"; "CONFIG_PCSPKR_PLATFORM" = "y"; - "CONFIG_HAVE_PCSPKR_PLATFORM" = "y"; "CONFIG_BASE_FULL" = "y"; "CONFIG_FUTEX" = "y"; "CONFIG_EPOLL" = "y"; @@ -142,10 +141,10 @@ "CONFIG_EVENTFD" = "y"; "CONFIG_SHMEM" = "y"; "CONFIG_AIO" = "y"; + "CONFIG_PCI_QUIRKS" = "y"; "CONFIG_HAVE_PERF_EVENTS" = "y"; "CONFIG_PERF_EVENTS" = "y"; "CONFIG_VM_EVENT_COUNTERS" = "y"; - "CONFIG_PCI_QUIRKS" = "y"; "CONFIG_SLUB_DEBUG" = "y"; "CONFIG_SLUB" = "y"; "CONFIG_HAVE_OPROFILE" = "y"; @@ -177,7 +176,6 @@ "CONFIG_HAVE_CMPXCHG_DOUBLE" = "y"; "CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION" = "y"; "CONFIG_ARCH_WANT_OLD_COMPAT_IPC" = "y"; - "CONFIG_HAVE_VIRT_TO_BUS" = "y"; "CONFIG_HAVE_ARCH_SECCOMP_FILTER" = "y"; "CONFIG_SECCOMP_FILTER" = "y"; "CONFIG_HAVE_CONTEXT_TRACKING" = "y"; @@ -353,6 +351,7 @@ "CONFIG_BINFMT_ELF" = "y"; "CONFIG_COMPAT_BINFMT_ELF" = "y"; "CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE" = "y"; + "CONFIG_BINFMT_SCRIPT" = "y"; "CONFIG_BINFMT_MISC" = "y"; "CONFIG_COREDUMP" = "y"; "CONFIG_IA32_EMULATION" = "y"; @@ -374,6 +373,7 @@ "CONFIG_INET" = "y"; "CONFIG_IP_MULTICAST" = "y"; "CONFIG_IP_ROUTE_CLASSID" = "y"; + "CONFIG_NET_IP_TUNNEL" = "m"; "CONFIG_INET_TUNNEL" = "m"; "CONFIG_INET_LRO" = "y"; "CONFIG_INET_DIAG" = "y"; @@ -441,6 +441,8 @@ "CONFIG_NET_SCH_FIFO" = "y"; "CONFIG_DNS_RESOLVER" = "y"; "CONFIG_VSOCKETS" = "y"; + "CONFIG_NETLINK_MMAP" = "y"; + "CONFIG_NETLINK_DIAG" = "m"; "CONFIG_RPS" = "y"; "CONFIG_RFS_ACCEL" = "y"; "CONFIG_XPS" = "y"; @@ -486,6 +488,8 @@ "CONFIG_MII" = "y"; "CONFIG_VXLAN" = "m"; "CONFIG_VIRTIO_NET" = "m"; + "CONFIG_VHOST_NET" = "m"; + "CONFIG_VHOST_RING" = "m"; "CONFIG_ETHERNET" = "y"; "CONFIG_NET_VENDOR_INTEL" = "y"; "CONFIG_E1000E" = "y"; @@ -650,6 +654,7 @@ "CONFIG_USB_ARCH_HAS_HCD" = "y"; "CONFIG_USB" = "y"; "CONFIG_USB_ANNOUNCE_NEW_DEVICES" = "y"; + "CONFIG_USB_DEFAULT_PERSIST" = "y"; "CONFIG_USB_MON" = "m"; "CONFIG_USB_EHCI_HCD" = "y"; "CONFIG_USB_EHCI_ROOT_HUB_TT" = "y"; @@ -724,6 +729,7 @@ "CONFIG_USB_SERIAL_VIVOPAY_SERIAL" = "m"; "CONFIG_USB_SERIAL_XSENS_MT" = "m"; "CONFIG_USB_SERIAL_ZIO" = "m"; + "CONFIG_USB_SERIAL_WISHBONE" = "m"; "CONFIG_USB_SERIAL_ZTE" = "m"; "CONFIG_USB_SERIAL_SSU100" = "m"; "CONFIG_USB_SERIAL_QT2" = "m"; @@ -742,6 +748,8 @@ "CONFIG_USB_LIBCOMPOSITE" = "m"; "CONFIG_USB_F_ACM" = "m"; "CONFIG_USB_U_SERIAL" = "m"; + "CONFIG_USB_F_SERIAL" = "m"; + "CONFIG_USB_F_OBEX" = "m"; "CONFIG_USB_AUDIO" = "m"; "CONFIG_USB_ETH" = "m"; "CONFIG_USB_ETH_RNDIS" = "y"; @@ -761,10 +769,14 @@ "CONFIG_LEDS_CLASS" = "y"; "CONFIG_RTC_LIB" = "y"; "CONFIG_RTC_CLASS" = "y"; + "CONFIG_RTC_HCTOSYS" = "y"; + "CONFIG_RTC_SYSTOHC" = "y"; + "CONFIG_RTC_HCTOSYS_DEVICE" = "rtc0"; "CONFIG_RTC_INTF_SYSFS" = "y"; "CONFIG_RTC_INTF_PROC" = "y"; "CONFIG_RTC_INTF_DEV" = "y"; "CONFIG_RTC_DRV_CMOS" = "y"; + "CONFIG_VIRT_DRIVERS" = "y"; "CONFIG_VIRTIO" = "m"; "CONFIG_VIRTIO_PCI" = "m"; "CONFIG_VIRTIO_BALLOON" = "m"; @@ -775,7 +787,6 @@ "CONFIG_CLKEVT_I8253" = "y"; "CONFIG_I8253_LOCK" = "y"; "CONFIG_CLKBLD_I8253" = "y"; - "CONFIG_VIRT_DRIVERS" = "y"; "CONFIG_FIRMWARE_MEMMAP" = "y"; "CONFIG_DMIID" = "y"; "CONFIG_DMI_SYSFS" = "m"; @@ -907,6 +918,7 @@ "CONFIG_DEBUG_MEMORY_INIT" = "y"; "CONFIG_ARCH_WANT_FRAME_POINTERS" = "y"; "CONFIG_RCU_CPU_STALL_TIMEOUT" = "60"; + "CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS" = "y"; "CONFIG_USER_STACKTRACE_SUPPORT" = "y"; "CONFIG_HAVE_FUNCTION_TRACER" = "y"; "CONFIG_HAVE_FUNCTION_GRAPH_TRACER" = "y"; @@ -972,11 +984,11 @@ "CONFIG_CRYPTO_LRW" = "y"; "CONFIG_CRYPTO_PCBC" = "y"; "CONFIG_CRYPTO_XTS" = "y"; + "CONFIG_CRYPTO_CMAC" = "m"; "CONFIG_CRYPTO_HMAC" = "y"; "CONFIG_CRYPTO_XCBC" = "y"; "CONFIG_CRYPTO_VMAC" = "y"; "CONFIG_CRYPTO_CRC32C" = "y"; - "CONFIG_CRYPTO_CRC32C_X86_64" = "y"; "CONFIG_CRYPTO_CRC32C_INTEL" = "y"; "CONFIG_CRYPTO_CRC32" = "y"; "CONFIG_CRYPTO_CRC32_PCLMUL" = "y"; @@ -990,6 +1002,8 @@ "CONFIG_CRYPTO_RMD320" = "m"; "CONFIG_CRYPTO_SHA1" = "y"; "CONFIG_CRYPTO_SHA1_SSSE3" = "y"; + "CONFIG_CRYPTO_SHA256_SSSE3" = "y"; + "CONFIG_CRYPTO_SHA512_SSSE3" = "y"; "CONFIG_CRYPTO_SHA256" = "y"; "CONFIG_CRYPTO_SHA512" = "y"; "CONFIG_CRYPTO_TGR192" = "m"; @@ -1003,9 +1017,11 @@ "CONFIG_CRYPTO_BLOWFISH" = "y"; "CONFIG_CRYPTO_BLOWFISH_COMMON" = "y"; "CONFIG_CRYPTO_BLOWFISH_X86_64" = "y"; + "CONFIG_CRYPTO_BLOWFISH_AVX2_X86_64" = "y"; "CONFIG_CRYPTO_CAMELLIA" = "m"; "CONFIG_CRYPTO_CAMELLIA_X86_64" = "y"; "CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64" = "y"; + "CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64" = "y"; "CONFIG_CRYPTO_CAST_COMMON" = "y"; "CONFIG_CRYPTO_CAST5" = "y"; "CONFIG_CRYPTO_CAST5_AVX_X86_64" = "y"; @@ -1020,12 +1036,14 @@ "CONFIG_CRYPTO_SERPENT" = "y"; "CONFIG_CRYPTO_SERPENT_SSE2_X86_64" = "y"; "CONFIG_CRYPTO_SERPENT_AVX_X86_64" = "y"; + "CONFIG_CRYPTO_SERPENT_AVX2_X86_64" = "y"; "CONFIG_CRYPTO_TEA" = "m"; "CONFIG_CRYPTO_TWOFISH" = "y"; "CONFIG_CRYPTO_TWOFISH_COMMON" = "y"; "CONFIG_CRYPTO_TWOFISH_X86_64" = "y"; "CONFIG_CRYPTO_TWOFISH_X86_64_3WAY" = "y"; "CONFIG_CRYPTO_TWOFISH_AVX_X86_64" = "y"; + "CONFIG_CRYPTO_TWOFISH_AVX2_X86_64" = "y"; "CONFIG_CRYPTO_DEFLATE" = "y"; "CONFIG_CRYPTO_ZLIB" = "y"; "CONFIG_CRYPTO_LZO" = "y"; @@ -1039,6 +1057,7 @@ "CONFIG_X509_CERTIFICATE_PARSER" = "m"; "CONFIG_HAVE_KVM" = "y"; "CONFIG_HAVE_KVM_IRQCHIP" = "y"; + "CONFIG_HAVE_KVM_IRQ_ROUTING" = "y"; "CONFIG_HAVE_KVM_EVENTFD" = "y"; "CONFIG_KVM_APIC_ARCHITECTURE" = "y"; "CONFIG_KVM_MMIO" = "y"; @@ -1048,7 +1067,6 @@ "CONFIG_VIRTUALIZATION" = "y"; "CONFIG_KVM" = "y"; "CONFIG_KVM_INTEL" = "y"; - "CONFIG_VHOST_NET" = "m"; "CONFIG_RAID6_PQ" = "y"; "CONFIG_BITREVERSE" = "y"; "CONFIG_GENERIC_STRNCPY_FROM_USER" = "y"; @@ -1100,5 +1118,5 @@ "CONFIG_CLZ_TAB" = "y"; "CONFIG_CORDIC" = "y"; "CONFIG_MPILIB" = "m"; - "CONFIG_OID_REGISTRY" = "m"; + "CONFIG_OID_REGISTRY" = "y"; } -- cgit 1.4.1