[src/trunk]: src/sys/external/bsd/drm2/include/linux Make <linux/mutex.h> sid...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e5098116474f
branches:  trunk
changeset: 1027804:e5098116474f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 00:47:24 2021 +0000

description:
Make <linux/mutex.h> side-load <linux/spinlock.h>.

Upstream actually side-loads <linux/spinlock_types.h> so you just get
spinlock_t without all the other spinlock operations, but whatever.

Reduce some diffs that this renders unnecessary.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h |  3 +--
 sys/external/bsd/drm2/include/linux/mutex.h              |  3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r faa4f7200f57 -r e5098116474f sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h
--- a/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h  Sun Dec 19 00:47:17 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h  Sun Dec 19 00:47:24 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: os.h,v 1.6 2021/12/18 23:45:33 riastradh Exp $ */
+/*     $NetBSD: os.h,v 1.7 2021/12/19 00:47:24 riastradh Exp $ */
 
 /* SPDX-License-Identifier: MIT */
 #ifndef __NOUVEAU_OS_H__
@@ -36,7 +36,6 @@
 #include <linux/kernel.h>
 #include <linux/kref.h>
 #include <linux/list.h>
-#include <linux/spinlock.h>
 #include <linux/math64.h>
 #include <linux/errno.h>
 #include <linux/workqueue.h>
diff -r faa4f7200f57 -r e5098116474f sys/external/bsd/drm2/include/linux/mutex.h
--- a/sys/external/bsd/drm2/include/linux/mutex.h       Sun Dec 19 00:47:17 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/mutex.h       Sun Dec 19 00:47:24 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.12 2020/02/14 14:34:59 maya Exp $  */
+/*     $NetBSD: mutex.h,v 1.13 2021/12/19 00:47:24 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@
 #include <asm/processor.h>
 
 #include <linux/list.h>
+#include <linux/spinlock.h>
 
 #define        __acquires(lock)                        /* XXX lockdep stuff */
 #define        __releases(lock)                        /* XXX lockdep stuff */