Module Name: src
Committed By: martin
Date: Thu Mar 19 19:41:10 UTC 2020
Modified Files:
src/sys/altq [netbsd-9]: altq_flowvalve.h
src/sys/dist/pf/net [netbsd-9]: pfvar.h
src/sys/external/bsd/drm2/dist/drm [netbsd-9]: drm_drv.c
src/sys/external/bsd/drm2/dist/include/drm [netbsd-9]: drmP.h
src/sys/net [netbsd-9]: slcompress.h zlib.h
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #787):
sys/altq/altq_flowvalve.h: revision 1.4
sys/net/zlib.h: revision 1.15
sys/dist/pf/net/pfvar.h: revision 1.23
sys/external/bsd/drm2/dist/include/drm/drmP.h: revision 1.38
sys/external/bsd/drm2/dist/drm/drm_drv.c: revision 1.13
sys/net/slcompress.h: revision 1.20
Need opt_inet.h for #ifdef INET, INET6.
Avoid duplicate definition of internal_state struct.
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.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.146.1 src/sys/altq/altq_flowvalve.h
cvs rdiff -u -r1.22 -r1.22.32.1 src/sys/dist/pf/net/pfvar.h
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/external/bsd/drm2/dist/drm/drm_drv.c
cvs rdiff -u -r1.35.4.1 -r1.35.4.2 \
src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.19 -r1.19.20.1 src/sys/net/slcompress.h
cvs rdiff -u -r1.14 -r1.14.68.1 src/sys/net/zlib.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/altq/altq_flowvalve.h
diff -u src/sys/altq/altq_flowvalve.h:1.3 src/sys/altq/altq_flowvalve.h:1.3.146.1
--- src/sys/altq/altq_flowvalve.h:1.3 Thu Oct 12 19:59:08 2006
+++ src/sys/altq/altq_flowvalve.h Thu Mar 19 19:41:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_flowvalve.h,v 1.3 2006/10/12 19:59:08 peter Exp $ */
+/* $NetBSD: altq_flowvalve.h,v 1.3.146.1 2020/03/19 19:41:10 martin Exp $ */
/* $KAME: altq_flowvalve.h,v 1.5 2002/04/03 05:38:50 kjc Exp $ */
/*
@@ -32,6 +32,10 @@
#ifdef _KERNEL
+#ifdef _KERNEL_OPT
+#include "opt_inet.h"
+#endif
+
/* fv_flow structure to define a unique address pair */
struct fv_flow {
int flow_af; /* address family */
Index: src/sys/dist/pf/net/pfvar.h
diff -u src/sys/dist/pf/net/pfvar.h:1.22 src/sys/dist/pf/net/pfvar.h:1.22.32.1
--- src/sys/dist/pf/net/pfvar.h:1.22 Thu Jun 5 23:48:16 2014
+++ src/sys/dist/pf/net/pfvar.h Thu Mar 19 19:41:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pfvar.h,v 1.22 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: pfvar.h,v 1.22.32.1 2020/03/19 19:41:10 martin Exp $ */
/* $OpenBSD: pfvar.h,v 1.254 2007/07/13 09:17:48 markus Exp $ */
/*
@@ -34,6 +34,10 @@
#ifndef _NET_PFVAR_H_
#define _NET_PFVAR_H_
+#ifdef _KERNEL_OPT
+#include "opt_inet.h"
+#endif
+
#include <sys/param.h>
#include <sys/types.h>
#include <sys/queue.h>
Index: src/sys/external/bsd/drm2/dist/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.10 src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.10.4.1
--- src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.10 Tue Aug 28 08:20:27 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_drv.c Thu Mar 19 19:41:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.10 2018/08/28 08:20:27 martin Exp $ */
+/* $NetBSD: drm_drv.c,v 1.10.4.1 2020/03/19 19:41:10 martin Exp $ */
/*
* Created: Fri Jan 19 10:48:35 2001 by fa...@acm.org
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.10 2018/08/28 08:20:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.10.4.1 2020/03/19 19:41:10 martin Exp $");
#include <linux/err.h>
#include <linux/export.h>
@@ -541,16 +541,14 @@ EXPORT_SYMBOL(drm_unplug_dev);
#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);
}
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.35.4.1 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.35.4.2
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.35.4.1 Wed Nov 6 09:48:31 2019
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Thu Mar 19 19:41:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.35.4.1 2019/11/06 09:48:31 martin Exp $ */
+/* $NetBSD: drmP.h,v 1.35.4.2 2020/03/19 19:41:10 martin Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -821,7 +821,7 @@ struct drm_device {
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 */
/*@} */
Index: src/sys/net/slcompress.h
diff -u src/sys/net/slcompress.h:1.19 src/sys/net/slcompress.h:1.19.20.1
--- src/sys/net/slcompress.h:1.19 Mon Dec 12 15:58:45 2016
+++ src/sys/net/slcompress.h Thu Mar 19 19:41:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: slcompress.h,v 1.19 2016/12/12 15:58:45 maya Exp $ */
+/* $NetBSD: slcompress.h,v 1.19.20.1 2020/03/19 19:41:10 martin Exp $ */
/* Id: slcompress.h,v 1.4 1994/09/21 06:50:08 paulus Exp */
/*
@@ -42,6 +42,10 @@
#ifndef _NET_SLCOMPRESS_H_
#define _NET_SLCOMPRESS_H_
+#ifdef _KERNEL_OPT
+#include "opt_inet.h"
+#endif
+
#define MAX_STATES 16 /* must be > 2 and < 256 */
#define MAX_HDR MLEN /* XXX 4bsd-ism: should really be 128 */
Index: src/sys/net/zlib.h
diff -u src/sys/net/zlib.h:1.14 src/sys/net/zlib.h:1.14.68.1
--- src/sys/net/zlib.h:1.14 Wed Mar 25 01:26:12 2009
+++ src/sys/net/zlib.h Thu Mar 19 19:41:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: zlib.h,v 1.14 2009/03/25 01:26:12 darran Exp $ */
+/* $NetBSD: zlib.h,v 1.14.68.1 2020/03/19 19:41:10 martin Exp $ */
/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.1.4, March 11th, 2002
@@ -43,7 +43,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-/* @(#) $Id: zlib.h,v 1.14 2009/03/25 01:26:12 darran Exp $ */
+/* @(#) $Id: zlib.h,v 1.14.68.1 2020/03/19 19:41:10 martin Exp $ */
#ifndef ZCONF_H
#define ZCONF_H
@@ -135,6 +135,7 @@
#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
# define NO_DUMMY_DECL
#endif
+#define NO_DUMMY_DECL
/* Old Borland C incorrectly complains about missing returns: */
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
