From 7dd7f056df53608fa2a28817a7a99b6b756711ab Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 1 Dec 2015 09:40:56 +0100 Subject: mmrnmhrm/dnyarri: Update kernel src/cfg to 4.4rc3. Version 4.3-rc5 is from the stone age and we really want to have the latest and greatest :-) The kernel is actually not -rc3 directly but 5 commits ahead (current upstream master). I've cleaned up the config for mmrnmhrm a bit, though it is still quite messy and I might do it fully from scratch very soon[TM]. Signed-off-by: aszlig --- machines/aszlig/dnyarri-kconf.nix | 10 +++++++--- machines/aszlig/mmrnmhrm-kconf.nix | 32 +++++++++++++------------------- 2 files changed, 20 insertions(+), 22 deletions(-) (limited to 'machines/aszlig') diff --git a/machines/aszlig/dnyarri-kconf.nix b/machines/aszlig/dnyarri-kconf.nix index 9e0e6a20..a34f9871 100644 --- a/machines/aszlig/dnyarri-kconf.nix +++ b/machines/aszlig/dnyarri-kconf.nix @@ -287,8 +287,6 @@ "CONFIG_MICROCODE" = "y"; "CONFIG_MICROCODE_INTEL" = "y"; "CONFIG_MICROCODE_OLD_INTERFACE" = "y"; - "CONFIG_MICROCODE_INTEL_EARLY" = "y"; - "CONFIG_MICROCODE_EARLY" = "y"; "CONFIG_X86_MSR" = "m"; "CONFIG_X86_CPUID" = "m"; "CONFIG_ARCH_PHYS_ADDR_T_64BIT" = "y"; @@ -314,7 +312,6 @@ "CONFIG_HAVE_MEMBLOCK" = "y"; "CONFIG_HAVE_MEMBLOCK_NODE_MAP" = "y"; "CONFIG_ARCH_DISCARD_MEMBLOCK" = "y"; - "CONFIG_PAGEFLAGS_EXTENDED" = "y"; "CONFIG_SPLIT_PTLOCK_CPUS" = "4"; "CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK" = "y"; "CONFIG_COMPACTION" = "y"; @@ -353,6 +350,7 @@ "CONFIG_KEXEC_FILE" = "y"; "CONFIG_PHYSICAL_START" = "0x1000000"; "CONFIG_PHYSICAL_ALIGN" = "0x1000000"; + "CONFIG_LEGACY_VSYSCALL_NONE" = "y"; "CONFIG_MODIFY_LDT_SYSCALL" = "y"; "CONFIG_HAVE_LIVEPATCH" = "y"; "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y"; @@ -857,6 +855,7 @@ "CONFIG_ARCH_MIGHT_HAVE_PC_SERIO" = "y"; "CONFIG_SERIO_I8042" = "y"; "CONFIG_SERIO_LIBPS2" = "y"; + "CONFIG_USERIO" = "m"; "CONFIG_TTY" = "y"; "CONFIG_VT" = "y"; "CONFIG_CONSOLE_TRANSLATIONS" = "y"; @@ -1011,6 +1010,7 @@ "CONFIG_SND_MIXER_OSS" = "y"; "CONFIG_SND_PCM_OSS" = "y"; "CONFIG_SND_PCM_OSS_PLUGINS" = "y"; + "CONFIG_SND_PCM_TIMER" = "y"; "CONFIG_SND_SEQUENCER_OSS" = "y"; "CONFIG_SND_HRTIMER" = "y"; "CONFIG_SND_SEQ_HRTIMER_DEFAULT" = "y"; @@ -1171,6 +1171,7 @@ "CONFIG_RTC_INTF_PROC" = "y"; "CONFIG_RTC_INTF_DEV" = "y"; "CONFIG_RTC_DRV_CMOS" = "y"; + "CONFIG_IRQ_BYPASS_MANAGER" = "m"; "CONFIG_CLKEVT_I8253" = "y"; "CONFIG_I8253_LOCK" = "y"; "CONFIG_CLKBLD_I8253" = "y"; @@ -1301,6 +1302,7 @@ "CONFIG_TRACE_IRQFLAGS_SUPPORT" = "y"; "CONFIG_MESSAGE_LOGLEVEL_DEFAULT" = "4"; "CONFIG_FRAME_WARN" = "2048"; + "CONFIG_SECTION_MISMATCH_WARN_ONLY" = "y"; "CONFIG_ARCH_WANT_FRAME_POINTERS" = "y"; "CONFIG_MAGIC_SYSRQ" = "y"; "CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE" = "0x1"; @@ -1388,6 +1390,7 @@ "CONFIG_CRYPTO_LRW" = "y"; "CONFIG_CRYPTO_PCBC" = "y"; "CONFIG_CRYPTO_XTS" = "y"; + "CONFIG_CRYPTO_KEYWRAP" = "m"; "CONFIG_CRYPTO_CMAC" = "y"; "CONFIG_CRYPTO_HMAC" = "y"; "CONFIG_CRYPTO_XCBC" = "m"; @@ -1492,6 +1495,7 @@ "CONFIG_KVM_VFIO" = "y"; "CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT" = "y"; "CONFIG_KVM_COMPAT" = "y"; + "CONFIG_HAVE_KVM_IRQ_BYPASS" = "y"; "CONFIG_VIRTUALIZATION" = "y"; "CONFIG_KVM" = "m"; "CONFIG_KVM_INTEL" = "m"; diff --git a/machines/aszlig/mmrnmhrm-kconf.nix b/machines/aszlig/mmrnmhrm-kconf.nix index a5dc0410..17c5cc7e 100644 --- a/machines/aszlig/mmrnmhrm-kconf.nix +++ b/machines/aszlig/mmrnmhrm-kconf.nix @@ -105,10 +105,17 @@ "CONFIG_CGROUP_DEVICE" = "y"; "CONFIG_CPUSETS" = "y"; "CONFIG_CGROUP_CPUACCT" = "y"; + "CONFIG_PAGE_COUNTER" = "y"; + "CONFIG_MEMCG" = "y"; + "CONFIG_MEMCG_SWAP" = "y"; + "CONFIG_MEMCG_SWAP_ENABLED" = "y"; + "CONFIG_MEMCG_KMEM" = "y"; + "CONFIG_CGROUP_PERF" = "y"; "CONFIG_CGROUP_SCHED" = "y"; "CONFIG_FAIR_GROUP_SCHED" = "y"; "CONFIG_CFS_BANDWIDTH" = "y"; "CONFIG_BLK_CGROUP" = "y"; + "CONFIG_CGROUP_WRITEBACK" = "y"; "CONFIG_NAMESPACES" = "y"; "CONFIG_UTS_NS" = "y"; "CONFIG_IPC_NS" = "y"; @@ -245,7 +252,6 @@ "CONFIG_ZONE_DMA" = "y"; "CONFIG_SMP" = "y"; "CONFIG_X86_FEATURE_NAMES" = "y"; - "CONFIG_IOSF_MBI" = "m"; "CONFIG_X86_SUPPORTS_MEMORY_FAILURE" = "y"; "CONFIG_SCHED_OMIT_FRAME_POINTER" = "y"; "CONFIG_NO_BOOTMEM" = "y"; @@ -266,7 +272,6 @@ "CONFIG_HPET_TIMER" = "y"; "CONFIG_HPET_EMULATE_RTC" = "y"; "CONFIG_DMI" = "y"; - "CONFIG_GART_IOMMU" = "y"; "CONFIG_SWIOTLB" = "y"; "CONFIG_IOMMU_HELPER" = "y"; "CONFIG_NR_CPUS" = "8"; @@ -286,8 +291,6 @@ "CONFIG_MICROCODE" = "y"; "CONFIG_MICROCODE_INTEL" = "y"; "CONFIG_MICROCODE_OLD_INTERFACE" = "y"; - "CONFIG_MICROCODE_INTEL_EARLY" = "y"; - "CONFIG_MICROCODE_EARLY" = "y"; "CONFIG_X86_MSR" = "m"; "CONFIG_X86_CPUID" = "m"; "CONFIG_ARCH_PHYS_ADDR_T_64BIT" = "y"; @@ -309,7 +312,6 @@ "CONFIG_HAVE_MEMBLOCK_NODE_MAP" = "y"; "CONFIG_ARCH_DISCARD_MEMBLOCK" = "y"; "CONFIG_MEMORY_ISOLATION" = "y"; - "CONFIG_PAGEFLAGS_EXTENDED" = "y"; "CONFIG_SPLIT_PTLOCK_CPUS" = "4"; "CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK" = "y"; "CONFIG_MEMORY_BALLOON" = "y"; @@ -353,6 +355,7 @@ "CONFIG_KEXEC_FILE" = "y"; "CONFIG_PHYSICAL_START" = "0x1000000"; "CONFIG_PHYSICAL_ALIGN" = "0x1000000"; + "CONFIG_LEGACY_VSYSCALL_NONE" = "y"; "CONFIG_MODIFY_LDT_SYSCALL" = "y"; "CONFIG_HAVE_LIVEPATCH" = "y"; "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y"; @@ -708,6 +711,7 @@ "CONFIG_SND_MIXER_OSS" = "y"; "CONFIG_SND_PCM_OSS" = "y"; "CONFIG_SND_PCM_OSS_PLUGINS" = "y"; + "CONFIG_SND_PCM_TIMER" = "y"; "CONFIG_SND_SEQUENCER_OSS" = "y"; "CONFIG_SND_HRTIMER" = "y"; "CONFIG_SND_SEQ_HRTIMER_DEFAULT" = "y"; @@ -733,22 +737,8 @@ "CONFIG_HIDRAW" = "y"; "CONFIG_UHID" = "m"; "CONFIG_HID_GENERIC" = "y"; - "CONFIG_HID_A4TECH" = "y"; - "CONFIG_HID_APPLE" = "y"; - "CONFIG_HID_BELKIN" = "y"; - "CONFIG_HID_CHERRY" = "y"; - "CONFIG_HID_CHICONY" = "y"; - "CONFIG_HID_CYPRESS" = "y"; - "CONFIG_HID_EZKEY" = "y"; - "CONFIG_HID_GEMBIRD" = "m"; - "CONFIG_HID_KENSINGTON" = "y"; - "CONFIG_HID_LOGITECH" = "y"; - "CONFIG_HID_MICROSOFT" = "y"; - "CONFIG_HID_MONTEREY" = "y"; "CONFIG_HID_GREENASIA" = "y"; "CONFIG_GREENASIA_FF" = "y"; - "CONFIG_HID_SENSOR_HUB" = "m"; - "CONFIG_HID_SENSOR_CUSTOM_SENSOR" = "m"; "CONFIG_USB_HID" = "y"; "CONFIG_USB_HIDDEV" = "y"; "CONFIG_I2C_HID" = "m"; @@ -856,6 +846,7 @@ "CONFIG_RTC_INTF_PROC" = "y"; "CONFIG_RTC_INTF_DEV" = "y"; "CONFIG_RTC_DRV_CMOS" = "y"; + "CONFIG_IRQ_BYPASS_MANAGER" = "y"; "CONFIG_VIRT_DRIVERS" = "y"; "CONFIG_VIRTIO" = "m"; "CONFIG_VIRTIO_PCI" = "m"; @@ -1009,6 +1000,7 @@ "CONFIG_TRACE_IRQFLAGS_SUPPORT" = "y"; "CONFIG_MESSAGE_LOGLEVEL_DEFAULT" = "4"; "CONFIG_FRAME_WARN" = "2048"; + "CONFIG_SECTION_MISMATCH_WARN_ONLY" = "y"; "CONFIG_ARCH_WANT_FRAME_POINTERS" = "y"; "CONFIG_MAGIC_SYSRQ" = "y"; "CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE" = "0x1"; @@ -1097,6 +1089,7 @@ "CONFIG_CRYPTO_LRW" = "y"; "CONFIG_CRYPTO_PCBC" = "y"; "CONFIG_CRYPTO_XTS" = "y"; + "CONFIG_CRYPTO_KEYWRAP" = "m"; "CONFIG_CRYPTO_CMAC" = "y"; "CONFIG_CRYPTO_HMAC" = "y"; "CONFIG_CRYPTO_XCBC" = "y"; @@ -1201,6 +1194,7 @@ "CONFIG_KVM_VFIO" = "y"; "CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT" = "y"; "CONFIG_KVM_COMPAT" = "y"; + "CONFIG_HAVE_KVM_IRQ_BYPASS" = "y"; "CONFIG_VIRTUALIZATION" = "y"; "CONFIG_KVM" = "y"; "CONFIG_KVM_INTEL" = "y"; -- cgit 1.4.1