diff options
| author | Dana Myers <Dana.Myers@Sun.COM> | 2010-05-07 10:53:36 -0700 |
|---|---|---|
| committer | Dana Myers <Dana.Myers@Sun.COM> | 2010-05-07 10:53:36 -0700 |
| commit | c61d8baa39b367ff34e75d386cd4982896306860 (patch) | |
| tree | 6015d8de8b36cdac34de2370dc9fb72cdeb52177 /usr/src/uts/intel/io/acpica | |
| parent | 9b902bdefd2b455e3a0a235f279879c5a30eb1d5 (diff) | |
| download | illumos-gate-c61d8baa39b367ff34e75d386cd4982896306860.tar.gz | |
6948324 BAD TRAP with missing /boot/solaris/devicedb/master
Diffstat (limited to 'usr/src/uts/intel/io/acpica')
| -rw-r--r-- | usr/src/uts/intel/io/acpica/master_ops.c | 5 |
1 files changed, 2 insertions, 3 deletions
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 <sys/kobj.h> @@ -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; } |