--===============0073752090==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Edward O'Callaghan <eocallaghan@auroraux.org> added the comment:
Attached is the required fix from the acpica-unix-20100806 snapshot;
Please review and commit.
----------
assignedto: -> eocallaghan
status: chatting -> in-progress
_____________________________________________________
DragonFly issue tracker <bugs@lists.dragonflybsd.org>
<http://bugs.dragonflybsd.org/issue1846>
_____________________________________________________
--===============0073752090==
Content-Type: application/octet-stream
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="exmutex.c.patch"
ZGlmZiAtLWdpdCBhL3N5cy9jb250cmliL2Rldi9hY3BpY2EtdW5peC9leGVjdXRlci9leG11dGV4
LmMgYi9zeXMvY29udHJpYi9kZXYvYWNwaWNhLXVuaXgvZXhlY3V0ZXIvZXhtdXRleC5jCmluZGV4
IGRiNWFiOWUuLmU5NjQ2Y2EgMTAwNjQ0Ci0tLSBhL3N5cy9jb250cmliL2Rldi9hY3BpY2EtdW5p
eC9leGVjdXRlci9leG11dGV4LmMKKysrIGIvc3lzL2NvbnRyaWIvZGV2L2FjcGljYS11bml4L2V4
ZWN1dGVyL2V4bXV0ZXguYwpAQCAtOSw3ICs5LDcgQEAKICAqCiAgKiAxLiBDb3B5cmlnaHQgTm90
aWNlCiAgKgotICogU29tZSBvciBhbGwgb2YgdGhpcyB3b3JrIC0gQ29weXJpZ2h0IChjKSAxOTk5
IC0gMjAwOSwgSW50ZWwgQ29ycC4KKyAqIFNvbWUgb3IgYWxsIG9mIHRoaXMgd29yayAtIENvcHly
aWdodCAoYykgMTk5OSAtIDIwMTAsIEludGVsIENvcnAuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVk
LgogICoKICAqIDIuIExpY2Vuc2UKQEAgLTE2OCwxMCArMTY4LDEwIEBAIEFjcGlFeFVubGlua011
dGV4ICgKICAgICAgICAgKE9iakRlc2MtPk11dGV4LlByZXYpLT5NdXRleC5OZXh0ID0gT2JqRGVz
Yy0+TXV0ZXguTmV4dDsKIAogICAgICAgICAvKgotICAgICAgICAgKiBNaWdyYXRlIHRoZSBwcmV2
aW91cyBzeW5jIGxldmVsIGFzc29jaWF0ZWQgd2l0aCB0aGlzIG11dGV4IHRvIHRoZQotICAgICAg
ICAgKiBwcmV2aW91cyBtdXRleCBvbiB0aGUgbGlzdCBzbyB0aGF0IGl0IG1heSBiZSBwcmVzZXJ2
ZWQuIFRoaXMgaGFuZGxlcwotICAgICAgICAgKiB0aGUgY2FzZSB3aGVyZSBzZXZlcmFsIG11dGV4
ZXMgaGF2ZSBiZWVuIGFjcXVpcmVkIGF0IHRoZSBzYW1lIGxldmVsLAotICAgICAgICAgKiBidXQg
YXJlIG5vdCByZWxlYXNlZCBpbiBvcHBvc2l0ZSBvcmRlci4KKyAgICAgICAgICogTWlncmF0ZSB0
aGUgcHJldmlvdXMgc3luYyBsZXZlbCBhc3NvY2lhdGVkIHdpdGggdGhpcyBtdXRleCB0bworICAg
ICAgICAgKiB0aGUgcHJldmlvdXMgbXV0ZXggb24gdGhlIGxpc3Qgc28gdGhhdCBpdCBtYXkgYmUg
cHJlc2VydmVkLgorICAgICAgICAgKiBUaGlzIGhhbmRsZXMgdGhlIGNhc2Ugd2hlcmUgc2V2ZXJh
bCBtdXRleGVzIGhhdmUgYmVlbiBhY3F1aXJlZAorICAgICAgICAgKiBhdCB0aGUgc2FtZSBsZXZl
bCwgYnV0IGFyZSBub3QgcmVsZWFzZWQgaW4gb3Bwb3NpdGUgb3JkZXIuCiAgICAgICAgICAqLwog
ICAgICAgICAoT2JqRGVzYy0+TXV0ZXguUHJldiktPk11dGV4Lk9yaWdpbmFsU3luY0xldmVsID0K
ICAgICAgICAgICAgIE9iakRlc2MtPk11dGV4Lk9yaWdpbmFsU3luY0xldmVsOwpAQCAtMTg3LDgg
KzE4Nyw4IEBAIEFjcGlFeFVubGlua011dGV4ICgKICAqCiAgKiBGVU5DVElPTjogICAgQWNwaUV4
TGlua011dGV4CiAgKgotICogUEFSQU1FVEVSUzogIE9iakRlc2MgICAgICAgICAtIFRoZSBtdXRl
eCB0byBiZSBsaW5rZWQKLSAqICAgICAgICAgICAgICBUaHJlYWQgICAgICAgICAgLSBDdXJyZW50
IGV4ZWN1dGluZyB0aHJlYWQgb2JqZWN0CisgKiBQQVJBTUVURVJTOiAgT2JqRGVzYyAgICAgICAg
ICAgICAtIFRoZSBtdXRleCB0byBiZSBsaW5rZWQKKyAqICAgICAgICAgICAgICBUaHJlYWQgICAg
ICAgICAgICAgIC0gQ3VycmVudCBleGVjdXRpbmcgdGhyZWFkIG9iamVjdAogICoKICAqIFJFVFVS
TjogICAgICBOb25lCiAgKgpAQCAtMjI4LDkgKzIyOCw5IEBAIEFjcGlFeExpbmtNdXRleCAoCiAg
KgogICogRlVOQ1RJT046ICAgIEFjcGlFeEFjcXVpcmVNdXRleE9iamVjdAogICoKLSAqIFBBUkFN
RVRFUlM6ICBUaW1lRGVzYyAgICAgICAgICAgIC0gVGltZW91dCBpbiBtaWxsaXNlY29uZHMKKyAq
IFBBUkFNRVRFUlM6ICBUaW1lb3V0ICAgICAgICAgICAgIC0gVGltZW91dCBpbiBtaWxsaXNlY29u
ZHMKICAqICAgICAgICAgICAgICBPYmpEZXNjICAgICAgICAgICAgIC0gTXV0ZXggb2JqZWN0Ci0g
KiAgICAgICAgICAgICAgVGhyZWFkICAgICAgICAgICAgICAtIEN1cnJlbnQgdGhyZWFkIHN0YXRl
CisgKiAgICAgICAgICAgICAgVGhyZWFkSWQgICAgICAgICAgICAtIEN1cnJlbnQgdGhyZWFkIHN0
YXRlCiAgKgogICogUkVUVVJOOiAgICAgIFN0YXR1cwogICoKQEAgLTMzNywxMSArMzM3LDEyIEBA
IEFjcGlFeEFjcXVpcmVNdXRleCAoCiAgICAgICAgIHJldHVybl9BQ1BJX1NUQVRVUyAoQUVfQkFE
X1BBUkFNRVRFUik7CiAgICAgfQogCi0gICAgLyogTXVzdCBoYXZlIGEgdmFsaWQgdGhyZWFkIElE
ICovCisgICAgLyogTXVzdCBoYXZlIGEgdmFsaWQgdGhyZWFkIHN0YXRlIHN0cnVjdCAqLwogCiAg
ICAgaWYgKCFXYWxrU3RhdGUtPlRocmVhZCkKICAgICB7Ci0gICAgICAgIEFDUElfRVJST1IgKChB
RV9JTkZPLCAiQ2Fubm90IGFjcXVpcmUgTXV0ZXggWyU0LjRzXSwgbnVsbCB0aHJlYWQgaW5mbyIs
CisgICAgICAgIEFDUElfRVJST1IgKChBRV9JTkZPLAorICAgICAgICAgICAgIkNhbm5vdCBhY3F1
aXJlIE11dGV4IFslNC40c10sIG51bGwgdGhyZWFkIGluZm8iLAogICAgICAgICAgICAgQWNwaVV0
R2V0Tm9kZU5hbWUgKE9iakRlc2MtPk11dGV4Lk5vZGUpKSk7CiAgICAgICAgIHJldHVybl9BQ1BJ
X1NUQVRVUyAoQUVfQU1MX0lOVEVSTkFMKTsKICAgICB9CkBAIC0zNTMsNyArMzU0LDcgQEAgQWNw
aUV4QWNxdWlyZU11dGV4ICgKICAgICBpZiAoV2Fsa1N0YXRlLT5UaHJlYWQtPkN1cnJlbnRTeW5j
TGV2ZWwgPiBPYmpEZXNjLT5NdXRleC5TeW5jTGV2ZWwpCiAgICAgewogICAgICAgICBBQ1BJX0VS
Uk9SICgoQUVfSU5GTywKLSAgICAgICAgICAgICJDYW5ub3QgYWNxdWlyZSBNdXRleCBbJTQuNHNd
LCBjdXJyZW50IFN5bmNMZXZlbCBpcyB0b28gbGFyZ2UgKCVkKSIsCisgICAgICAgICAgICAiQ2Fu
bm90IGFjcXVpcmUgTXV0ZXggWyU0LjRzXSwgY3VycmVudCBTeW5jTGV2ZWwgaXMgdG9vIGxhcmdl
ICgldSkiLAogICAgICAgICAgICAgQWNwaVV0R2V0Tm9kZU5hbWUgKE9iakRlc2MtPk11dGV4Lk5v
ZGUpLAogICAgICAgICAgICAgV2Fsa1N0YXRlLT5UaHJlYWQtPkN1cnJlbnRTeW5jTGV2ZWwpKTsK
ICAgICAgICAgcmV0dXJuX0FDUElfU1RBVFVTIChBRV9BTUxfTVVURVhfT1JERVIpOwpAQCAtNDcx
LDYgKzQ3Miw3IEBAIEFjcGlFeFJlbGVhc2VNdXRleCAoCiB7CiAgICAgQUNQSV9TVEFUVVMgICAg
ICAgICAgICAgU3RhdHVzID0gQUVfT0s7CiAgICAgVUlOVDggICAgICAgICAgICAgICAgICAgUHJl
dmlvdXNTeW5jTGV2ZWw7CisgICAgQUNQSV9USFJFQURfU1RBVEUgICAgICAgKk93bmVyVGhyZWFk
OwogCiAKICAgICBBQ1BJX0ZVTkNUSU9OX1RSQUNFIChFeFJlbGVhc2VNdXRleCk7CkBAIC00ODEs
MzkgKzQ4Myw0MyBAQCBBY3BpRXhSZWxlYXNlTXV0ZXggKAogICAgICAgICByZXR1cm5fQUNQSV9T
VEFUVVMgKEFFX0JBRF9QQVJBTUVURVIpOwogICAgIH0KIAorICAgIE93bmVyVGhyZWFkID0gT2Jq
RGVzYy0+TXV0ZXguT3duZXJUaHJlYWQ7CisKICAgICAvKiBUaGUgbXV0ZXggbXVzdCBoYXZlIGJl
ZW4gcHJldmlvdXNseSBhY3F1aXJlZCBpbiBvcmRlciB0byByZWxlYXNlIGl0ICovCiAKLSAgICBp
ZiAoIU9iakRlc2MtPk11dGV4Lk93bmVyVGhyZWFkKQorICAgIGlmICghT3duZXJUaHJlYWQpCiAg
ICAgewotICAgICAgICBBQ1BJX0VSUk9SICgoQUVfSU5GTywgIkNhbm5vdCByZWxlYXNlIE11dGV4
IFslNC40c10sIG5vdCBhY3F1aXJlZCIsCisgICAgICAgIEFDUElfRVJST1IgKChBRV9JTkZPLAor
ICAgICAgICAgICAgIkNhbm5vdCByZWxlYXNlIE11dGV4IFslNC40c10sIG5vdCBhY3F1aXJlZCIs
CiAgICAgICAgICAgICBBY3BpVXRHZXROb2RlTmFtZSAoT2JqRGVzYy0+TXV0ZXguTm9kZSkpKTsK
ICAgICAgICAgcmV0dXJuX0FDUElfU1RBVFVTIChBRV9BTUxfTVVURVhfTk9UX0FDUVVJUkVEKTsK
ICAgICB9CiAKKyAgICAvKiBNdXN0IGhhdmUgYSB2YWxpZCB0aHJlYWQgSUQgKi8KKworICAgIGlm
ICghV2Fsa1N0YXRlLT5UaHJlYWQpCisgICAgeworICAgICAgICBBQ1BJX0VSUk9SICgoQUVfSU5G
TywKKyAgICAgICAgICAgICJDYW5ub3QgcmVsZWFzZSBNdXRleCBbJTQuNHNdLCBudWxsIHRocmVh
ZCBpbmZvIiwKKyAgICAgICAgICAgIEFjcGlVdEdldE5vZGVOYW1lIChPYmpEZXNjLT5NdXRleC5O
b2RlKSkpOworICAgICAgICByZXR1cm5fQUNQSV9TVEFUVVMgKEFFX0FNTF9JTlRFUk5BTCk7Cisg
ICAgfQorCiAgICAgLyoKICAgICAgKiBUaGUgTXV0ZXggaXMgb3duZWQsIGJ1dCB0aGlzIHRocmVh
ZCBtdXN0IGJlIHRoZSBvd25lci4KICAgICAgKiBTcGVjaWFsIGNhc2UgZm9yIEdsb2JhbCBMb2Nr
LCBhbnkgdGhyZWFkIGNhbiByZWxlYXNlCiAgICAgICovCi0gICAgaWYgKChPYmpEZXNjLT5NdXRl
eC5Pd25lclRocmVhZC0+VGhyZWFkSWQgIT0gV2Fsa1N0YXRlLT5UaHJlYWQtPlRocmVhZElkKSAm
JgorICAgIGlmICgoT3duZXJUaHJlYWQtPlRocmVhZElkICE9IFdhbGtTdGF0ZS0+VGhyZWFkLT5U
aHJlYWRJZCkgJiYKICAgICAgICAgKE9iakRlc2MgIT0gQWNwaUdibF9HbG9iYWxMb2NrTXV0ZXgp
KQogICAgIHsKICAgICAgICAgQUNQSV9FUlJPUiAoKEFFX0lORk8sCiAgICAgICAgICAgICAiVGhy
ZWFkICVwIGNhbm5vdCByZWxlYXNlIE11dGV4IFslNC40c10gYWNxdWlyZWQgYnkgdGhyZWFkICVw
IiwKICAgICAgICAgICAgIEFDUElfQ0FTVF9QVFIgKHZvaWQsIFdhbGtTdGF0ZS0+VGhyZWFkLT5U
aHJlYWRJZCksCiAgICAgICAgICAgICBBY3BpVXRHZXROb2RlTmFtZSAoT2JqRGVzYy0+TXV0ZXgu
Tm9kZSksCi0gICAgICAgICAgICBBQ1BJX0NBU1RfUFRSICh2b2lkLCBPYmpEZXNjLT5NdXRleC5P
d25lclRocmVhZC0+VGhyZWFkSWQpKSk7CisgICAgICAgICAgICBBQ1BJX0NBU1RfUFRSICh2b2lk
LCBPd25lclRocmVhZC0+VGhyZWFkSWQpKSk7CiAgICAgICAgIHJldHVybl9BQ1BJX1NUQVRVUyAo
QUVfQU1MX05PVF9PV05FUik7CiAgICAgfQogCi0gICAgLyogTXVzdCBoYXZlIGEgdmFsaWQgdGhy
ZWFkIElEICovCi0KLSAgICBpZiAoIVdhbGtTdGF0ZS0+VGhyZWFkKQotICAgIHsKLSAgICAgICAg
QUNQSV9FUlJPUiAoKEFFX0lORk8sICJDYW5ub3QgcmVsZWFzZSBNdXRleCBbJTQuNHNdLCBudWxs
IHRocmVhZCBpbmZvIiwKLSAgICAgICAgICAgIEFjcGlVdEdldE5vZGVOYW1lIChPYmpEZXNjLT5N
dXRleC5Ob2RlKSkpOwotICAgICAgICByZXR1cm5fQUNQSV9TVEFUVVMgKEFFX0FNTF9JTlRFUk5B
TCk7Ci0gICAgfQotCiAgICAgLyoKICAgICAgKiBUaGUgc3luYyBsZXZlbCBvZiB0aGUgbXV0ZXgg
bXVzdCBiZSBlcXVhbCB0byB0aGUgY3VycmVudCBzeW5jIGxldmVsLiBJbgogICAgICAqIG90aGVy
IHdvcmRzLCB0aGUgY3VycmVudCBsZXZlbCBtZWFucyB0aGF0IGF0IGxlYXN0IG9uZSBtdXRleCBh
dCB0aGF0CkBAIC01MjEsMTAgKzUyNywxMCBAQCBBY3BpRXhSZWxlYXNlTXV0ZXggKAogICAgICAq
IGRpZmZlcmVudCBsZXZlbCBjYW4gb25seSBtZWFuIHRoYXQgdGhlIG11dGV4IG9yZGVyaW5nIHJ1
bGUgaXMgYmVpbmcKICAgICAgKiB2aW9sYXRlZC4gVGhpcyBiZWhhdmlvciBpcyBjbGFyaWZpZWQg
aW4gQUNQSSA0LjAgc3BlY2lmaWNhdGlvbi4KICAgICAgKi8KLSAgICBpZiAoT2JqRGVzYy0+TXV0
ZXguU3luY0xldmVsICE9IFdhbGtTdGF0ZS0+VGhyZWFkLT5DdXJyZW50U3luY0xldmVsKQorICAg
IGlmIChPYmpEZXNjLT5NdXRleC5TeW5jTGV2ZWwgIT0gT3duZXJUaHJlYWQtPkN1cnJlbnRTeW5j
TGV2ZWwpCiAgICAgewogICAgICAgICBBQ1BJX0VSUk9SICgoQUVfSU5GTywKLSAgICAgICAgICAg
ICJDYW5ub3QgcmVsZWFzZSBNdXRleCBbJTQuNHNdLCBTeW5jTGV2ZWwgbWlzbWF0Y2g6IG11dGV4
ICVkIGN1cnJlbnQgJWQiLAorICAgICAgICAgICAgIkNhbm5vdCByZWxlYXNlIE11dGV4IFslNC40
c10sIFN5bmNMZXZlbCBtaXNtYXRjaDogbXV0ZXggJXUgY3VycmVudCAldSIsCiAgICAgICAgICAg
ICBBY3BpVXRHZXROb2RlTmFtZSAoT2JqRGVzYy0+TXV0ZXguTm9kZSksCiAgICAgICAgICAgICBP
YmpEZXNjLT5NdXRleC5TeW5jTGV2ZWwsIFdhbGtTdGF0ZS0+VGhyZWFkLT5DdXJyZW50U3luY0xl
dmVsKSk7CiAgICAgICAgIHJldHVybl9BQ1BJX1NUQVRVUyAoQUVfQU1MX01VVEVYX09SREVSKTsK
QEAgLTUzNiw3ICs1NDIsNyBAQCBBY3BpRXhSZWxlYXNlTXV0ZXggKAogICAgICAqIGFjcXVpcmVk
LCBidXQgYXJlIG5vdCByZWxlYXNlZCBpbiByZXZlcnNlIG9yZGVyLgogICAgICAqLwogICAgIFBy
ZXZpb3VzU3luY0xldmVsID0KLSAgICAgICAgV2Fsa1N0YXRlLT5UaHJlYWQtPkFjcXVpcmVkTXV0
ZXhMaXN0LT5NdXRleC5PcmlnaW5hbFN5bmNMZXZlbDsKKyAgICAgICAgT3duZXJUaHJlYWQtPkFj
cXVpcmVkTXV0ZXhMaXN0LT5NdXRleC5PcmlnaW5hbFN5bmNMZXZlbDsKIAogICAgIFN0YXR1cyA9
IEFjcGlFeFJlbGVhc2VNdXRleE9iamVjdCAoT2JqRGVzYyk7CiAgICAgaWYgKEFDUElfRkFJTFVS
RSAoU3RhdHVzKSkKQEAgLTU0OCw4ICs1NTQsOSBAQCBBY3BpRXhSZWxlYXNlTXV0ZXggKAogICAg
IHsKICAgICAgICAgLyogUmVzdG9yZSB0aGUgcHJldmlvdXMgU3luY0xldmVsICovCiAKLSAgICAg
ICAgV2Fsa1N0YXRlLT5UaHJlYWQtPkN1cnJlbnRTeW5jTGV2ZWwgPSBQcmV2aW91c1N5bmNMZXZl
bDsKKyAgICAgICAgT3duZXJUaHJlYWQtPkN1cnJlbnRTeW5jTGV2ZWwgPSBQcmV2aW91c1N5bmNM
ZXZlbDsKICAgICB9CisKICAgICByZXR1cm5fQUNQSV9TVEFUVVMgKFN0YXR1cyk7CiB9CiAKQEAg
LTU1OCw3ICs1NjUsNyBAQCBBY3BpRXhSZWxlYXNlTXV0ZXggKAogICoKICAqIEZVTkNUSU9OOiAg
ICBBY3BpRXhSZWxlYXNlQWxsTXV0ZXhlcwogICoKLSAqIFBBUkFNRVRFUlM6ICBUaHJlYWQgICAg
ICAgICAgLSBDdXJyZW50IGV4ZWN1dGluZyB0aHJlYWQgb2JqZWN0CisgKiBQQVJBTUVURVJTOiAg
VGhyZWFkICAgICAgICAgICAgICAtIEN1cnJlbnQgZXhlY3V0aW5nIHRocmVhZCBvYmplY3QKICAq
CiAgKiBSRVRVUk46ICAgICAgU3RhdHVzCiAgKgpAQCAtNjE3LDUgKzYyNCwzIEBAIEFjcGlFeFJl
bGVhc2VBbGxNdXRleGVzICgKICAgICAgICAgVGhyZWFkLT5DdXJyZW50U3luY0xldmVsID0gT2Jq
RGVzYy0+TXV0ZXguT3JpZ2luYWxTeW5jTGV2ZWw7CiAgICAgfQogfQotCi0K
--===============0073752090==--