Mercurial > illumos > illumos-gate

changeset 12337:50b5dc9700ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6948324 BAD TRAP with missing /boot/solaris/devicedb/master
author Dana Myers <Dana.Myers@Sun.COM>
date Fri, 07 May 2010 10:53:36 -0700
parents 569c693e350c
children 35935eb9ada9
files usr/src/uts/intel/io/acpica/master_ops.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/intel/io/acpica/master_ops.c	Fri May 07 10:49:07 2010 -0700
+++ b/usr/src/uts/intel/io/acpica/master_ops.c	Fri May 07 10:53:36 2010 -0700
@@ -19,8 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <sys/kobj.h>
@@ -394,7 +393,7 @@
 	struct _buf *file;
 	master_rec_t *m;
 
-	if ((file = kobj_open_file(masterfile)) == NULL) {
+	if ((file = kobj_open_file(masterfile)) == (struct _buf *)-1) {
 		cmn_err(CE_WARN, "!cannot open master file: %s", masterfile);
 		return;
 	}