Sun Apr 19 17:49:42 2020 UTC ()
Include dev/sysmon/sysmonvar.h for sysmon_pswitch.

Somehow only triggered by the compat build (which shouldn't have been
enabled!)


(maya)
diff -r1.40 -r1.41 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs diff -r1.40 -r1.41 src/sys/external/bsd/drm2/dist/include/drm/Attic/drmP.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/include/drm/Attic/drmP.h 2020/04/19 17:19:13 1.40
+++ src/sys/external/bsd/drm2/dist/include/drm/Attic/drmP.h 2020/04/19 17:49:41 1.41
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: drmP.h,v 1.40 2020/04/19 17:19:13 maya Exp $ */ 1/* $NetBSD: drmP.h,v 1.41 2020/04/19 17:49:41 maya Exp $ */
2 2
3/* 3/*
4 * Internal Header for the Direct Rendering Manager 4 * Internal Header for the Direct Rendering Manager
5 * 5 *
6 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. 6 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
7 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. 7 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
8 * Copyright (c) 2009-2010, Code Aurora Forum. 8 * Copyright (c) 2009-2010, Code Aurora Forum.
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Author: Rickard E. (Rik) Faith <faith@valinux.com> 11 * Author: Rickard E. (Rik) Faith <faith@valinux.com>
12 * Author: Gareth Hughes <gareth@valinux.com> 12 * Author: Gareth Hughes <gareth@valinux.com>
13 * 13 *
14 * Permission is hereby granted, free of charge, to any person obtaining a 14 * Permission is hereby granted, free of charge, to any person obtaining a
@@ -57,26 +57,27 @@ @@ -57,26 +57,27 @@
57#include <linux/slab.h> 57#include <linux/slab.h>
58#include <linux/types.h> 58#include <linux/types.h>
59#include <linux/vmalloc.h> 59#include <linux/vmalloc.h>
60#include <linux/workqueue.h> 60#include <linux/workqueue.h>
61 61
62#include <asm/mman.h> 62#include <asm/mman.h>
63#include <asm/pgalloc.h> 63#include <asm/pgalloc.h>
64#include <asm/uaccess.h> 64#include <asm/uaccess.h>
65 65
66#include <uapi/drm/drm.h> 66#include <uapi/drm/drm.h>
67#include <uapi/drm/drm_mode.h> 67#include <uapi/drm/drm_mode.h>
68 68
69#ifdef __NetBSD__ 69#ifdef __NetBSD__
 70#include <dev/sysmon/sysmonvar.h>
70#include <drm/drm_os_netbsd.h> 71#include <drm/drm_os_netbsd.h>
71#include <asm/barrier.h> 72#include <asm/barrier.h>
72#include <asm/bug.h> 73#include <asm/bug.h>
73#include <linux/atomic.h> 74#include <linux/atomic.h>
74#include <linux/delay.h> 75#include <linux/delay.h>
75#include <linux/err.h> 76#include <linux/err.h>
76#include <linux/fence.h> 77#include <linux/fence.h>
77#include <linux/interrupt.h> 78#include <linux/interrupt.h>
78#include <linux/ktime.h> 79#include <linux/ktime.h>
79#include <linux/module.h> 80#include <linux/module.h>
80#include <linux/pm.h> 81#include <linux/pm.h>
81#include <linux/string.h> 82#include <linux/string.h>
82#include <linux/timer.h> 83#include <linux/timer.h>