summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-08-29 20:07:15 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-08-29 20:52:19 +0200
commit0bce188ec184cb1b731d8adf2ee1faa777583056 (patch)
tree42f174294713739430e2a0d3a6bebc7462f83da7 /pkgs/os-specific
parentf85053a0216b12d87cb66b246440411a296b42d6 (diff)
downloadnixlib-0bce188ec184cb1b731d8adf2ee1faa777583056.tar
nixlib-0bce188ec184cb1b731d8adf2ee1faa777583056.tar.gz
nixlib-0bce188ec184cb1b731d8adf2ee1faa777583056.tar.bz2
nixlib-0bce188ec184cb1b731d8adf2ee1faa777583056.tar.lz
nixlib-0bce188ec184cb1b731d8adf2ee1faa777583056.tar.xz
nixlib-0bce188ec184cb1b731d8adf2ee1faa777583056.tar.zst
nixlib-0bce188ec184cb1b731d8adf2ee1faa777583056.zip
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix4
1 files changed, 3 insertions, 1 deletions
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