Wed Jul 24 03:13:59 2013 UTC ()
Use cpp to prefix linux_ to all the idr names.

Now all global symbols drm2.kmod defines begin with linux_ or drm_,
making it easier to check whether I've missed anything by running

   nm --undefined-only drm2.kmod | awk '$3 ~ /^(drm|linux)_/'


(riastradh)
diff -r1.1.2.5 -r1.1.2.6 src/sys/external/bsd/drm2/include/linux/idr.h
cvs diff -r1.1.2.5 -r1.1.2.6 src/sys/external/bsd/drm2/include/linux/idr.h (switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/idr.h 2013/07/24 02:51:35 1.1.2.5
+++ src/sys/external/bsd/drm2/include/linux/idr.h 2013/07/24 03:13:59 1.1.2.6
@@ -1,57 +1,68 @@ @@ -1,57 +1,68 @@
1/* $NetBSD: idr.h,v 1.1.2.5 2013/07/24 02:51:35 riastradh Exp $ */ 1/* $NetBSD: idr.h,v 1.1.2.6 2013/07/24 03:13:59 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.
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the 16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution. 17 * documentation and/or other materials provided with the distribution.
18 * 18 *
19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifndef _LINUX_IDR_H_ 32#ifndef _LINUX_IDR_H_
33#define _LINUX_IDR_H_ 33#define _LINUX_IDR_H_
34 34
35#include <sys/types.h> 35#include <sys/types.h>
36#include <sys/rwlock.h> 36#include <sys/rwlock.h>
37#include <sys/rbtree.h> 37#include <sys/rbtree.h>
38 38
39/* XXX Stupid expedient algorithm should be replaced by something better. */ 39/* XXX Stupid expedient algorithm should be replaced by something better. */
40 40
41struct idr { 41struct idr {
42 krwlock_t idr_lock; 42 krwlock_t idr_lock;
43 rb_tree_t idr_tree; 43 rb_tree_t idr_tree;
44 struct idr_node *idr_temp; 44 struct idr_node *idr_temp;
45}; 45};
46 46
 47/* XXX Make the nm output a little more greppable... */
 48#define idr_init linux_idr_init
 49#define idr_destroy linux_idr_destroy
 50#define idr_find linux_idr_find
 51#define idr_replace linux_idr_replace
 52#define idr_remove linux_idr_remove
 53#define idr_remove_all linux_idr_remove_all
 54#define idr_pre_get linux_idr_pre_get
 55#define idr_get_new_above linux_idr_get_new_above
 56#define idr_for_each linux_idr_for_each
 57
47void idr_init(struct idr *); 58void idr_init(struct idr *);
48void idr_destroy(struct idr *); 59void idr_destroy(struct idr *);
49void *idr_find(struct idr *, int); 60void *idr_find(struct idr *, int);
50void *idr_replace(struct idr *, void *, int); 61void *idr_replace(struct idr *, void *, int);
51void idr_remove(struct idr *, int); 62void idr_remove(struct idr *, int);
52void idr_remove_all(struct idr *); 63void idr_remove_all(struct idr *);
53int idr_pre_get(struct idr *, int); 64int idr_pre_get(struct idr *, int);
54int idr_get_new_above(struct idr *, void *, int, int *); 65int idr_get_new_above(struct idr *, void *, int, int *);
55int idr_for_each(struct idr *, int (*)(int, void *, void *), void *); 66int idr_for_each(struct idr *, int (*)(int, void *, void *), void *);
56 67
57#endif /* _LINUX_IDR_H_ */ 68#endif /* _LINUX_IDR_H_ */