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/include/linux Include <sys/module.h> f...



details:   https://anonhg.NetBSD.org/src/rev/d2aa57847e53
branches:  trunk
changeset: 366010:d2aa57847e53
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:33:53 2018 +0000

description:
Include <sys/module.h> first in <linux/module.h>.

If not, later includes of <sys/module.h> will fail because
<linux/module.h> defines a Linux macro module_init that causes the
prototype for our function module_init to evaporate.

diffstat:

 sys/external/bsd/drm2/include/linux/module.h |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 0d0dd8464eb7 -r d2aa57847e53 sys/external/bsd/drm2/include/linux/module.h
--- a/sys/external/bsd/drm2/include/linux/module.h      Mon Aug 27 07:33:45 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/module.h      Mon Aug 27 07:33:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: module.h,v 1.5 2014/11/12 02:24:40 christos Exp $      */
+/*     $NetBSD: module.h,v 1.6 2018/08/27 07:33:53 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
 #ifndef _LINUX_MODULE_H_
 #define _LINUX_MODULE_H_
 
+/* XXX Get this first so we don't nuke the module_init declaration.  */
+#include <sys/module.h>
+
 #include <linux/export.h>
 #include <linux/moduleparam.h>
 



Home | Main Index | Thread Index | Old Index