From 5a6d202a43d0c81e11a5bad6b70b4eee27319710 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 16 May 2018 05:56:12 +0000
Subject: [PATCH] Merge pull request #40419 from oxij/pkgs/fix-linux-debug

linuxPackages.kernel: config: fix DEBUG_INFO setting
---
 pkgs/os-specific/linux/kernel/common-config.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ec2b2f38795..cee2197f3c7 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -37,7 +37,12 @@ with stdenv.lib;
   DEBUG_STACKOVERFLOW n
   SCHEDSTATS n
   DETECT_HUNG_TASK y
-  DEBUG_INFO n # Not until we implement a separate debug output
+
+  ${if (features.debug or false) then ''
+    DEBUG_INFO y
+  '' else ''
+    DEBUG_INFO n
+  ''}
 
   ${optionalString (versionOlder version "4.4") ''
     CPU_NOTIFIER_ERROR_INJECT? n
@@ -709,9 +714,5 @@ with stdenv.lib;
     DEBUG_MEMORY_INIT? y
   ''}
 
-  ${optionalString (features.debug or false)  ''
-    DEBUG_INFO y
-  ''}
-
   ${extraConfig}
 ''