diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-04-24 11:51:48 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-04-24 11:51:48 +0000 |
| commit | 486e689913103fa372f7e2c3e054b2bd602546c4 (patch) | |
| tree | 5963d7e886c47fe07a96f0c00d324f60e70316f4 /usr/src/uts/intel/io/acpica/osl.c | |
| parent | afe3f9d8d23796457bfe72d173ddfad10fb73385 (diff) | |
| parent | 296f12dc4bd61fe5e3b1200d2cdf217ed82119a1 (diff) | |
| download | illumos-joyent-release-20190425.tar.gz | |
[illumos-gate merge]release-20190425
commit 296f12dc4bd61fe5e3b1200d2cdf217ed82119a1
10792 pcie: NULL pointer errors
commit 2002b186f847595188b1fb0b8dd800370aa6107c
10791 dr: NULL pointer errors
commit 8cd1b71859be6a08c9b7a446994fdbca544bb34f
10775 kmech_krb5: NULL pointer errors
commit c48c304592e7c2469d5b721291b1f57069f08d33
10774 pcmcia: NULL pointer errors
commit b38836b5d7f7e27aad97495457921171be74e408
10773 sata: NULL pointer errors
commit e9f74ea56f674c729c7fa4812e7fc668a9c24070
10738 sockfs: NULL pointer errors
commit 0f677ac901babf1fada10fcc386de1c3d4d4ecad
10772 kcf: NULL pointer errors
commit 03b18ed2fedba1f49023f25d34cbb6e4d0d8f435
10771 ibmf: NULL pointer errors
commit 28ec64d9ac03d17ce922c30274d804b981cda66e
10769 ksocket: NULL pointer errors
commit 9c80534542e4b5924bcdb8adee652d01656e4889
10768 kgssapi: NULL pointer errors
commit ee4417888cf835db6efb1e9b8039c90f0674e1cd
10765 acpica: NULL pointer errors
commit 239936d2b877f13d716270a06e56203231806b36
10762 hidparser: NULL pointer errors
commit 0f48f68d9e0ad95b0edf718f68736cf3635a1f79
10758 c2audit: NULL pointer errors
commit a8eee26afa7ddf0c604c989c598251014bdc6e6f
10745 rlmod: NULL pointer errors
commit 1d775d5906fd85b9ab1ac2251af8d38b5567d9a1
10829 zpool-features.5 add missing .RE
commit e14e15a6cbf868bfce31e7f485294c3358f1ae2a
10756 kaio: NULL pointer errors
commit 43bd9002dc964c045e1c90dfc1b08ab9fb316d41
10754 portfs: NULL pointer errors
commit c92b35bb664ce1e1d7dc0a4dcdcc791aef0fe69e
10753 qlc: NULL pointer errors
commit 483e494a59954f25ec067f2dee3cd94a269eaa08
10752 fcsm: NULL pointer errors
commit dd328bf6d39366b8d7bde6a36114538fc14332dd
10731 zfs: NULL pointer errors
commit fd7977362aae2eaa5dcb89671159f4fd82f22ca1
10570 Need workaround to EFI boot on AMI BIOS
Conflicts:
usr/src/uts/common/io/pciex/pcie_fault.c
Diffstat (limited to 'usr/src/uts/intel/io/acpica/osl.c')
| -rw-r--r-- | usr/src/uts/intel/io/acpica/osl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/intel/io/acpica/osl.c b/usr/src/uts/intel/io/acpica/osl.c index ccaf746d1f..a9d32b281d 100644 --- a/usr/src/uts/intel/io/acpica/osl.c +++ b/usr/src/uts/intel/io/acpica/osl.c @@ -230,10 +230,10 @@ AcpiOsGetRootPointer() * in the acpi-root-tab property. */ Address = ddi_prop_get_int64(DDI_DEV_T_ANY, ddi_root_node(), - DDI_PROP_DONTPASS, "acpi-root-tab", NULL); + DDI_PROP_DONTPASS, "acpi-root-tab", 0); - if ((Address == NULL) && ACPI_FAILURE(AcpiFindRootPointer(&Address))) - Address = NULL; + if ((Address == 0) && ACPI_FAILURE(AcpiFindRootPointer(&Address))) + Address = 0; return (Address); } |