From c61d8baa39b367ff34e75d386cd4982896306860 Mon Sep 17 00:00:00 2001 From: Dana Myers Date: Fri, 7 May 2010 10:53:36 -0700 Subject: 6948324 BAD TRAP with missing /boot/solaris/devicedb/master --- usr/src/uts/intel/io/acpica/master_ops.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'usr/src/uts/intel/io/acpica') diff --git a/usr/src/uts/intel/io/acpica/master_ops.c b/usr/src/uts/intel/io/acpica/master_ops.c index c51e662ea8..676950c5db 100644 --- a/usr/src/uts/intel/io/acpica/master_ops.c +++ b/usr/src/uts/intel/io/acpica/master_ops.c @@ -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 @@ -394,7 +393,7 @@ process_master_file() 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; } -- cgit v1.2.3