From 6a9e18e89dd5b327f993aeea7a620fed12ff29cc Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Oct 2015 12:32:25 +0200 Subject: mmrnmhrm/dnyarri: Update kernel src/cfg to 4.3rc4. It's actually v4.3-rc4 plus 34 commits ahead. Also I'm being a bit lazy if it comes to the configuration here, adding modules I probably won't need. That's because I currently don't have the time to read more into the details. Anyway, in the future I'd like to unify kernel configuration anyway, so the laziness hopefully won't stay around for very long. :-) Signed-off-by: aszlig --- machines/aszlig/dnyarri-kconf.nix | 41 +++++++++++++++++++++++++++-------- machines/aszlig/mmrnmhrm-kconf.nix | 32 +++++++++++++++++++++------ modules/user/aszlig/system/kernel.nix | 6 ++--- 3 files changed, 60 insertions(+), 19 deletions(-) diff --git a/machines/aszlig/dnyarri-kconf.nix b/machines/aszlig/dnyarri-kconf.nix index 7705aeee..8e5f4928 100644 --- a/machines/aszlig/dnyarri-kconf.nix +++ b/machines/aszlig/dnyarri-kconf.nix @@ -98,9 +98,11 @@ "CONFIG_LOG_CPU_MAX_BUF_SHIFT" = "14"; "CONFIG_HAVE_UNSTABLE_SCHED_CLOCK" = "y"; "CONFIG_ARCH_SUPPORTS_NUMA_BALANCING" = "y"; + "CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH" = "y"; "CONFIG_ARCH_SUPPORTS_INT128" = "y"; "CONFIG_CGROUPS" = "y"; "CONFIG_CGROUP_FREEZER" = "y"; + "CONFIG_CGROUP_PIDS" = "y"; "CONFIG_CGROUP_DEVICE" = "y"; "CONFIG_CPUSETS" = "y"; "CONFIG_CGROUP_CPUACCT" = "y"; @@ -149,12 +151,13 @@ "CONFIG_AIO" = "y"; "CONFIG_ADVISE_SYSCALLS" = "y"; "CONFIG_PCI_QUIRKS" = "y"; + "CONFIG_MEMBARRIER" = "y"; "CONFIG_HAVE_PERF_EVENTS" = "y"; "CONFIG_PERF_EVENTS" = "y"; "CONFIG_VM_EVENT_COUNTERS" = "y"; "CONFIG_SLUB_DEBUG" = "y"; "CONFIG_SLUB" = "y"; - "CONFIG_SYSTEM_TRUSTED_KEYRING" = "y"; + "CONFIG_KEXEC_CORE" = "y"; "CONFIG_HAVE_OPROFILE" = "y"; "CONFIG_OPROFILE_NMI_TIMER" = "y"; "CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS" = "y"; @@ -320,7 +323,6 @@ "CONFIG_PHYS_ADDR_T_64BIT" = "y"; "CONFIG_ZONE_DMA_FLAG" = "1"; "CONFIG_BOUNCE" = "y"; - "CONFIG_NEED_BOUNCE_POOL" = "y"; "CONFIG_VIRT_TO_BUS" = "y"; "CONFIG_MMU_NOTIFIER" = "y"; "CONFIG_KSM" = "y"; @@ -334,6 +336,7 @@ "CONFIG_ZSMALLOC" = "y"; "CONFIG_GENERIC_EARLY_IOREMAP" = "y"; "CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT" = "y"; + "CONFIG_FRAME_VECTOR" = "y"; "CONFIG_X86_RESERVE_LOW" = "64"; "CONFIG_MTRR" = "y"; "CONFIG_MTRR_SANITIZER" = "y"; @@ -351,6 +354,7 @@ "CONFIG_KEXEC_FILE" = "y"; "CONFIG_PHYSICAL_START" = "0x1000000"; "CONFIG_PHYSICAL_ALIGN" = "0x1000000"; + "CONFIG_MODIFY_LDT_SYSCALL" = "y"; "CONFIG_HAVE_LIVEPATCH" = "y"; "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y"; "CONFIG_USE_PERCPU_NUMA_NODE_ID" = "y"; @@ -364,6 +368,8 @@ "CONFIG_ACPI_VIDEO" = "y"; "CONFIG_ACPI_FAN" = "y"; "CONFIG_ACPI_DOCK" = "y"; + "CONFIG_ACPI_CPU_FREQ_PSS" = "y"; + "CONFIG_ACPI_PROCESSOR_IDLE" = "y"; "CONFIG_ACPI_PROCESSOR" = "y"; "CONFIG_ACPI_THERMAL" = "y"; "CONFIG_ACPI_NUMA" = "y"; @@ -423,7 +429,6 @@ "CONFIG_SYN_COOKIES" = "y"; "CONFIG_NET_UDP_TUNNEL" = "m"; "CONFIG_NET_FOU" = "m"; - "CONFIG_GENEVE_CORE" = "m"; "CONFIG_INET_TUNNEL" = "m"; "CONFIG_INET_LRO" = "y"; "CONFIG_INET_DIAG" = "y"; @@ -433,6 +438,7 @@ "CONFIG_DEFAULT_TCP_CONG" = "cubic"; "CONFIG_IPV6" = "y"; "CONFIG_IPV6_ROUTER_PREF" = "y"; + "CONFIG_IPV6_ILA" = "m"; "CONFIG_INET6_TUNNEL" = "m"; "CONFIG_IPV6_SIT" = "m"; "CONFIG_IPV6_NDISC_NODETYPE" = "y"; @@ -593,7 +599,9 @@ "CONFIG_NF_TABLES_IPV4" = "m"; "CONFIG_NFT_CHAIN_ROUTE_IPV4" = "m"; "CONFIG_NFT_REJECT_IPV4" = "m"; + "CONFIG_NFT_DUP_IPV4" = "m"; "CONFIG_NF_TABLES_ARP" = "m"; + "CONFIG_NF_DUP_IPV4" = "m"; "CONFIG_NF_LOG_ARP" = "m"; "CONFIG_NF_LOG_IPV4" = "m"; "CONFIG_NF_REJECT_IPV4" = "y"; @@ -631,6 +639,8 @@ "CONFIG_NF_TABLES_IPV6" = "m"; "CONFIG_NFT_CHAIN_ROUTE_IPV6" = "m"; "CONFIG_NFT_REJECT_IPV6" = "m"; + "CONFIG_NFT_DUP_IPV6" = "m"; + "CONFIG_NF_DUP_IPV6" = "m"; "CONFIG_NF_REJECT_IPV6" = "y"; "CONFIG_NF_LOG_IPV6" = "m"; "CONFIG_NF_NAT_IPV6" = "m"; @@ -740,6 +750,7 @@ "CONFIG_MPLS" = "y"; "CONFIG_NET_MPLS_GSO" = "m"; "CONFIG_MPLS_ROUTING" = "m"; + "CONFIG_MPLS_IPTUNNEL" = "m"; "CONFIG_HSR" = "m"; "CONFIG_RPS" = "y"; "CONFIG_RFS_ACCEL" = "y"; @@ -751,6 +762,7 @@ "CONFIG_NET_FLOW_LIMIT" = "y"; "CONFIG_NET_PKTGEN" = "m"; "CONFIG_CEPH_LIB" = "m"; + "CONFIG_LWTUNNEL" = "y"; "CONFIG_HAVE_BPF_JIT" = "y"; "CONFIG_DEVTMPFS" = "y"; "CONFIG_DEVTMPFS_MOUNT" = "y"; @@ -887,6 +899,7 @@ "CONFIG_THERMAL_GOV_POWER_ALLOCATOR" = "y"; "CONFIG_INTEL_POWERCLAMP" = "m"; "CONFIG_X86_PKG_TEMP_THERMAL" = "m"; + "CONFIG_INTEL_PCH_THERMAL" = "m"; "CONFIG_SSB_POSSIBLE" = "y"; "CONFIG_BCMA_POSSIBLE" = "y"; "CONFIG_MEDIA_SUPPORT" = "y"; @@ -961,14 +974,16 @@ "CONFIG_DRM_RADEON" = "y"; "CONFIG_DRM_RADEON_USERPTR" = "y"; "CONFIG_DRM_BOCHS" = "m"; + "CONFIG_DRM_BRIDGE" = "y"; "CONFIG_FB" = "y"; "CONFIG_FB_CMDLINE" = "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_SYS_FILLRECT" = "y"; + "CONFIG_FB_SYS_COPYAREA" = "y"; + "CONFIG_FB_SYS_IMAGEBLIT" = "y"; + "CONFIG_FB_SYS_FOPS" = "y"; "CONFIG_FB_MODE_HELPERS" = "y"; "CONFIG_FB_TILEBLITTING" = "y"; "CONFIG_BACKLIGHT_LCD_SUPPORT" = "y"; @@ -1033,6 +1048,7 @@ "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"; @@ -1169,11 +1185,13 @@ "CONFIG_DCACHE_WORD_ACCESS" = "y"; "CONFIG_EXT2_FS" = "y"; "CONFIG_EXT3_FS" = "m"; + "CONFIG_EXT3_FS_POSIX_ACL" = "y"; + "CONFIG_EXT3_FS_SECURITY" = "y"; "CONFIG_EXT4_FS" = "m"; "CONFIG_EXT4_FS_POSIX_ACL" = "y"; + "CONFIG_EXT4_FS_SECURITY" = "y"; "CONFIG_EXT4_ENCRYPTION" = "m"; "CONFIG_EXT4_FS_ENCRYPTION" = "y"; - "CONFIG_JBD" = "m"; "CONFIG_JBD2" = "m"; "CONFIG_FS_MBCACHE" = "m"; "CONFIG_XFS_FS" = "y"; @@ -1350,6 +1368,7 @@ "CONFIG_CRYPTO_USER" = "m"; "CONFIG_CRYPTO_GF128MUL" = "y"; "CONFIG_CRYPTO_NULL" = "y"; + "CONFIG_CRYPTO_NULL2" = "y"; "CONFIG_CRYPTO_PCRYPT" = "y"; "CONFIG_CRYPTO_WORKQUEUE" = "y"; "CONFIG_CRYPTO_CRYPTD" = "y"; @@ -1382,6 +1401,7 @@ "CONFIG_CRYPTO_CRCT10DIF_PCLMUL" = "m"; "CONFIG_CRYPTO_GHASH" = "y"; "CONFIG_CRYPTO_POLY1305" = "m"; + "CONFIG_CRYPTO_POLY1305_X86_64" = "m"; "CONFIG_CRYPTO_MD4" = "y"; "CONFIG_CRYPTO_MD5" = "y"; "CONFIG_CRYPTO_MICHAEL_MIC" = "y"; @@ -1423,6 +1443,7 @@ "CONFIG_CRYPTO_SALSA20" = "m"; "CONFIG_CRYPTO_SALSA20_X86_64" = "m"; "CONFIG_CRYPTO_CHACHA20" = "m"; + "CONFIG_CRYPTO_CHACHA20_X86_64" = "m"; "CONFIG_CRYPTO_SEED" = "m"; "CONFIG_CRYPTO_SERPENT" = "y"; "CONFIG_CRYPTO_SERPENT_SSE2_X86_64" = "y"; @@ -1457,6 +1478,8 @@ "CONFIG_X509_CERTIFICATE_PARSER" = "y"; "CONFIG_PKCS7_MESSAGE_PARSER" = "m"; "CONFIG_PKCS7_TEST_KEY" = "m"; + "CONFIG_SYSTEM_TRUSTED_KEYRING" = "y"; + "CONFIG_SYSTEM_TRUSTED_KEYS" = ""; "CONFIG_HAVE_KVM" = "y"; "CONFIG_HAVE_KVM_IRQCHIP" = "y"; "CONFIG_HAVE_KVM_IRQFD" = "y"; @@ -1481,7 +1504,6 @@ "CONFIG_GENERIC_PCI_IOMAP" = "y"; "CONFIG_GENERIC_IOMAP" = "y"; "CONFIG_GENERIC_IO" = "y"; - "CONFIG_PERCPU_RWSEM" = "y"; "CONFIG_ARCH_USE_CMPXCHG_LOCKREF" = "y"; "CONFIG_ARCH_HAS_FAST_MULTIPLIER" = "y"; "CONFIG_CRC_CCITT" = "y"; @@ -1519,6 +1541,7 @@ "CONFIG_DECOMPRESS_XZ" = "y"; "CONFIG_DECOMPRESS_LZO" = "y"; "CONFIG_DECOMPRESS_LZ4" = "y"; + "CONFIG_GENERIC_ALLOCATOR" = "y"; "CONFIG_REED_SOLOMON" = "y"; "CONFIG_REED_SOLOMON_ENC8" = "y"; "CONFIG_REED_SOLOMON_DEC8" = "y"; @@ -1538,7 +1561,6 @@ "CONFIG_GLOB" = "y"; "CONFIG_NLATTR" = "y"; "CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE" = "y"; - "CONFIG_AVERAGE" = "y"; "CONFIG_CLZ_TAB" = "y"; "CONFIG_CORDIC" = "y"; "CONFIG_MPILIB" = "y"; @@ -1548,4 +1570,5 @@ "CONFIG_FONT_8x16" = "y"; "CONFIG_ARCH_HAS_SG_CHAIN" = "y"; "CONFIG_ARCH_HAS_PMEM_API" = "y"; + "CONFIG_ARCH_HAS_MMIO_FLUSH" = "y"; } diff --git a/machines/aszlig/mmrnmhrm-kconf.nix b/machines/aszlig/mmrnmhrm-kconf.nix index 92b990d9..07a5835e 100644 --- a/machines/aszlig/mmrnmhrm-kconf.nix +++ b/machines/aszlig/mmrnmhrm-kconf.nix @@ -97,9 +97,11 @@ "CONFIG_LOG_CPU_MAX_BUF_SHIFT" = "14"; "CONFIG_HAVE_UNSTABLE_SCHED_CLOCK" = "y"; "CONFIG_ARCH_SUPPORTS_NUMA_BALANCING" = "y"; + "CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH" = "y"; "CONFIG_ARCH_SUPPORTS_INT128" = "y"; "CONFIG_CGROUPS" = "y"; "CONFIG_CGROUP_FREEZER" = "y"; + "CONFIG_CGROUP_PIDS" = "y"; "CONFIG_CGROUP_DEVICE" = "y"; "CONFIG_CPUSETS" = "y"; "CONFIG_CGROUP_CPUACCT" = "y"; @@ -148,12 +150,13 @@ "CONFIG_AIO" = "y"; "CONFIG_ADVISE_SYSCALLS" = "y"; "CONFIG_PCI_QUIRKS" = "y"; + "CONFIG_MEMBARRIER" = "y"; "CONFIG_HAVE_PERF_EVENTS" = "y"; "CONFIG_PERF_EVENTS" = "y"; "CONFIG_VM_EVENT_COUNTERS" = "y"; "CONFIG_SLUB_DEBUG" = "y"; "CONFIG_SLUB" = "y"; - "CONFIG_SYSTEM_TRUSTED_KEYRING" = "y"; + "CONFIG_KEXEC_CORE" = "y"; "CONFIG_HAVE_OPROFILE" = "y"; "CONFIG_OPROFILE_NMI_TIMER" = "y"; "CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS" = "y"; @@ -333,6 +336,7 @@ "CONFIG_ZSMALLOC" = "y"; "CONFIG_GENERIC_EARLY_IOREMAP" = "y"; "CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT" = "y"; + "CONFIG_FRAME_VECTOR" = "y"; "CONFIG_X86_RESERVE_LOW" = "64"; "CONFIG_MTRR" = "y"; "CONFIG_MTRR_SANITIZER" = "y"; @@ -350,6 +354,7 @@ "CONFIG_KEXEC_FILE" = "y"; "CONFIG_PHYSICAL_START" = "0x1000000"; "CONFIG_PHYSICAL_ALIGN" = "0x1000000"; + "CONFIG_MODIFY_LDT_SYSCALL" = "y"; "CONFIG_HAVE_LIVEPATCH" = "y"; "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y"; "CONFIG_PM" = "y"; @@ -361,6 +366,8 @@ "CONFIG_ACPI_VIDEO" = "y"; "CONFIG_ACPI_FAN" = "y"; "CONFIG_ACPI_DOCK" = "y"; + "CONFIG_ACPI_CPU_FREQ_PSS" = "y"; + "CONFIG_ACPI_PROCESSOR_IDLE" = "y"; "CONFIG_ACPI_PROCESSOR" = "y"; "CONFIG_ACPI_THERMAL" = "y"; "CONFIG_ACPI_CUSTOM_DSDT_FILE" = ""; @@ -420,7 +427,6 @@ "CONFIG_NET_IP_TUNNEL" = "m"; "CONFIG_NET_UDP_TUNNEL" = "m"; "CONFIG_NET_FOU" = "m"; - "CONFIG_GENEVE_CORE" = "m"; "CONFIG_INET_TUNNEL" = "m"; "CONFIG_INET_LRO" = "y"; "CONFIG_INET_DIAG" = "y"; @@ -430,6 +436,7 @@ "CONFIG_DEFAULT_TCP_CONG" = "cubic"; "CONFIG_IPV6" = "y"; "CONFIG_IPV6_ROUTER_PREF" = "y"; + "CONFIG_IPV6_ILA" = "m"; "CONFIG_INET6_TUNNEL" = "m"; "CONFIG_IPV6_SIT" = "m"; "CONFIG_IPV6_NDISC_NODETYPE" = "y"; @@ -508,6 +515,7 @@ "CONFIG_BQL" = "y"; "CONFIG_BPF_JIT" = "y"; "CONFIG_NET_FLOW_LIMIT" = "y"; + "CONFIG_LWTUNNEL" = "y"; "CONFIG_HAVE_BPF_JIT" = "y"; "CONFIG_DEVTMPFS" = "y"; "CONFIG_DEVTMPFS_MOUNT" = "y"; @@ -632,6 +640,7 @@ "CONFIG_THERMAL_GOV_POWER_ALLOCATOR" = "y"; "CONFIG_INTEL_POWERCLAMP" = "m"; "CONFIG_X86_PKG_TEMP_THERMAL" = "m"; + "CONFIG_INTEL_PCH_THERMAL" = "m"; "CONFIG_SSB_POSSIBLE" = "y"; "CONFIG_BCMA_POSSIBLE" = "y"; "CONFIG_MFD_CORE" = "y"; @@ -661,14 +670,16 @@ "CONFIG_DRM_NOUVEAU_BACKLIGHT" = "y"; "CONFIG_DRM_BOCHS" = "m"; "CONFIG_DRM_VIRTIO_GPU" = "m"; + "CONFIG_DRM_BRIDGE" = "y"; "CONFIG_FB" = "y"; "CONFIG_FB_CMDLINE" = "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_SYS_FILLRECT" = "y"; + "CONFIG_FB_SYS_COPYAREA" = "y"; + "CONFIG_FB_SYS_IMAGEBLIT" = "y"; + "CONFIG_FB_SYS_FOPS" = "y"; "CONFIG_FB_BACKLIGHT" = "y"; "CONFIG_FB_MODE_HELPERS" = "y"; "CONFIG_FB_TILEBLITTING" = "y"; @@ -730,6 +741,7 @@ "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"; @@ -854,6 +866,7 @@ "CONFIG_X86_PLATFORM_DEVICES" = "y"; "CONFIG_ACPI_WMI" = "y"; "CONFIG_MXM_WMI" = "y"; + "CONFIG_SURFACE_PRO3_BUTTON" = "m"; "CONFIG_CLKEVT_I8253" = "y"; "CONFIG_I8253_LOCK" = "y"; "CONFIG_CLKBLD_I8253" = "y"; @@ -1064,6 +1077,7 @@ "CONFIG_CRYPTO_USER" = "m"; "CONFIG_CRYPTO_GF128MUL" = "y"; "CONFIG_CRYPTO_NULL" = "y"; + "CONFIG_CRYPTO_NULL2" = "y"; "CONFIG_CRYPTO_PCRYPT" = "y"; "CONFIG_CRYPTO_WORKQUEUE" = "y"; "CONFIG_CRYPTO_CRYPTD" = "y"; @@ -1096,6 +1110,7 @@ "CONFIG_CRYPTO_CRCT10DIF_PCLMUL" = "m"; "CONFIG_CRYPTO_GHASH" = "y"; "CONFIG_CRYPTO_POLY1305" = "m"; + "CONFIG_CRYPTO_POLY1305_X86_64" = "m"; "CONFIG_CRYPTO_MD4" = "y"; "CONFIG_CRYPTO_MD5" = "y"; "CONFIG_CRYPTO_MICHAEL_MIC" = "y"; @@ -1137,6 +1152,7 @@ "CONFIG_CRYPTO_SALSA20" = "m"; "CONFIG_CRYPTO_SALSA20_X86_64" = "m"; "CONFIG_CRYPTO_CHACHA20" = "m"; + "CONFIG_CRYPTO_CHACHA20_X86_64" = "m"; "CONFIG_CRYPTO_SEED" = "m"; "CONFIG_CRYPTO_SERPENT" = "y"; "CONFIG_CRYPTO_SERPENT_SSE2_X86_64" = "y"; @@ -1171,6 +1187,8 @@ "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_HAVE_KVM" = "y"; "CONFIG_HAVE_KVM_IRQCHIP" = "y"; "CONFIG_HAVE_KVM_IRQFD" = "y"; @@ -1196,7 +1214,6 @@ "CONFIG_GENERIC_PCI_IOMAP" = "y"; "CONFIG_GENERIC_IOMAP" = "y"; "CONFIG_GENERIC_IO" = "y"; - "CONFIG_PERCPU_RWSEM" = "y"; "CONFIG_ARCH_USE_CMPXCHG_LOCKREF" = "y"; "CONFIG_ARCH_HAS_FAST_MULTIPLIER" = "y"; "CONFIG_CRC_CCITT" = "y"; @@ -1234,6 +1251,7 @@ "CONFIG_DECOMPRESS_XZ" = "y"; "CONFIG_DECOMPRESS_LZO" = "y"; "CONFIG_DECOMPRESS_LZ4" = "y"; + "CONFIG_GENERIC_ALLOCATOR" = "y"; "CONFIG_TEXTSEARCH" = "y"; "CONFIG_TEXTSEARCH_KMP" = "m"; "CONFIG_TEXTSEARCH_BM" = "m"; @@ -1248,7 +1266,6 @@ "CONFIG_GLOB" = "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"; @@ -1258,4 +1275,5 @@ "CONFIG_FONT_8x16" = "y"; "CONFIG_ARCH_HAS_SG_CHAIN" = "y"; "CONFIG_ARCH_HAS_PMEM_API" = "y"; + "CONFIG_ARCH_HAS_MMIO_FLUSH" = "y"; } diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix index d985db0a..9b42bef1 100644 --- a/modules/user/aszlig/system/kernel.nix +++ b/modules/user/aszlig/system/kernel.nix @@ -18,11 +18,11 @@ let in pkgs.writeText "generated.kconf" (mkConf exprs + "\n"); mainlineKernel = { - version = "4.2.0-rc5"; + version = "4.3.0-rc4"; src = pkgs.fetchgit { url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; - rev = "dd2384a75d1c046faf068a6352732a204814b86d"; - sha256 = "0jbr1pnkwqyvaxgr209fi9n01zfl5d5p3hj4vqq35bfzzjjb3kdn"; + rev = "79c7c7acd25689b1d7669bdb33fb3cb7c64541fe"; + sha256 = "1ph378scgx3vbbgjblv6lg5p169y5grqc0gb2j1pmvj9pajqw1r1"; }; }; -- cgit 1.4.1