From dfcb60484acd101f239e65e70bd3ac6f674bb0b7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 8 Feb 2014 13:08:42 +0100 Subject: mmrnmhrm: Update kernel config to v3.14.0-rc1. Signed-off-by: aszlig --- machines/mmrnmhrm-kconf.nix | 54 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 11 deletions(-) (limited to 'machines/mmrnmhrm-kconf.nix') diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index 3a8ab9cf..f6c6d62b 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -95,6 +95,7 @@ "CONFIG_LOG_BUF_SHIFT" = "17"; "CONFIG_HAVE_UNSTABLE_SCHED_CLOCK" = "y"; "CONFIG_ARCH_SUPPORTS_NUMA_BALANCING" = "y"; + "CONFIG_ARCH_SUPPORTS_INT128" = "y"; "CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE" = "y"; "CONFIG_CGROUPS" = "y"; "CONFIG_CGROUP_FREEZER" = "y"; @@ -111,7 +112,6 @@ "CONFIG_USER_NS" = "y"; "CONFIG_PID_NS" = "y"; "CONFIG_NET_NS" = "y"; - "CONFIG_UIDGID_STRICT_TYPE_CHECKS" = "y"; "CONFIG_SCHED_AUTOGROUP" = "y"; "CONFIG_RELAY" = "y"; "CONFIG_BLK_DEV_INITRD" = "y"; @@ -159,7 +159,6 @@ "CONFIG_HAVE_KPROBES_ON_FTRACE" = "y"; "CONFIG_HAVE_ARCH_TRACEHOOK" = "y"; "CONFIG_HAVE_DMA_ATTRS" = "y"; - "CONFIG_USE_GENERIC_SMP_HELPERS" = "y"; "CONFIG_GENERIC_SMP_IDLE_THREAD" = "y"; "CONFIG_HAVE_REGS_AND_STACK_ACCESS_API" = "y"; "CONFIG_HAVE_DMA_API_DEBUG" = "y"; @@ -178,16 +177,22 @@ "CONFIG_ARCH_WANT_OLD_COMPAT_IPC" = "y"; "CONFIG_HAVE_ARCH_SECCOMP_FILTER" = "y"; "CONFIG_SECCOMP_FILTER" = "y"; + "CONFIG_HAVE_CC_STACKPROTECTOR" = "y"; + "CONFIG_CC_STACKPROTECTOR" = "y"; + "CONFIG_CC_STACKPROTECTOR_REGULAR" = "y"; "CONFIG_HAVE_CONTEXT_TRACKING" = "y"; + "CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN" = "y"; "CONFIG_HAVE_IRQ_TIME_ACCOUNTING" = "y"; "CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE" = "y"; "CONFIG_HAVE_ARCH_SOFT_DIRTY" = "y"; "CONFIG_MODULES_USE_ELF_RELA" = "y"; + "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y"; "CONFIG_OLD_SIGSUSPEND3" = "y"; "CONFIG_COMPAT_OLD_SIGACTION" = "y"; "CONFIG_SLABINFO" = "y"; "CONFIG_RT_MUTEXES" = "y"; "CONFIG_BASE_SMALL" = "0"; + "CONFIG_SYSTEM_TRUSTED_KEYRING" = "y"; "CONFIG_MODULES" = "y"; "CONFIG_MODULE_FORCE_LOAD" = "y"; "CONFIG_MODULE_UNLOAD" = "y"; @@ -253,7 +258,6 @@ "CONFIG_MICROCODE" = "y"; "CONFIG_MICROCODE_INTEL" = "y"; "CONFIG_MICROCODE_OLD_INTERFACE" = "y"; - "CONFIG_MICROCODE_INTEL_LIB" = "y"; "CONFIG_MICROCODE_INTEL_EARLY" = "y"; "CONFIG_MICROCODE_EARLY" = "y"; "CONFIG_X86_MSR" = "m"; @@ -283,6 +287,7 @@ "CONFIG_ARCH_DISCARD_MEMBLOCK" = "y"; "CONFIG_PAGEFLAGS_EXTENDED" = "y"; "CONFIG_SPLIT_PTLOCK_CPUS" = "4"; + "CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK" = "y"; "CONFIG_BALLOON_COMPACTION" = "y"; "CONFIG_COMPACTION" = "y"; "CONFIG_MIGRATION" = "y"; @@ -299,6 +304,7 @@ "CONFIG_CROSS_MEMORY_ATTACH" = "y"; "CONFIG_CLEANCACHE" = "y"; "CONFIG_FRONTSWAP" = "y"; + "CONFIG_ZSMALLOC" = "y"; "CONFIG_X86_RESERVE_LOW" = "64"; "CONFIG_MTRR" = "y"; "CONFIG_MTRR_SANITIZER" = "y"; @@ -327,9 +333,9 @@ "CONFIG_ACPI_NUMA" = "y"; "CONFIG_ACPI_CUSTOM_DSDT_FILE" = ""; "CONFIG_ACPI_INITRD_TABLE_OVERRIDE" = "y"; - "CONFIG_ACPI_BLACKLIST_YEAR" = "0"; "CONFIG_X86_PM_TIMER" = "y"; "CONFIG_ACPI_HED" = "y"; + "CONFIG_ACPI_EXTLOG" = "m"; "CONFIG_CPU_IDLE" = "y"; "CONFIG_CPU_IDLE_GOV_LADDER" = "y"; "CONFIG_CPU_IDLE_GOV_MENU" = "y"; @@ -380,7 +386,6 @@ "CONFIG_TCP_CONG_CUBIC" = "y"; "CONFIG_DEFAULT_TCP_CONG" = "cubic"; "CONFIG_IPV6" = "y"; - "CONFIG_IPV6_PRIVACY" = "y"; "CONFIG_IPV6_ROUTER_PREF" = "y"; "CONFIG_INET6_TUNNEL" = "m"; "CONFIG_IPV6_SIT" = "m"; @@ -409,6 +414,8 @@ "CONFIG_NET_SCH_CODEL" = "m"; "CONFIG_NET_SCH_FQ_CODEL" = "m"; "CONFIG_NET_SCH_FQ" = "m"; + "CONFIG_NET_SCH_HHF" = "m"; + "CONFIG_NET_SCH_PIE" = "m"; "CONFIG_NET_SCH_INGRESS" = "m"; "CONFIG_NET_SCH_PLUG" = "m"; "CONFIG_NET_CLS" = "y"; @@ -421,6 +428,7 @@ "CONFIG_NET_CLS_RSVP6" = "m"; "CONFIG_NET_CLS_FLOW" = "m"; "CONFIG_NET_CLS_CGROUP" = "m"; + "CONFIG_NET_CLS_BPF" = "m"; "CONFIG_NET_EMATCH" = "y"; "CONFIG_NET_EMATCH_STACK" = "32"; "CONFIG_NET_EMATCH_CMP" = "m"; @@ -445,7 +453,8 @@ "CONFIG_RPS" = "y"; "CONFIG_RFS_ACCEL" = "y"; "CONFIG_XPS" = "y"; - "CONFIG_NETPRIO_CGROUP" = "m"; + "CONFIG_CGROUP_NET_PRIO" = "m"; + "CONFIG_CGROUP_NET_CLASSID" = "y"; "CONFIG_NET_RX_BUSY_POLL" = "y"; "CONFIG_BQL" = "y"; "CONFIG_BPF_JIT" = "y"; @@ -459,9 +468,12 @@ "CONFIG_DMA_SHARED_BUFFER" = "y"; "CONFIG_CONNECTOR" = "y"; "CONFIG_PROC_EVENTS" = "y"; + "CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT" = "y"; "CONFIG_PNP" = "y"; "CONFIG_PNPACPI" = "y"; "CONFIG_BLK_DEV" = "y"; + "CONFIG_BLK_DEV_NULL_BLK" = "m"; + "CONFIG_ZRAM" = "y"; "CONFIG_BLK_DEV_LOOP" = "y"; "CONFIG_BLK_DEV_LOOP_MIN_COUNT" = "0"; "CONFIG_BLK_DEV_CRYPTOLOOP" = "m"; @@ -481,6 +493,7 @@ "CONFIG_ATA_ACPI" = "y"; "CONFIG_SATA_AHCI" = "y"; "CONFIG_MD" = "y"; + "CONFIG_BLK_DEV_DM_BUILTIN" = "y"; "CONFIG_BLK_DEV_DM" = "y"; "CONFIG_DM_CRYPT" = "y"; "CONFIG_DM_UEVENT" = "y"; @@ -509,6 +522,7 @@ "CONFIG_INPUT_TABLET" = "y"; "CONFIG_TABLET_USB_WACOM" = "y"; "CONFIG_SERIO" = "y"; + "CONFIG_ARCH_MIGHT_HAVE_PC_SERIO" = "y"; "CONFIG_SERIO_I8042" = "y"; "CONFIG_SERIO_LIBPS2" = "y"; "CONFIG_TTY" = "y"; @@ -525,18 +539,19 @@ "CONFIG_NVRAM" = "m"; "CONFIG_HPET" = "y"; "CONFIG_HPET_MMAP" = "y"; + "CONFIG_HPET_MMAP_DEFAULT" = "y"; "CONFIG_HANGCHECK_TIMER" = "m"; "CONFIG_DEVPORT" = "y"; "CONFIG_I2C" = "y"; "CONFIG_I2C_BOARDINFO" = "y"; "CONFIG_I2C_CHARDEV" = "y"; + "CONFIG_I2C_MUX" = "y"; "CONFIG_I2C_HELPER_AUTO" = "y"; "CONFIG_I2C_ALGOBIT" = "y"; "CONFIG_I2C_I801" = "y"; "CONFIG_PPS" = "y"; "CONFIG_PTP_1588_CLOCK" = "y"; "CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB" = "y"; - "CONFIG_GPIO_DEVRES" = "y"; "CONFIG_POWER_SUPPLY" = "y"; "CONFIG_POWER_RESET" = "y"; "CONFIG_HWMON" = "y"; @@ -566,21 +581,27 @@ "CONFIG_MEDIA_SUBDRV_AUTOSELECT" = "y"; "CONFIG_AGP" = "y"; "CONFIG_AGP_INTEL" = "y"; + "CONFIG_INTEL_GTT" = "y"; "CONFIG_VGA_ARB" = "y"; "CONFIG_VGA_ARB_MAX_GPUS" = "16"; "CONFIG_DRM" = "y"; "CONFIG_DRM_KMS_HELPER" = "y"; + "CONFIG_DRM_KMS_FB_HELPER" = "y"; "CONFIG_DRM_TTM" = "y"; "CONFIG_DRM_NOUVEAU" = "y"; "CONFIG_NOUVEAU_DEBUG" = "5"; "CONFIG_NOUVEAU_DEBUG_DEFAULT" = "3"; "CONFIG_DRM_NOUVEAU_BACKLIGHT" = "y"; + "CONFIG_DRM_BOCHS" = "m"; "CONFIG_VIDEO_OUTPUT_CONTROL" = "y"; "CONFIG_HDMI" = "y"; "CONFIG_FB" = "y"; "CONFIG_FB_CFB_FILLRECT" = "y"; "CONFIG_FB_CFB_COPYAREA" = "y"; "CONFIG_FB_CFB_IMAGEBLIT" = "y"; + "CONFIG_FB_SYS_FILLRECT" = "m"; + "CONFIG_FB_SYS_COPYAREA" = "m"; + "CONFIG_FB_SYS_IMAGEBLIT" = "m"; "CONFIG_FB_BACKLIGHT" = "y"; "CONFIG_FB_MODE_HELPERS" = "y"; "CONFIG_FB_TILEBLITTING" = "y"; @@ -706,6 +727,7 @@ "CONFIG_USB_SERIAL_METRO" = "m"; "CONFIG_USB_SERIAL_MOS7720" = "m"; "CONFIG_USB_SERIAL_MOS7840" = "m"; + "CONFIG_USB_SERIAL_MXUPORT" = "m"; "CONFIG_USB_SERIAL_NAVMAN" = "m"; "CONFIG_USB_SERIAL_PL2303" = "m"; "CONFIG_USB_SERIAL_OTI6858" = "m"; @@ -743,13 +765,14 @@ "CONFIG_USB_F_ACM" = "m"; "CONFIG_USB_U_SERIAL" = "m"; "CONFIG_USB_U_ETHER" = "m"; - "CONFIG_USB_U_RNDIS" = "m"; "CONFIG_USB_F_SERIAL" = "m"; "CONFIG_USB_F_OBEX" = "m"; "CONFIG_USB_F_NCM" = "m"; "CONFIG_USB_F_ECM" = "m"; "CONFIG_USB_F_SUBSET" = "m"; "CONFIG_USB_F_RNDIS" = "m"; + "CONFIG_USB_F_MASS_STORAGE" = "m"; + "CONFIG_USB_F_FS" = "m"; "CONFIG_USB_AUDIO" = "m"; "CONFIG_USB_ETH" = "m"; "CONFIG_USB_ETH_RNDIS" = "y"; @@ -790,6 +813,8 @@ "CONFIG_FIRMWARE_MEMMAP" = "y"; "CONFIG_DMIID" = "y"; "CONFIG_DMI_SYSFS" = "m"; + "CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK" = "y"; + "CONFIG_UEFI_CPER" = "y"; "CONFIG_DCACHE_WORD_ACCESS" = "y"; "CONFIG_EXT2_FS" = "y"; "CONFIG_EXT2_FS_XATTR" = "y"; @@ -807,7 +832,6 @@ "CONFIG_AUTOFS4_FS" = "y"; "CONFIG_FUSE_FS" = "y"; "CONFIG_CUSE" = "m"; - "CONFIG_GENERIC_ACL" = "y"; "CONFIG_ISO9660_FS" = "y"; "CONFIG_JOLIET" = "y"; "CONFIG_ZISOFS" = "y"; @@ -831,6 +855,8 @@ "CONFIG_MISC_FILESYSTEMS" = "y"; "CONFIG_ECRYPT_FS" = "y"; "CONFIG_SQUASHFS" = "m"; + "CONFIG_SQUASHFS_FILE_CACHE" = "y"; + "CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU" = "y"; "CONFIG_SQUASHFS_XATTR" = "y"; "CONFIG_SQUASHFS_ZLIB" = "y"; "CONFIG_SQUASHFS_LZO" = "y"; @@ -913,11 +939,13 @@ "CONFIG_FRAME_WARN" = "2048"; "CONFIG_ARCH_WANT_FRAME_POINTERS" = "y"; "CONFIG_MAGIC_SYSRQ" = "y"; + "CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE" = "0x1"; "CONFIG_HAVE_DEBUG_KMEMLEAK" = "y"; "CONFIG_DEBUG_MEMORY_INIT" = "y"; "CONFIG_HAVE_DEBUG_STACKOVERFLOW" = "y"; "CONFIG_HAVE_ARCH_KMEMCHECK" = "y"; "CONFIG_PANIC_ON_OOPS_VALUE" = "0"; + "CONFIG_PANIC_TIMEOUT" = "0"; "CONFIG_DEBUG_BUGVERBOSE" = "y"; "CONFIG_RCU_CPU_STALL_TIMEOUT" = "60"; "CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS" = "y"; @@ -974,7 +1002,7 @@ "CONFIG_CRYPTO_CRYPTD" = "y"; "CONFIG_CRYPTO_AUTHENC" = "m"; "CONFIG_CRYPTO_TEST" = "m"; - "CONFIG_CRYPTO_ABLK_HELPER_X86" = "y"; + "CONFIG_CRYPTO_ABLK_HELPER" = "y"; "CONFIG_CRYPTO_GLUE_HELPER_X86" = "y"; "CONFIG_CRYPTO_CCM" = "m"; "CONFIG_CRYPTO_GCM" = "m"; @@ -1055,6 +1083,7 @@ "CONFIG_CRYPTO_USER_API" = "m"; "CONFIG_CRYPTO_USER_API_HASH" = "m"; "CONFIG_CRYPTO_USER_API_SKCIPHER" = "m"; + "CONFIG_CRYPTO_HASH_INFO" = "y"; "CONFIG_ASYMMETRIC_KEY_TYPE" = "m"; "CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE" = "m"; "CONFIG_PUBLIC_KEY_ALGO_RSA" = "m"; @@ -1068,6 +1097,7 @@ "CONFIG_KVM_ASYNC_PF" = "y"; "CONFIG_HAVE_KVM_MSI" = "y"; "CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT" = "y"; + "CONFIG_KVM_VFIO" = "y"; "CONFIG_VIRTUALIZATION" = "y"; "CONFIG_KVM" = "y"; "CONFIG_KVM_INTEL" = "y"; @@ -1081,7 +1111,6 @@ "CONFIG_GENERIC_IOMAP" = "y"; "CONFIG_GENERIC_IO" = "y"; "CONFIG_ARCH_USE_CMPXCHG_LOCKREF" = "y"; - "CONFIG_CMPXCHG_LOCKREF" = "y"; "CONFIG_CRC_CCITT" = "y"; "CONFIG_CRC16" = "y"; "CONFIG_CRC_T10DIF" = "y"; @@ -1092,6 +1121,7 @@ "CONFIG_CRC7" = "y"; "CONFIG_LIBCRC32C" = "y"; "CONFIG_CRC8" = "y"; + "CONFIG_RANDOM32_SELFTEST" = "y"; "CONFIG_ZLIB_INFLATE" = "y"; "CONFIG_ZLIB_DEFLATE" = "y"; "CONFIG_LZO_COMPRESS" = "y"; @@ -1118,6 +1148,7 @@ "CONFIG_TEXTSEARCH_KMP" = "m"; "CONFIG_TEXTSEARCH_BM" = "m"; "CONFIG_TEXTSEARCH_FSM" = "m"; + "CONFIG_ASSOCIATIVE_ARRAY" = "y"; "CONFIG_HAS_IOMEM" = "y"; "CONFIG_HAS_IOPORT" = "y"; "CONFIG_HAS_DMA" = "y"; @@ -1126,6 +1157,7 @@ "CONFIG_DQL" = "y"; "CONFIG_NLATTR" = "y"; "CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE" = "y"; + "CONFIG_AVERAGE" = "y"; "CONFIG_CLZ_TAB" = "y"; "CONFIG_CORDIC" = "y"; "CONFIG_MPILIB" = "m"; -- cgit 1.4.1