Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist Avoid struct inode.
details: https://anonhg.NetBSD.org/src/rev/4429f0225626
branches: trunk
changeset: 969906:4429f0225626
user: riastradh <riastradh%NetBSD.org@localhost>
date: Thu Mar 05 07:46:59 2020 +0000
description:
Avoid struct inode.
This is an fs-independent structure in Linux. We don't actually use
it as such; it's just a dummy struct tag. But we do have an actual
struct inode in ufs and in lfs, and using the same struct tag here
confuses ctf leading to four copies of pretty much every drm data
structure.
diffstat:
sys/external/bsd/drm2/dist/drm/drm_drv.c | 10 ++++------
sys/external/bsd/drm2/dist/include/drm/drmP.h | 4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
diffs (55 lines):
diff -r dbdefe6ecbf6 -r 4429f0225626 sys/external/bsd/drm2/dist/drm/drm_drv.c
--- a/sys/external/bsd/drm2/dist/drm/drm_drv.c Thu Mar 05 07:46:49 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_drv.c Thu Mar 05 07:46:59 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.12 2020/02/14 14:34:57 maya Exp $ */
+/* $NetBSD: drm_drv.c,v 1.13 2020/03/05 07:46:59 riastradh Exp $ */
/*
* Created: Fri Jan 19 10:48:35 2001 by faith%acm.org@localhost
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.12 2020/02/14 14:34:57 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.13 2020/03/05 07:46:59 riastradh Exp $");
#include <linux/debugfs.h>
#include <linux/fs.h>
@@ -540,16 +540,14 @@
#ifdef __NetBSD__
-struct inode;
-
-static struct inode *
+static void *
drm_fs_inode_new(void)
{
return NULL;
}
static void
-drm_fs_inode_free(struct inode *inode)
+drm_fs_inode_free(void *inode)
{
KASSERT(inode == NULL);
}
diff -r dbdefe6ecbf6 -r 4429f0225626 sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h Thu Mar 05 07:46:49 2020 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h Thu Mar 05 07:46:59 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.37 2020/02/14 14:34:59 maya Exp $ */
+/* $NetBSD: drmP.h,v 1.38 2020/03/05 07:46:59 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -827,7 +827,7 @@
struct drm_minor *primary; /**< Primary node */
struct drm_minor *render; /**< Render node */
atomic_t unplugged; /**< Flag whether dev is dead */
- struct inode *anon_inode; /**< inode for private address-space */
+ void *anon_inode; /**< inode for private address-space */
char *unique; /**< unique name of the device */
/*@} */
Home |
Main Index |
Thread Index |
Old Index