From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 70/73] drm/i915: Move obj->active:5 to obj->flags Date: Mon, 1 Aug 2016 10:11:18 +0100 Message-ID: <1470042681-25318-71-git-send-email-chris@chris-wilson.co.uk> References: <1470042681-25318-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D8006E298 for ; Mon, 1 Aug 2016 09:13:15 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id o80so25252990wme.0 for ; Mon, 01 Aug 2016 02:13:15 -0700 (PDT) In-Reply-To: <1470042681-25318-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2UgYXJlIG1vdGl2YXRlZCB0byBhdm9pZCB1c2luZyBhIGJpdGZpZWxkIGZvciBvYmotPmFjdGl2 ZSBmb3IgYSBjb3VwbGUKb2YgcmVhc29ucy4gRmlyc3RseSwgd2Ugd2lzaCB0byBkb2N1bWVudCBv dXIgbG9ja2xlc3MgcmVhZCBvZiBvYmotPmFjdGl2ZQp1c2luZyBSRUFEX09OQ0UgaW5zaWRlIGk5 MTVfZ2VtX2J1c3lfaW9jdGwoKSBhbmQgdGhhdCByZXF1aXJlcyBhbgppbnRlZ3JhbCB0eXBlIChp LmUuIG5vdCBhIGJpdGZpZWxkKS4gU2Vjb25kbHksIGdjYyBwcm9kdWNlcyBhYnlzbWFsIGNvZGUK d2hlbiBwcmVzZW50ZWQgd2l0aCBhIGJpdGZpZWxkIGFuZCB0aGF0IHNob3dzIHVwIGhpZ2ggb24g dGhlIHByb2ZpbGVzIG9mCnJlcXVlc3QgdHJhY2tpbmcgKG1haW5seSBkdWUgdG8gZXhjZXNzIG1l bW9yeSB0cmFmZmljIGFzIGl0IGNvbnZlcnRzCnRoZSBiaXRmaWVsZCB0byBhIHJlZ2lzdGVyIGFu ZCBiYWNrIGFuZCBnZW5lcmF0ZXMgZnJlcXVlbnQgQUdJIGluIHRoZQpwcm9jZXNzKS4KCnYyOiBC SVQsIGJyZWFrIHVwIGEgbG9uZyBsaW5lIGluIGNvbXB1dGUgdGhlIG90aGVyIGVuZ2luZXMsIG5l dyBwYWludApmb3IgaTkxNV9nZW1fb2JqZWN0X2lzX2FjdGl2ZSAobm93IGk5MTVfZ2VtX29iamVj dF9nZXRfYWN0aXZlKS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMt d2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAg ICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAg fCAzNyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgICAgICAgICAgICB8IDE2ICsrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8IDIwICsrKysrKysrKysrKy0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMgICB8ICA1ICsrLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYyAgICB8ICAyICstCiA2IGZpbGVzIGNoYW5n ZWQsIDY0IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMKaW5kZXggMTBhMzQ2MjM3Nzk1Li45MjBhMmRlOTVjZDUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC05MSw3ICs5MSw3IEBAIHN0YXRpYyBpbnQgaTkxNV9j YXBhYmlsaXRpZXMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCiBzdGF0aWMgY2hh ciBnZXRfYWN0aXZlX2ZsYWcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKLQly ZXR1cm4gb2JqLT5hY3RpdmUgPyAnKicgOiAnICc7CisJcmV0dXJuIGk5MTVfZ2VtX29iamVjdF9p c19hY3RpdmUob2JqKSA/ICcqJyA6ICcgJzsKIH0KIAogc3RhdGljIGNoYXIgZ2V0X3Bpbl9mbGFn KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApp bmRleCAzZGU3NWU4MmNhNzYuLmRiNWRjNWJkNzhkOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CkBAIC0yMTU1LDEyICsyMTU1LDE2IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0IHsKIAog CXN0cnVjdCBsaXN0X2hlYWQgYmF0Y2hfcG9vbF9saW5rOwogCisJdW5zaWduZWQgbG9uZyBmbGFn czsKIAkvKioKIAkgKiBUaGlzIGlzIHNldCBpZiB0aGUgb2JqZWN0IGlzIG9uIHRoZSBhY3RpdmUg bGlzdHMgKGhhcyBwZW5kaW5nCiAJICogcmVuZGVyaW5nIGFuZCBzbyBhIG5vbi16ZXJvIHNlcW5v KSwgYW5kIGlzIG5vdCBzZXQgaWYgaXQgaSBzIG9uCiAJICogaW5hY3RpdmUgKHJlYWR5IHRvIGJl IHVuYm91bmQpIGxpc3QuCiAJICovCi0JdW5zaWduZWQgaW50IGFjdGl2ZTpJOTE1X05VTV9FTkdJ TkVTOworI2RlZmluZSBJOTE1X0JPX0FDVElWRV9TSElGVCAwCisjZGVmaW5lIEk5MTVfQk9fQUNU SVZFX01BU0sgKCgxIDw8IEk5MTVfTlVNX0VOR0lORVMpIC0gMSkKKyNkZWZpbmUgX19JOTE1X0JP X0FDVElWRShibykgXAorCSgoUkVBRF9PTkNFKChibyktPmZsYWdzKSA+PiBJOTE1X0JPX0FDVElW RV9TSElGVCkgJiBJOTE1X0JPX0FDVElWRV9NQVNLKQogCiAJLyoqCiAJICogVGhpcyBpcyBzZXQg aWYgdGhlIG9iamVjdCBoYXMgYmVlbiB3cml0dGVuIHRvIHNpbmNlIGxhc3QgYm91bmQKQEAgLTIz MjUsNiArMjMyOSwzNyBAQCBpOTE1X2dlbV9vYmplY3RfaGFzX3N0cnVjdF9wYWdlKGNvbnN0IHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJcmV0dXJuIG9iai0+b3BzLT5mbGFncyAm IEk5MTVfR0VNX09CSkVDVF9IQVNfU1RSVUNUX1BBR0U7CiB9CiAKK3N0YXRpYyBpbmxpbmUgdW5z aWduZWQgbG9uZworaTkxNV9nZW1fb2JqZWN0X2dldF9hY3RpdmUoY29uc3Qgc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaikKK3sKKwlyZXR1cm4gKG9iai0+ZmxhZ3MgPj4gSTkxNV9CT19B Q1RJVkVfU0hJRlQpICYgSTkxNV9CT19BQ1RJVkVfTUFTSzsKK30KKworc3RhdGljIGlubGluZSBi b29sCitpOTE1X2dlbV9vYmplY3RfaXNfYWN0aXZlKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmopCit7CisJcmV0dXJuIGk5MTVfZ2VtX29iamVjdF9nZXRfYWN0aXZlKG9iaik7 Cit9CisKK3N0YXRpYyBpbmxpbmUgdm9pZAoraTkxNV9nZW1fb2JqZWN0X3NldF9hY3RpdmUoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgaW50IGVuZ2luZSkKK3sKKwlvYmotPmZsYWdz IHw9IEJJVChlbmdpbmUgKyBJOTE1X0JPX0FDVElWRV9TSElGVCk7Cit9CisKK3N0YXRpYyBpbmxp bmUgdm9pZAoraTkxNV9nZW1fb2JqZWN0X2NsZWFyX2FjdGl2ZShzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqLCBpbnQgZW5naW5lKQoreworCW9iai0+ZmxhZ3MgJj0gfkJJVChlbmdpbmUg KyBJOTE1X0JPX0FDVElWRV9TSElGVCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgYm9vbAoraTkxNV9n ZW1fb2JqZWN0X2hhc19hY3RpdmVfZW5naW5lKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCisJCQkJICBpbnQgZW5naW5lKQoreworCXJldHVybiBvYmotPmZsYWdzICYgQklU KGVuZ2luZSArIEk5MTVfQk9fQUNUSVZFX1NISUZUKTsKK30KKwogLyoKICAqIE9wdGltaXNlZCBT R0wgaXRlcmF0b3IgZm9yIEdFTSBvYmplY3RzCiAgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmlu ZGV4IGM0ZTVjN2MxODkxYi4uYjQ0YThlMDM2MzczIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK QEAgLTEzNTQsNyArMTM1NCw3IEBAIGk5MTVfZ2VtX29iamVjdF93YWl0X3JlbmRlcmluZyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCiAJaWYgKCFyZWFkb25seSkgewogCQlhY3Rp dmUgPSBvYmotPmxhc3RfcmVhZDsKLQkJYWN0aXZlX21hc2sgPSBvYmotPmFjdGl2ZTsKKwkJYWN0 aXZlX21hc2sgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X2FjdGl2ZShvYmopOwogCX0gZWxzZSB7CiAJ CWFjdGl2ZV9tYXNrID0gMTsKIAkJYWN0aXZlID0gJm9iai0+bGFzdF93cml0ZTsKQEAgLTEzOTgs NyArMTM5OCw3IEBAIGk5MTVfZ2VtX29iamVjdF93YWl0X3JlbmRlcmluZ19fbm9uYmxvY2tpbmco c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlCVUdfT04oIW11dGV4X2lzX2xvY2tl ZCgmZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIAlCVUdfT04oIWRldl9wcml2LT5tbS5pbnRlcnJ1cHRp YmxlKTsKIAotCWFjdGl2ZV9tYXNrID0gb2JqLT5hY3RpdmU7CisJYWN0aXZlX21hc2sgPSBpOTE1 X2dlbV9vYmplY3RfZ2V0X2FjdGl2ZShvYmopOwogCWlmICghYWN0aXZlX21hc2spCiAJCXJldHVy biAwOwogCkBAIC0yMzYxLDEwICsyMzYxLDEwIEBAIGk5MTVfZ2VtX29iamVjdF9yZXRpcmVfX3Jl YWQoc3RydWN0IGk5MTVfZ2VtX2FjdGl2ZSAqYWN0aXZlLAogCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmogPQogCQljb250YWluZXJfb2YoYWN0aXZlLCBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCwgbGFzdF9yZWFkW2lkeF0pOwogCi0JR0VNX0JVR19PTigob2JqLT5hY3RpdmUgJiAo MSA8PCBpZHgpKSA9PSAwKTsKKwlHRU1fQlVHX09OKCFpOTE1X2dlbV9vYmplY3RfaGFzX2FjdGl2 ZV9lbmdpbmUob2JqLCBpZHgpKTsKIAotCW9iai0+YWN0aXZlICY9IH4oMSA8PCBpZHgpOwotCWlm IChvYmotPmFjdGl2ZSkKKwlpOTE1X2dlbV9vYmplY3RfY2xlYXJfYWN0aXZlKG9iaiwgaWR4KTsK KwlpZiAoaTkxNV9nZW1fb2JqZWN0X2lzX2FjdGl2ZShvYmopKQogCQlyZXR1cm47CiAKIAkvKiBC dW1wIG91ciBwbGFjZSBvbiB0aGUgYm91bmQgbGlzdCB0byBrZWVwIGl0IHJvdWdobHkgaW4gTFJV IG9yZGVyCkBAIC0yNjY4LDcgKzI2NjgsNyBAQCBpOTE1X2dlbV93YWl0X2lvY3RsKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAkJcmV0 dXJuIC1FTk9FTlQ7CiAJfQogCi0JaWYgKCFvYmotPmFjdGl2ZSkKKwlpZiAoIWk5MTVfZ2VtX29i amVjdF9pc19hY3RpdmUob2JqKSkKIAkJZ290byBvdXQ7CiAKIAlmb3IgKGkgPSAwOyBpIDwgSTkx NV9OVU1fRU5HSU5FUzsgaSsrKSB7CkBAIC0yNzU2LDcgKzI3NTYsNyBAQCBpOTE1X2dlbV9vYmpl Y3Rfc3luYyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCiAJbG9ja2RlcF9hc3Nl cnRfaGVsZCgmb2JqLT5iYXNlLmRldi0+c3RydWN0X211dGV4KTsKIAotCWFjdGl2ZV9tYXNrID0g b2JqLT5hY3RpdmU7CisJYWN0aXZlX21hc2sgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X2FjdGl2ZShv YmopOwogCWlmICghYWN0aXZlX21hc2spCiAJCXJldHVybiAwOwogCkBAIC0zODAyLDcgKzM4MDIs NyBAQCBpOTE1X2dlbV9idXN5X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsCiAJICogYmVjb21lIG5vbi1idXN5IHdpdGhvdXQgYW55IGZ1cnRoZXIgYWN0aW9ucy4KIAkg Ki8KIAlhcmdzLT5idXN5ID0gMDsKLQlpZiAob2JqLT5hY3RpdmUpIHsKKwlpZiAoaTkxNV9nZW1f b2JqZWN0X2lzX2FjdGl2ZShvYmopKSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxOwogCQlpbnQgaTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCmluZGV4IDEwOWJiOWQ4ZGY0YS4uM2E2OGZmYWE1NWU2IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC00MzMsNyArNDMzLDcgQEAgcmVsb2NhdGVf ZW50cnlfY2xmbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCiBzdGF0aWMg Ym9vbCBvYmplY3RfaXNfaWRsZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogewot CXVuc2lnbmVkIGxvbmcgYWN0aXZlID0gb2JqLT5hY3RpdmU7CisJdW5zaWduZWQgbG9uZyBhY3Rp dmUgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X2FjdGl2ZShvYmopOwogCWludCBpZHg7CiAKIAlmb3Jf ZWFjaF9hY3RpdmUoYWN0aXZlLCBpZHgpIHsKQEAgLTk4OSwxMSArOTg5LDIxIEBAIGVycjoKIAly ZXR1cm4gcmV0OwogfQogCitzdGF0aWMgdW5zaWduZWQgaW50IGViX290aGVyX2VuZ2luZXMoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCit7CisJdW5zaWduZWQgaW50IG1hc2s7CisK KwltYXNrID0gfmludGVsX2VuZ2luZV9mbGFnKHJlcS0+ZW5naW5lKSAmIEk5MTVfQk9fQUNUSVZF X01BU0s7CisJbWFzayA8PD0gSTkxNV9CT19BQ1RJVkVfU0hJRlQ7CisKKwlyZXR1cm4gbWFzazsK K30KKwogc3RhdGljIGludAogaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2dwdShzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCQlzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKQog ewotCWNvbnN0IHVuc2lnbmVkIG90aGVyX3JpbmdzID0gfmludGVsX2VuZ2luZV9mbGFnKHJlcS0+ ZW5naW5lKTsKKwljb25zdCB1bnNpZ25lZCBpbnQgb3RoZXJfcmluZ3MgPSBlYl9vdGhlcl9lbmdp bmVzKHJlcSk7CiAJc3RydWN0IGk5MTVfdm1hICp2bWE7CiAJdWludDMyX3QgZmx1c2hfZG9tYWlu cyA9IDA7CiAJYm9vbCBmbHVzaF9jaGlwc2V0ID0gZmFsc2U7CkBAIC0xMDAyLDcgKzEwMTIsNyBA QCBpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxLAogCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCB2bWFzLCBleGVjX2xpc3QpIHsK IAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHZtYS0+b2JqOwogCi0JCWlmIChv YmotPmFjdGl2ZSAmIG90aGVyX3JpbmdzKSB7CisJCWlmIChvYmotPmZsYWdzICYgb3RoZXJfcmlu Z3MpIHsKIAkJCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmVxKTsKIAkJCWlmIChy ZXQpCiAJCQkJcmV0dXJuIHJldDsKQEAgLTExNjUsOSArMTE3NSw5IEBAIHZvaWQgaTkxNV92bWFf bW92ZV90b19hY3RpdmUoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJICogYWRkIHRoZSBhY3RpdmUg cmVmZXJlbmNlIGZpcnN0IGFuZCBxdWV1ZSBmb3IgaXQgdG8gYmUgZHJvcHBlZAogCSAqICpsYXN0 Ki4KIAkgKi8KLQlpZiAob2JqLT5hY3RpdmUgPT0gMCkKKwlpZiAoIWk5MTVfZ2VtX29iamVjdF9p c19hY3RpdmUob2JqKSkKIAkJaTkxNV9nZW1fb2JqZWN0X2dldChvYmopOwotCW9iai0+YWN0aXZl IHw9IDEgPDwgaWR4OworCWk5MTVfZ2VtX29iamVjdF9zZXRfYWN0aXZlKG9iaiwgaWR4KTsKIAlp OTE1X2dlbV9hY3RpdmVfc2V0KCZvYmotPmxhc3RfcmVhZFtpZHhdLCByZXEpOwogCiAJaWYgKGZs YWdzICYgRVhFQ19PQkpFQ1RfV1JJVEUpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9z aHJpbmtlci5jCmluZGV4IGI1Nzc2MzU4YzA1ZS4uYmNkODViZGJjMjVmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtlci5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMKQEAgLTE4Miw3ICsxODIsOCBAQCBpOTE1X2dl bV9zaHJpbmsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICFpc192 bWFsbG9jX2FkZHIob2JqLT5tYXBwaW5nKSkKIAkJCQljb250aW51ZTsKIAotCQkJaWYgKChmbGFn cyAmIEk5MTVfU0hSSU5LX0FDVElWRSkgPT0gMCAmJiBvYmotPmFjdGl2ZSkKKwkJCWlmICgoZmxh Z3MgJiBJOTE1X1NIUklOS19BQ1RJVkUpID09IDAgJiYKKwkJCSAgICBpOTE1X2dlbV9vYmplY3Rf aXNfYWN0aXZlKG9iaikpCiAJCQkJY29udGludWU7CiAKIAkJCWlmICghY2FuX3JlbGVhc2VfcGFn ZXMob2JqKSkKQEAgLTI2Nyw3ICsyNjgsNyBAQCBpOTE1X2dlbV9zaHJpbmtlcl9jb3VudChzdHJ1 Y3Qgc2hyaW5rZXIgKnNocmlua2VyLCBzdHJ1Y3Qgc2hyaW5rX2NvbnRyb2wgKnNjKQogCQkJY291 bnQgKz0gb2JqLT5iYXNlLnNpemUgPj4gUEFHRV9TSElGVDsKIAogCWxpc3RfZm9yX2VhY2hfZW50 cnkob2JqLCAmZGV2X3ByaXYtPm1tLmJvdW5kX2xpc3QsIGdsb2JhbF9saXN0KSB7Ci0JCWlmICgh b2JqLT5hY3RpdmUgJiYgY2FuX3JlbGVhc2VfcGFnZXMob2JqKSkKKwkJaWYgKCFpOTE1X2dlbV9v YmplY3RfaXNfYWN0aXZlKG9iaikgJiYgY2FuX3JlbGVhc2VfcGFnZXMob2JqKSkKIAkJCWNvdW50 ICs9IG9iai0+YmFzZS5zaXplID4+IFBBR0VfU0hJRlQ7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV91c2VycHRyLmMKaW5kZXggNjUxYTg0YmE4NDBjLi41M2Y2NGZjYzg5ZWYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMKQEAgLTY3LDcgKzY3LDcgQEAg c3RhdGljIHZvaWQgd2FpdF9yZW5kZXJpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aikKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3RzW0k5MTVfTlVNX0VOR0lO RVNdOwogCWludCBpLCBuOwogCi0JaWYgKCFvYmotPmFjdGl2ZSkKKwlpZiAoIWk5MTVfZ2VtX29i amVjdF9pc19hY3RpdmUob2JqKSkKIAkJcmV0dXJuOwogCiAJbiA9IDA7Ci0tIAoyLjguMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==