>From d9f9d4c34a8f4d42af3e90789267137d15d60bb9 Mon Sep 17 00:00:00 2001
From: Florian Pelz <address@hidden>
Date: Mon, 20 Apr 2020 19:03:57 +0200
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH] gnu: linux-libre: Disable usbmouse kernel module.

This avoids a race with the bcm5974 kernel module.
Fixes <https://bugs.gnu.org/35574>.

* gnu/packages/linux.scm (%default-extra-linux-options):
Disable CONFIG_USB_MOUSE.
---
 gnu/packages/linux.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2acbe649f0..5f2f17b31a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2020 Pierre Neidhardt <address@hidden>
 ;;; Copyright © 2020 Chris Marusich <address@hidden>
 ;;; Copyright © 2020 Vincent Legoll <address@hidden>
+;;; Copyright © 2020 Florian Pelz <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -618,7 +619,9 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
     ("CONFIG_VIRTIO_MMIO" . m)
     ("CONFIG_FUSE_FS" . m)
     ("CONFIG_CIFS" . m)
-    ("CONFIG_9P_FS" . m)))
+    ("CONFIG_9P_FS" . m)
+    ;; These modules cause trouble:
+    ("CONFIG_USB_MOUSE" . #f))) ;see <https://bugs.gnu.org/35574>
 
 (define (config->string options)
   (string-join (map (match-lambda
-- 
2.26.1