From b0a3893a360a128af6a10c7b881a742325cf11b2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 16 Jul 2016 17:03:05 +0200 Subject: mmrnmhrm/dnyarri: Update kernel sources + configs Nothing very scary here, just getting things up to date. This also reflects on my choices of kernel options, most of them probably are unnecessary but I'm going to rip apart the whole kernel config very soon[TM] anyway. Signed-off-by: aszlig --- machines/aszlig/mmrnmhrm-kconf.nix | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'machines/aszlig/mmrnmhrm-kconf.nix') diff --git a/machines/aszlig/mmrnmhrm-kconf.nix b/machines/aszlig/mmrnmhrm-kconf.nix index e805ba16..46de3b9f 100644 --- a/machines/aszlig/mmrnmhrm-kconf.nix +++ b/machines/aszlig/mmrnmhrm-kconf.nix @@ -3,7 +3,6 @@ "CONFIG_X86_64" = "y"; "CONFIG_X86" = "y"; "CONFIG_INSTRUCTION_DECODER" = "y"; - "CONFIG_PERF_EVENTS_INTEL_UNCORE" = "y"; "CONFIG_OUTPUT_FORMAT" = "elf64-x86-64"; "CONFIG_ARCH_DEFCONFIG" = "arch/x86/configs/x86_64_defconfig"; "CONFIG_LOCKDEP_SUPPORT" = "y"; @@ -99,6 +98,7 @@ "CONFIG_IKCONFIG_PROC" = "y"; "CONFIG_LOG_BUF_SHIFT" = "17"; "CONFIG_LOG_CPU_MAX_BUF_SHIFT" = "14"; + "CONFIG_NMI_LOG_BUF_SHIFT" = "13"; "CONFIG_HAVE_UNSTABLE_SCHED_CLOCK" = "y"; "CONFIG_ARCH_SUPPORTS_NUMA_BALANCING" = "y"; "CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH" = "y"; @@ -135,6 +135,7 @@ "CONFIG_RD_XZ" = "y"; "CONFIG_RD_LZO" = "y"; "CONFIG_RD_LZ4" = "y"; + "CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE" = "y"; "CONFIG_SYSCTL" = "y"; "CONFIG_ANON_INODES" = "y"; "CONFIG_HAVE_UID16" = "y"; @@ -149,6 +150,7 @@ "CONFIG_KALLSYMS_ABSOLUTE_PERCPU" = "y"; "CONFIG_KALLSYMS_BASE_RELATIVE" = "y"; "CONFIG_PRINTK" = "y"; + "CONFIG_PRINTK_NMI" = "y"; "CONFIG_BUG" = "y"; "CONFIG_ELF_CORE" = "y"; "CONFIG_PCSPKR_PLATFORM" = "y"; @@ -179,6 +181,7 @@ "CONFIG_HAVE_KRETPROBES" = "y"; "CONFIG_HAVE_OPTPROBES" = "y"; "CONFIG_HAVE_KPROBES_ON_FTRACE" = "y"; + "CONFIG_HAVE_NMI" = "y"; "CONFIG_HAVE_ARCH_TRACEHOOK" = "y"; "CONFIG_HAVE_DMA_CONTIGUOUS" = "y"; "CONFIG_GENERIC_SMP_IDLE_THREAD" = "y"; @@ -213,6 +216,7 @@ "CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK" = "y"; "CONFIG_ARCH_HAS_ELF_RANDOMIZE" = "y"; "CONFIG_HAVE_ARCH_MMAP_RND_BITS" = "y"; + "CONFIG_HAVE_EXIT_THREAD" = "y"; "CONFIG_ARCH_MMAP_RND_BITS" = "28"; "CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS" = "y"; "CONFIG_ARCH_MMAP_RND_COMPAT_BITS" = "8"; @@ -229,6 +233,7 @@ "CONFIG_MODULE_UNLOAD" = "y"; "CONFIG_MODULE_FORCE_UNLOAD" = "y"; "CONFIG_MODVERSIONS" = "y"; + "CONFIG_TRIM_UNUSED_KSYMS" = "y"; "CONFIG_MODULES_TREE_LOOKUP" = "y"; "CONFIG_BLOCK" = "y"; "CONFIG_BLK_DEV_BSG" = "y"; @@ -294,6 +299,9 @@ "CONFIG_X86_MCE_INTEL" = "y"; "CONFIG_X86_MCE_THRESHOLD" = "y"; "CONFIG_X86_THERMAL_VECTOR" = "y"; + "CONFIG_PERF_EVENTS_INTEL_UNCORE" = "y"; + "CONFIG_PERF_EVENTS_INTEL_RAPL" = "m"; + "CONFIG_PERF_EVENTS_INTEL_CSTATE" = "m"; "CONFIG_X86_16BIT" = "y"; "CONFIG_X86_ESPFIX64" = "y"; "CONFIG_X86_VSYSCALL_EMULATION" = "y"; @@ -328,7 +336,6 @@ "CONFIG_COMPACTION" = "y"; "CONFIG_MIGRATION" = "y"; "CONFIG_PHYS_ADDR_T_64BIT" = "y"; - "CONFIG_ZONE_DMA_FLAG" = "1"; "CONFIG_BOUNCE" = "y"; "CONFIG_VIRT_TO_BUS" = "y"; "CONFIG_MMU_NOTIFIER" = "y"; @@ -343,6 +350,7 @@ "CONFIG_ZSWAP" = "y"; "CONFIG_ZPOOL" = "y"; "CONFIG_ZBUD" = "y"; + "CONFIG_Z3FOLD" = "y"; "CONFIG_ZSMALLOC" = "y"; "CONFIG_GENERIC_EARLY_IOREMAP" = "y"; "CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT" = "y"; @@ -385,7 +393,7 @@ "CONFIG_ACPI_PROCESSOR" = "y"; "CONFIG_ACPI_THERMAL" = "y"; "CONFIG_ACPI_CUSTOM_DSDT_FILE" = ""; - "CONFIG_ACPI_INITRD_TABLE_OVERRIDE" = "y"; + "CONFIG_ACPI_TABLE_UPGRADE" = "y"; "CONFIG_X86_PM_TIMER" = "y"; "CONFIG_ACPI_HOTPLUG_IOAPIC" = "y"; "CONFIG_ACPI_HED" = "y"; @@ -415,6 +423,7 @@ "CONFIG_AMD_NB" = "y"; "CONFIG_BINFMT_ELF" = "y"; "CONFIG_COMPAT_BINFMT_ELF" = "y"; + "CONFIG_ELFCORE" = "y"; "CONFIG_BINFMT_SCRIPT" = "y"; "CONFIG_BINFMT_MISC" = "y"; "CONFIG_COREDUMP" = "y"; @@ -454,11 +463,12 @@ "CONFIG_IPV6_SIT" = "m"; "CONFIG_IPV6_NDISC_NODETYPE" = "y"; "CONFIG_IPV6_TUNNEL" = "m"; - "CONFIG_IPV6_GRE" = "m"; + "CONFIG_IPV6_FOU" = "m"; "CONFIG_NET_PTP_CLASSIFY" = "y"; "CONFIG_IP_SCTP" = "m"; "CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5" = "y"; "CONFIG_SCTP_COOKIE_HMAC_MD5" = "y"; + "CONFIG_INET_SCTP_DIAG" = "m"; "CONFIG_HAVE_NET_DSA" = "y"; "CONFIG_NET_SCHED" = "y"; "CONFIG_NET_SCH_CBQ" = "m"; @@ -534,7 +544,7 @@ "CONFIG_LWTUNNEL" = "y"; "CONFIG_DST_CACHE" = "y"; "CONFIG_MAY_USE_DEVLINK" = "y"; - "CONFIG_HAVE_BPF_JIT" = "y"; + "CONFIG_HAVE_EBPF_JIT" = "y"; "CONFIG_DEVTMPFS" = "y"; "CONFIG_DEVTMPFS_MOUNT" = "y"; "CONFIG_FW_LOADER" = "y"; @@ -627,7 +637,6 @@ "CONFIG_HW_CONSOLE" = "y"; "CONFIG_VT_HW_CONSOLE_BINDING" = "y"; "CONFIG_UNIX98_PTYS" = "y"; - "CONFIG_DEVPTS_MULTIPLE_INSTANCES" = "y"; "CONFIG_DEVMEM" = "y"; "CONFIG_DEVKMEM" = "y"; "CONFIG_HVC_DRIVER" = "y"; @@ -707,6 +716,7 @@ "CONFIG_FB_SYS_COPYAREA" = "y"; "CONFIG_FB_SYS_IMAGEBLIT" = "y"; "CONFIG_FB_SYS_FOPS" = "y"; + "CONFIG_FB_DEFERRED_IO" = "y"; "CONFIG_FB_BACKLIGHT" = "y"; "CONFIG_FB_MODE_HELPERS" = "y"; "CONFIG_FB_TILEBLITTING" = "y"; @@ -857,6 +867,7 @@ "CONFIG_USB_SERIAL_SSU100" = "m"; "CONFIG_USB_SERIAL_QT2" = "m"; "CONFIG_USB_EZUSB_FX2" = "m"; + "CONFIG_UCSI" = "m"; "CONFIG_NEW_LEDS" = "y"; "CONFIG_LEDS_CLASS" = "y"; "CONFIG_LEDS_CLASS_FLASH" = "m"; @@ -876,6 +887,7 @@ "CONFIG_RTC_INTF_DEV" = "y"; "CONFIG_RTC_I2C_AND_SPI" = "y"; "CONFIG_RTC_DRV_CMOS" = "y"; + "CONFIG_SYNC_FILE" = "y"; "CONFIG_IRQ_BYPASS_MANAGER" = "y"; "CONFIG_VIRT_DRIVERS" = "y"; "CONFIG_VIRTIO" = "m"; @@ -1081,6 +1093,7 @@ "CONFIG_DEFAULT_IO_DELAY_TYPE" = "0"; "CONFIG_KEYS" = "y"; "CONFIG_ENCRYPTED_KEYS" = "y"; + "CONFIG_KEY_DH_OPERATIONS" = "y"; "CONFIG_SECURITYFS" = "y"; "CONFIG_DEFAULT_SECURITY_DAC" = "y"; "CONFIG_DEFAULT_SECURITY" = ""; @@ -1209,13 +1222,13 @@ "CONFIG_CRYPTO_USER_API_RNG" = "m"; "CONFIG_CRYPTO_USER_API_AEAD" = "m"; "CONFIG_CRYPTO_HASH_INFO" = "y"; - "CONFIG_ASYMMETRIC_KEY_TYPE" = "m"; + "CONFIG_ASYMMETRIC_KEY_TYPE" = "y"; "CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE" = "m"; "CONFIG_X509_CERTIFICATE_PARSER" = "m"; "CONFIG_PKCS7_MESSAGE_PARSER" = "m"; - "CONFIG_PKCS7_TEST_KEY" = "m"; "CONFIG_SYSTEM_TRUSTED_KEYRING" = "y"; "CONFIG_SYSTEM_TRUSTED_KEYS" = ""; + "CONFIG_SECONDARY_TRUSTED_KEYRING" = "y"; "CONFIG_HAVE_KVM" = "y"; "CONFIG_HAVE_KVM_IRQCHIP" = "y"; "CONFIG_HAVE_KVM_IRQFD" = "y"; @@ -1284,6 +1297,7 @@ "CONFIG_TEXTSEARCH_KMP" = "m"; "CONFIG_TEXTSEARCH_BM" = "m"; "CONFIG_TEXTSEARCH_FSM" = "m"; + "CONFIG_RADIX_TREE_MULTIORDER" = "y"; "CONFIG_ASSOCIATIVE_ARRAY" = "y"; "CONFIG_HAS_IOMEM" = "y"; "CONFIG_HAS_IOPORT_MAP" = "y"; @@ -1297,11 +1311,12 @@ "CONFIG_CLZ_TAB" = "y"; "CONFIG_CORDIC" = "y"; "CONFIG_IRQ_POLL" = "y"; - "CONFIG_MPILIB" = "m"; + "CONFIG_MPILIB" = "y"; "CONFIG_OID_REGISTRY" = "y"; "CONFIG_FONT_SUPPORT" = "y"; "CONFIG_FONT_8x8" = "y"; "CONFIG_FONT_8x16" = "y"; + "CONFIG_SG_POOL" = "y"; "CONFIG_ARCH_HAS_SG_CHAIN" = "y"; "CONFIG_ARCH_HAS_PMEM_API" = "y"; "CONFIG_ARCH_HAS_MMIO_FLUSH" = "y"; -- cgit 1.4.1