Sun Dec 19 10:47:38 2021 UTC ()
Side load <linux/rbtree.h> for nouveau.


(riastradh)
diff -r1.11 -r1.12 src/sys/external/bsd/drm2/include/linux/module.h
cvs diff -r1.11 -r1.12 src/sys/external/bsd/drm2/include/linux/module.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/module.h 2021/12/19 09:52:17 1.11
+++ src/sys/external/bsd/drm2/include/linux/module.h 2021/12/19 10:47:38 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: module.h,v 1.11 2021/12/19 09:52:17 riastradh Exp $ */ 1/* $NetBSD: module.h,v 1.12 2021/12/19 10:47:38 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -29,26 +29,27 @@ @@ -29,26 +29,27 @@
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifndef _LINUX_MODULE_H_ 32#ifndef _LINUX_MODULE_H_
33#define _LINUX_MODULE_H_ 33#define _LINUX_MODULE_H_
34 34
35/* XXX Get this first so we don't nuke the module_init declaration. */ 35/* XXX Get this first so we don't nuke the module_init declaration. */
36#include <sys/module.h> 36#include <sys/module.h>
37 37
38#include <sys/cdefs.h> 38#include <sys/cdefs.h>
39 39
40#include <linux/export.h> 40#include <linux/export.h>
41#include <linux/moduleparam.h> 41#include <linux/moduleparam.h>
 42#include <linux/rbtree.h>
42#include <linux/stringify.h> 43#include <linux/stringify.h>
43 44
44#define module_init(INIT) 45#define module_init(INIT)
45#define module_exit(EXIT) 46#define module_exit(EXIT)
46 47
47#define MODULE_AUTHOR(AUTHOR) 48#define MODULE_AUTHOR(AUTHOR)
48#define MODULE_DESCRIPTION(DESCRIPTION) 49#define MODULE_DESCRIPTION(DESCRIPTION)
49#define MODULE_DEVICE_TABLE(DESCRIPTION, IDLIST) 50#define MODULE_DEVICE_TABLE(DESCRIPTION, IDLIST)
50#define MODULE_FIRMWARE(FIRMWARE) 51#define MODULE_FIRMWARE(FIRMWARE)
51#define MODULE_LICENSE(LICENSE) 52#define MODULE_LICENSE(LICENSE)
52 53
53#define THIS_MODULE 0 54#define THIS_MODULE 0
54#define KBUILD_MODNAME __file__ 55#define KBUILD_MODNAME __file__