From 0bce188ec184cb1b731d8adf2ee1faa777583056 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 29 Aug 2016 20:07:15 +0200 Subject: linux/kernel: Remove KVM_APIC_ARCHITECTURE for 4.8 The option is no longer needed and has been removed upstream in torvalds/linux@557abc40d121358883d2da8bc8bf976d6e8ec332. Signed-off-by: aszlig --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 95b1319e9819..9fa81ea66aaa 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -433,7 +433,9 @@ with stdenv.lib; PARAVIRT? y HYPERVISOR_GUEST y PARAVIRT_SPINLOCKS? y - KVM_APIC_ARCHITECTURE y + ${optionalString (versionOlder version "4.8") '' + KVM_APIC_ARCHITECTURE y + ''} KVM_ASYNC_PF y ${optionalString (versionAtLeast version "4.0") '' KVM_COMPAT? y -- cgit 1.4.1