Print this page
7127 remove -Wno-missing-braces from Makefile.uts
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/uts/common/idmap/idmap_mod.c
+++ new/usr/src/uts/common/idmap/idmap_mod.c
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
↓ open down ↓ |
16 lines elided |
↑ open up ↑ |
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21
22 22 /*
23 23 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
24 24 * Use is subject to license terms.
25 25 */
26 26
27 -#pragma ident "%Z%%M% %I% %E% SMI"
28 -
29 27 #include <sys/ddi.h>
30 28 #include <sys/sunddi.h>
31 29 #include <sys/modctl.h>
32 30 #ifdef DEBUG
33 31 #include <sys/cmn_err.h>
34 32 #endif /* DEBUG */
35 33 #include <sys/kidmap.h>
36 34 #include "kidmap_priv.h"
37 35
38 36
39 37
40 38
41 39 extern struct mod_ops mod_miscops;
↓ open down ↓ |
3 lines elided |
↑ open up ↑ |
42 40
43 41 static struct modlmisc misc =
44 42 {
45 43 &mod_miscops,
46 44 "ID Mapping kernel module"
47 45 };
48 46
49 47 static struct modlinkage linkage =
50 48 {
51 49 MODREV_1,
52 - (void *) &misc,
53 - NULL
50 + { (void *) &misc, NULL }
54 51 };
55 52
56 53
57 54 int
58 55 _init()
59 56 {
60 57 int i;
61 58
62 59 if ((i = mod_install(&linkage)) != 0) {
63 60 #ifdef DEBUG
64 61 cmn_err(CE_WARN, "idmap: Failed to load kernel module");
65 62 #endif /* DEBUG */
66 63 return (i);
67 64 }
68 65
69 66 if (kidmap_start() != 0) {
70 67 #ifdef DEBUG
71 68 cmn_err(CE_WARN, "idmap: Failed to start");
72 69 #endif /* DEBUG */
73 70 return (i);
74 71 }
75 72
76 73 return (i);
77 74 }
78 75
79 76 int
80 77 _info(struct modinfo *modinfop)
81 78 {
82 79 return (mod_info(&linkage, modinfop));
83 80 }
84 81
85 82 int
86 83 _fini()
87 84 {
88 85 int i;
89 86
90 87 if ((i = kidmap_stop()) != 0) {
91 88 return (i);
92 89 }
93 90
94 91 if ((i = mod_remove(&linkage)) != 0) {
95 92 #ifdef DEBUG
96 93 cmn_err(CE_WARN, "idmap: Failed to remove kernel module");
97 94 #endif /* DEBUG */
98 95 return (i);
99 96 }
100 97
101 98 return (0);
102 99 }
↓ open down ↓ |
39 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX