[bug#35223] [PATCH] gnu: linux-libre: Set DEVPTS_MULTIPLE_INSTANCES only where needed.

[Tobias Geerinckx-Rice <somebody@not-sent-or-endorsed-by.tobias.gr>]

From: Tobias Geerinckx-Rice <me@tobias.gr>

* gnu/packages/linux.scm (%default-extra-linux-options): Move obsolete
CONFIG_DEVPTS_MULTIPLE_INSTANCES option…
(linux-libre-4.4): …here.
---
 gnu/packages/linux.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 710fd2d299..c80cee6422 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -264,9 +264,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
     (search-auxiliary-file file)))
 
 (define %default-extra-linux-options
-  `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
-    ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)
-    ;; Modules required for initrd:
+  `(;; Modules required for initrd:
     ("CONFIG_NET_9P" . m)
     ("CONFIG_NET_9P_VIRTIO" . m)
     ("CONFIG_VIRTIO_BLK" . m)
@@ -471,7 +469,13 @@ It has been modified to remove all non-free binary blobs.")
   (make-linux-libre "4.4.178"
                     "1lgsd760md6b32qb5ng3anfq1n754a9d0c4xnf2mjxkimncb1jpp"
                     '("x86_64-linux" "i686-linux")
-                    #:configuration-file kernel-config))
+                    #:configuration-file kernel-config
+                    #:extra-options
+                    (append
+                     `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
+                       ;; This option was removed upstream in version 4.7.
+                       ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t))
+                     %default-extra-linux-options)))
 
 (define-public linux-libre-arm-generic
   (make-linux-libre %linux-libre-version
-- 
2.21.0