Mercurial > illumos > illumos-gate

changeset 5148:88124f6d8a4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6600970 warlock failed due to function declaration conflict in ddi_dki_comm.inc and ddi_dki_impl.c
author rz201010
date Fri, 28 Sep 2007 19:46:34 -0700
parents 5e950ccc9585
children f292192855b3
files usr/src/uts/common/io/warlock/ddi_dki_comm.inc usr/src/uts/common/io/warlock/ddi_dki_impl.c
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/io/warlock/ddi_dki_comm.inc	Fri Sep 28 15:53:20 2007 -0700
+++ b/usr/src/uts/common/io/warlock/ddi_dki_comm.inc	Fri Sep 28 19:46:34 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.
+ * Copyright 2007 Sun Microsystems, Inc.
  * All rights reserved.  Use is subject to license terms.
  */
 
@@ -68,7 +68,8 @@
 
 
 /* This rendition of mod_remove() tells warlock that it calls detach. */
-int mod_remove(void) {
+int
+mod_remove(struct modlinkage *a) {
 	(*devops_p->devo_detach)(NULL, 0);
 }
 
--- a/usr/src/uts/common/io/warlock/ddi_dki_impl.c	Fri Sep 28 15:53:20 2007 -0700
+++ b/usr/src/uts/common/io/warlock/ddi_dki_impl.c	Fri Sep 28 19:46:34 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -45,7 +45,7 @@
 int warlock_dummy(void);
 int _init(void);
 int _fini(void);
-int _info(void);
+int _info(struct modinfo *a);
 int scsi_init(void);
 
 int main(void) {
@@ -64,7 +64,7 @@
 	 */
 	_init();
 	_fini();
-	_info();
+	_info(0);
 	(*devops_p->devo_identify)(0);
 	(*devops_p->devo_probe)(0);
 	(*devops_p->devo_attach)(0, 0);