Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:47:24 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif: os.h
src/sys/external/bsd/drm2/include/linux: mutex.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/include/linux/mutex.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h:1.6 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h:1.7
--- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h:1.6 Sat Dec 18 23:45:33 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h Sun Dec 19 00:47:24 2021
@@ -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>
Index: src/sys/external/bsd/drm2/include/linux/mutex.h
diff -u src/sys/external/bsd/drm2/include/linux/mutex.h:1.12 src/sys/external/bsd/drm2/include/linux/mutex.h:1.13
--- src/sys/external/bsd/drm2/include/linux/mutex.h:1.12 Fri Feb 14 14:34:59 2020
+++ src/sys/external/bsd/drm2/include/linux/mutex.h Sun Dec 19 00:47:24 2021
@@ -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 */
