From: Mika Kuoppala Subject: [PATCH 1/8] drm/i915: Make own struct for execlist items Date: Tue, 12 Sep 2017 11:36:11 +0300 Message-ID: <20170912083618.13009-2-mika.kuoppala@intel.com> References: <20170912083618.13009-1-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0C496E58D for ; Tue, 12 Sep 2017 08:40:19 +0000 (UTC) In-Reply-To: <20170912083618.13009-1-mika.kuoppala@intel.com> 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 RW5naW5lJ3MgZXhlY2xpc3QgcmVsYXRlZCBpdGVtcyBoYXZlIGJlZW4gaW5jcmVhc2luZyB0bwph IHBvaW50IHdoZXJlIGEgc2VwYXJhdGUgc3RydWN0IGlzIHdhcnJhbnRlZC4gQ2FydmUgZXhlY2xp c3QKc3BlY2lmaWMgaXRlbXMgdG8gYSBkZWRpY2F0ZWQgc3RydWN0IHRvIGFkZCBjbGFyaXR5LgoK djI6IGFkZCBrZXJuZWxkb2MgYW5kIGZpeCB3aGl0ZXNwYWNlIChKb29uYXMsIENocmlzKQoKU3Vn Z2VzdGVkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogSm9vbmFzIExhaHRpbmVu IDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1 b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KQWNrZWQtYnk6IEpvb25hcyBMYWh0aW5l biA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYyAgICAgICAgfCAgNiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyAgICAgICAgICAgIHwgMTYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dwdV9lcnJvci5jICAgICAgfCAgNCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n dWNfc3VibWlzc2lvbi5jIHwgMTkgKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYyAgICAgICAgICAgIHwgIDUgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2lu ZV9jcy5jICAgICB8IDEyICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAg ICAgICAgICB8IDY0ICsrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaCAgICB8IDg4ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LQogOCBmaWxlcyBjaGFuZ2VkLCAxMzQgaW5zZXJ0aW9ucygrKSwgODAgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCA2MzM4MDE4ZjY1NWQuLmNjMzY0MDk5 MzZkYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTMzNDQsMTAgKzMzNDQs MTAgQEAgc3RhdGljIGludCBpOTE1X2VuZ2luZV9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9p ZCAqdW51c2VkKQogCQkJfQogCiAJCQlyY3VfcmVhZF9sb2NrKCk7Ci0JCQlmb3IgKGlkeCA9IDA7 IGlkeCA8IEFSUkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdF9wb3J0KTsgaWR4KyspIHsKKwkJCWZv ciAoaWR4ID0gMDsgaWR4IDwgQVJSQVlfU0laRShlbmdpbmUtPmV4ZWNsaXN0LnBvcnQpOyBpZHgr KykgewogCQkJCXVuc2lnbmVkIGludCBjb3VudDsKIAotCQkJCXJxID0gcG9ydF91bnBhY2soJmVu Z2luZS0+ZXhlY2xpc3RfcG9ydFtpZHhdLAorCQkJCXJxID0gcG9ydF91bnBhY2soJmVuZ2luZS0+ ZXhlY2xpc3QucG9ydFtpZHhdLAogCQkJCQkJICZjb3VudCk7CiAJCQkJaWYgKHJxKSB7CiAJCQkJ CXNlcV9wcmludGYobSwgIlx0XHRFTFNQWyVkXSBjb3VudD0lZCwgIiwKQEAgLTMzNjEsNyArMzM2 MSw3IEBAIHN0YXRpYyBpbnQgaTkxNV9lbmdpbmVfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZv aWQgKnVudXNlZCkKIAkJCXJjdV9yZWFkX3VubG9jaygpOwogCiAJCQlzcGluX2xvY2tfaXJxKCZl bmdpbmUtPnRpbWVsaW5lLT5sb2NrKTsKLQkJCWZvciAocmIgPSBlbmdpbmUtPmV4ZWNsaXN0X2Zp cnN0OyByYjsgcmIgPSByYl9uZXh0KHJiKSl7CisJCQlmb3IgKHJiID0gZW5naW5lLT5leGVjbGlz dC5maXJzdDsgcmI7IHJiID0gcmJfbmV4dChyYikpIHsKIAkJCQlzdHJ1Y3QgaTkxNV9wcmlvbGlz dCAqcCA9CiAJCQkJCXJiX2VudHJ5KHJiLCB0eXBlb2YoKnApLCBub2RlKTsKIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKaW5kZXggZjQ0NTU4N2MxYTRiLi43ZDAyNjNlOWMyMjAgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwpAQCAtMjgxNSw4ICsyODE1LDggQEAgaTkxNV9nZW1fcmVzZXRfcHJlcGFy ZV9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCSAqIFR1cm5pbmcgb2Zm IHRoZSBlbmdpbmUtPmlycV90YXNrbGV0IHVudGlsIHRoZSByZXNldCBpcyBvdmVyCiAJICogcHJl dmVudHMgdGhlIHJhY2UuCiAJICovCi0JdGFza2xldF9raWxsKCZlbmdpbmUtPmlycV90YXNrbGV0 KTsKLQl0YXNrbGV0X2Rpc2FibGUoJmVuZ2luZS0+aXJxX3Rhc2tsZXQpOworCXRhc2tsZXRfa2ls bCgmZW5naW5lLT5leGVjbGlzdC5pcnFfdGFza2xldCk7CisJdGFza2xldF9kaXNhYmxlKCZlbmdp bmUtPmV4ZWNsaXN0LmlycV90YXNrbGV0KTsKIAogCWlmIChlbmdpbmUtPmlycV9zZXFub19iYXJy aWVyKQogCQllbmdpbmUtPmlycV9zZXFub19iYXJyaWVyKGVuZ2luZSk7CkBAIC0yOTk1LDcgKzI5 OTUsNyBAQCB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAogdm9pZCBpOTE1X2dlbV9yZXNldF9maW5pc2hfZW5naW5lKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKIHsKLQl0YXNrbGV0X2VuYWJsZSgmZW5naW5lLT5pcnFfdGFza2xl dCk7CisJdGFza2xldF9lbmFibGUoJmVuZ2luZS0+ZXhlY2xpc3QuaXJxX3Rhc2tsZXQpOwogCWt0 aHJlYWRfdW5wYXJrKGVuZ2luZS0+YnJlYWRjcnVtYnMuc2lnbmFsZXIpOwogfQogCkBAIC0zMDQ3 LDE3ICszMDQ3LDE3IEBAIHN0YXRpYyB2b2lkIGVuZ2luZV9zZXRfd2VkZ2VkKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkgKi8KIAogCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMp IHsKLQkJc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0X3BvcnQ7 CisJCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlzdC5wb3J0Owog CQl1bnNpZ25lZCBsb25nIGZsYWdzOwogCQl1bnNpZ25lZCBpbnQgbjsKIAogCQlzcGluX2xvY2tf aXJxc2F2ZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3MpOwogCi0JCWZvciAobiA9IDA7 IG4gPCBBUlJBWV9TSVpFKGVuZ2luZS0+ZXhlY2xpc3RfcG9ydCk7IG4rKykKKwkJZm9yIChuID0g MDsgbiA8IEFSUkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdC5wb3J0KTsgbisrKQogCQkJaTkxNV9n ZW1fcmVxdWVzdF9wdXQocG9ydF9yZXF1ZXN0KCZwb3J0W25dKSk7Ci0JCW1lbXNldChlbmdpbmUt PmV4ZWNsaXN0X3BvcnQsIDAsIHNpemVvZihlbmdpbmUtPmV4ZWNsaXN0X3BvcnQpKTsKLQkJZW5n aW5lLT5leGVjbGlzdF9xdWV1ZSA9IFJCX1JPT1Q7Ci0JCWVuZ2luZS0+ZXhlY2xpc3RfZmlyc3Qg PSBOVUxMOworCQltZW1zZXQoZW5naW5lLT5leGVjbGlzdC5wb3J0LCAwLCBzaXplb2YoZW5naW5l LT5leGVjbGlzdC5wb3J0KSk7CisJCWVuZ2luZS0+ZXhlY2xpc3QucXVldWUgPSBSQl9ST09UOwor CQllbmdpbmUtPmV4ZWNsaXN0LmZpcnN0ID0gTlVMTDsKIAogCQlzcGluX3VubG9ja19pcnFyZXN0 b3JlKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrLCBmbGFncyk7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dwdV9lcnJvci5jCmluZGV4IGVkNWExZWI4MzlhZC4uNjExNGJmNzkyMTlkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTEzMjcsMTAgKzEzMjcsMTAgQEAgc3Rh dGljIHZvaWQgZW5naW5lX3JlY29yZF9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUsCiBzdGF0aWMgdm9pZCBlcnJvcl9yZWNvcmRfZW5naW5lX2V4ZWNsaXN0cyhzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQkJCSAgc3RydWN0IGRybV9pOTE1X2Vycm9yX2Vu Z2luZSAqZWUpCiB7Ci0JY29uc3Qgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUt PmV4ZWNsaXN0X3BvcnQ7CisJY29uc3Qgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdp bmUtPmV4ZWNsaXN0LnBvcnQ7CiAJdW5zaWduZWQgaW50IG47CiAKLQlmb3IgKG4gPSAwOyBuIDwg QVJSQVlfU0laRShlbmdpbmUtPmV4ZWNsaXN0X3BvcnQpOyBuKyspIHsKKwlmb3IgKG4gPSAwOyBu IDwgQVJSQVlfU0laRShlbmdpbmUtPmV4ZWNsaXN0LnBvcnQpOyBuKyspIHsKIAkJc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpycSA9IHBvcnRfcmVxdWVzdCgmcG9ydFtuXSk7CiAKIAkJaWYg KCFycSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCA0 OGExZTkzNDlhMmMuLmY5NWRlZmUxODg4NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYwpAQCAtNjYxLDIxICs2NjEsMjIgQEAgc3RhdGljIHZvaWQgcG9ydF9h c3NpZ24oc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQsCiAKIHN0YXRpYyBib29sIGk5MTVfZ3Vj X2RlcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBleGVj bGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlzdF9wb3J0OworCXN0cnVjdCBpbnRlbF9l bmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCA9ICZlbmdpbmUtPmV4ZWNsaXN0OworCXN0cnVjdCBl eGVjbGlzdF9wb3J0ICpwb3J0ID0gZWwtPnBvcnQ7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpsYXN0ID0gcG9ydF9yZXF1ZXN0KHBvcnQpOwogCXN0cnVjdCByYl9ub2RlICpyYjsKIAli b29sIHN1Ym1pdCA9IGZhbHNlOwogCiAJc3Bpbl9sb2NrX2lycSgmZW5naW5lLT50aW1lbGluZS0+ bG9jayk7Ci0JcmIgPSBlbmdpbmUtPmV4ZWNsaXN0X2ZpcnN0OwotCUdFTV9CVUdfT04ocmJfZmly c3QoJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpICE9IHJiKTsKKwlyYiA9IGVsLT5maXJzdDsKKwlH RU1fQlVHX09OKHJiX2ZpcnN0KCZlbC0+cXVldWUpICE9IHJiKTsKIAl3aGlsZSAocmIpIHsKIAkJ c3RydWN0IGk5MTVfcHJpb2xpc3QgKnAgPSByYl9lbnRyeShyYiwgdHlwZW9mKCpwKSwgbm9kZSk7 CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEsICpybjsKIAogCQlsaXN0X2Zvcl9l YWNoX2VudHJ5X3NhZmUocnEsIHJuLCAmcC0+cmVxdWVzdHMsIHByaW90cmVlLmxpbmspIHsKIAkJ CWlmIChsYXN0ICYmIHJxLT5jdHggIT0gbGFzdC0+Y3R4KSB7Ci0JCQkJaWYgKHBvcnQgIT0gZW5n aW5lLT5leGVjbGlzdF9wb3J0KSB7CisJCQkJaWYgKHBvcnQgIT0gZWwtPnBvcnQpIHsKIAkJCQkJ X19saXN0X2RlbF9tYW55KCZwLT5yZXF1ZXN0cywKIAkJCQkJCQkmcnEtPnByaW90cmVlLmxpbmsp OwogCQkJCQlnb3RvIGRvbmU7CkBAIC02OTYsMTMgKzY5NywxMyBAQCBzdGF0aWMgYm9vbCBpOTE1 X2d1Y19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJfQogCiAJCXJi ID0gcmJfbmV4dChyYik7Ci0JCXJiX2VyYXNlKCZwLT5ub2RlLCAmZW5naW5lLT5leGVjbGlzdF9x dWV1ZSk7CisJCXJiX2VyYXNlKCZwLT5ub2RlLCAmZWwtPnF1ZXVlKTsKIAkJSU5JVF9MSVNUX0hF QUQoJnAtPnJlcXVlc3RzKTsKIAkJaWYgKHAtPnByaW9yaXR5ICE9IEk5MTVfUFJJT1JJVFlfTk9S TUFMKQogCQkJa21lbV9jYWNoZV9mcmVlKGVuZ2luZS0+aTkxNS0+cHJpb3JpdGllcywgcCk7CiAJ fQogZG9uZToKLQllbmdpbmUtPmV4ZWNsaXN0X2ZpcnN0ID0gcmI7CisJZWwtPmZpcnN0ID0gcmI7 CiAJaWYgKHN1Ym1pdCkKIAkJcG9ydF9hc3NpZ24ocG9ydCwgbGFzdCk7CiAJc3Bpbl91bmxvY2tf aXJxKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrKTsKQEAgLTcxMiw4ICs3MTMsOCBAQCBzdGF0aWMg Ym9vbCBpOTE1X2d1Y19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAog c3RhdGljIHZvaWQgaTkxNV9ndWNfaXJxX2hhbmRsZXIodW5zaWduZWQgbG9uZyBkYXRhKQogewot CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICopZGF0YTsKLQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGVuZ2luZS0+ZXhlY2xpc3Rf cG9ydDsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICogY29uc3QgZW5naW5lID0gKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKilkYXRhOworCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZW5n aW5lLT5leGVjbGlzdC5wb3J0OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7CiAJ Ym9vbCBzdWJtaXQ7CiAKQEAgLTEyNTYsNyArMTI1Nyw3IEBAIGludCBpOTE1X2d1Y19zdWJtaXNz aW9uX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCSAqIHRha2Ug b3ZlciB0aGUgY2FsbGJhY2sgd2l0aG91dCBjaGFuZ2luZyBhbnkgb3RoZXIgc3RhdGUKIAkJICog aW4gdGhlIHRhc2tsZXQuCiAJCSAqLwotCQllbmdpbmUtPmlycV90YXNrbGV0LmZ1bmMgPSBpOTE1 X2d1Y19pcnFfaGFuZGxlcjsKKwkJZW5naW5lLT5leGVjbGlzdC5pcnFfdGFza2xldC5mdW5jID0g aTkxNV9ndWNfaXJxX2hhbmRsZXI7CiAJCWNsZWFyX2JpdChFTkdJTkVfSVJRX0VYRUNMSVNULCAm ZW5naW5lLT5pcnFfcG9zdGVkKTsKIAogCQkvKiBSZXBsYXkgdGhlIGN1cnJlbnQgc2V0IG9mIHBy ZXZpb3VzbHkgc3VibWl0dGVkIHJlcXVlc3RzICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRl eCA1ZDM5MWU2ODkwNzAuLmUxNmZiZWEwMzgyMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBA IC0xMzA4LDEwICsxMzA4LDExIEBAIHN0YXRpYyB2b2lkIHNuYl9ndF9pcnFfaGFuZGxlcihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgdm9pZAogZ2VuOF9jc19pcnFf aGFuZGxlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIHUzMiBpaXIsIGludCB0ZXN0 X3NoaWZ0KQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCA9ICZl bmdpbmUtPmV4ZWNsaXN0OwogCWJvb2wgdGFza2xldCA9IGZhbHNlOwogCiAJaWYgKGlpciAmIChH VF9DT05URVhUX1NXSVRDSF9JTlRFUlJVUFQgPDwgdGVzdF9zaGlmdCkpIHsKLQkJaWYgKHBvcnRf Y291bnQoJmVuZ2luZS0+ZXhlY2xpc3RfcG9ydFswXSkpIHsKKwkJaWYgKHBvcnRfY291bnQoJmVs LT5wb3J0WzBdKSkgewogCQkJX19zZXRfYml0KEVOR0lORV9JUlFfRVhFQ0xJU1QsICZlbmdpbmUt PmlycV9wb3N0ZWQpOwogCQkJdGFza2xldCA9IHRydWU7CiAJCX0KQEAgLTEzMjMsNyArMTMyNCw3 IEBAIGdlbjhfY3NfaXJxX2hhbmRsZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1 MzIgaWlyLCBpbnQgdGVzdF9zaGlmdCkKIAl9CiAKIAlpZiAodGFza2xldCkKLQkJdGFza2xldF9o aV9zY2hlZHVsZSgmZW5naW5lLT5pcnFfdGFza2xldCk7CisJCXRhc2tsZXRfaGlfc2NoZWR1bGUo JmVsLT5pcnFfdGFza2xldCk7CiB9CiAKIHN0YXRpYyBpcnFyZXR1cm5fdCBnZW44X2d0X2lycV9h Y2soc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9lbmdpbmVfY3MuYwppbmRleCAzYWU4OWE5ZDYyNDEuLjYxOTdkZjBkZTNmZSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKQEAgLTM5MSw4ICszOTEsOCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF90aW1lbGluZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpCiAgKi8KIHZvaWQgaW50ZWxfZW5naW5lX3NldHVwX2NvbW1vbihzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JZW5naW5lLT5leGVjbGlzdF9xdWV1ZSA9IFJCX1JP T1Q7Ci0JZW5naW5lLT5leGVjbGlzdF9maXJzdCA9IE5VTEw7CisJZW5naW5lLT5leGVjbGlzdC5x dWV1ZSA9IFJCX1JPT1Q7CisJZW5naW5lLT5leGVjbGlzdC5maXJzdCA9IE5VTEw7CiAKIAlpbnRl bF9lbmdpbmVfaW5pdF90aW1lbGluZShlbmdpbmUpOwogCWludGVsX2VuZ2luZV9pbml0X2hhbmdj aGVjayhlbmdpbmUpOwpAQCAtMTMzNCwxMSArMTMzNCwxMSBAQCBib29sIGludGVsX2VuZ2luZV9p c19pZGxlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJcmV0dXJuIGZhbHNlOwog CiAJLyogQm90aCBwb3J0cyBkcmFpbmVkLCBubyBtb3JlIEVMU1Agc3VibWlzc2lvbj8gKi8KLQlp ZiAocG9ydF9yZXF1ZXN0KCZlbmdpbmUtPmV4ZWNsaXN0X3BvcnRbMF0pKQorCWlmIChwb3J0X3Jl cXVlc3QoJmVuZ2luZS0+ZXhlY2xpc3QucG9ydFswXSkpCiAJCXJldHVybiBmYWxzZTsKIAogCS8q IEVMU1AgaXMgZW1wdHksIGJ1dCB0aGVyZSBhcmUgcmVhZHkgcmVxdWVzdHM/ICovCi0JaWYgKFJF QURfT05DRShlbmdpbmUtPmV4ZWNsaXN0X2ZpcnN0KSkKKwlpZiAoUkVBRF9PTkNFKGVuZ2luZS0+ ZXhlY2xpc3QuZmlyc3QpKQogCQlyZXR1cm4gZmFsc2U7CiAKIAkvKiBSaW5nIHN0b3BwZWQ/ICov CkBAIC0xMzg3LDggKzEzODcsOCBAQCB2b2lkIGludGVsX2VuZ2luZXNfbWFya19pZGxlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGk5MTUs IGlkKSB7CiAJCWludGVsX2VuZ2luZV9kaXNhcm1fYnJlYWRjcnVtYnMoZW5naW5lKTsKIAkJaTkx NV9nZW1fYmF0Y2hfcG9vbF9maW5pKCZlbmdpbmUtPmJhdGNoX3Bvb2wpOwotCQl0YXNrbGV0X2tp bGwoJmVuZ2luZS0+aXJxX3Rhc2tsZXQpOwotCQllbmdpbmUtPm5vX3ByaW9saXN0ID0gZmFsc2U7 CisJCXRhc2tsZXRfa2lsbCgmZW5naW5lLT5leGVjbGlzdC5pcnFfdGFza2xldCk7CisJCWVuZ2lu ZS0+ZXhlY2xpc3Qubm9fcHJpb2xpc3QgPSBmYWxzZTsKIAl9CiB9CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKaW5kZXggZDg5ZTFiOGUxY2M1Li4yOTY0ZTdjMGE4NzMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCkBAIC0zMzgsMTIgKzMzOCwxMiBAQCBzdGF0aWMgdTY0IGV4ZWNsaXN0c191 cGRhdGVfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQogCiBzdGF0aWMg dm9pZCBleGVjbGlzdHNfc3VibWl0X3BvcnRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKIHsKLQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGVuZ2luZS0+ZXhlY2xpc3RfcG9y dDsKKwlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGVuZ2luZS0+ZXhlY2xpc3QucG9ydDsK IAl1MzIgX19pb21lbSAqZWxzcCA9CiAJCWVuZ2luZS0+aTkxNS0+cmVncyArIGk5MTVfbW1pb19y ZWdfb2Zmc2V0KFJJTkdfRUxTUChlbmdpbmUpKTsKIAl1bnNpZ25lZCBpbnQgbjsKIAotCWZvciAo biA9IEFSUkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdF9wb3J0KTsgbi0tOyApIHsKKwlmb3IgKG4g PSBBUlJBWV9TSVpFKGVuZ2luZS0+ZXhlY2xpc3QucG9ydCk7IG4tLTsgKSB7CiAJCXN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7CiAJCXVuc2lnbmVkIGludCBjb3VudDsKIAkJdTY0IGRl c2M7CkBAIC0zOTgsNyArMzk4LDcgQEAgc3RhdGljIHZvaWQgcG9ydF9hc3NpZ24oc3RydWN0IGV4 ZWNsaXN0X3BvcnQgKnBvcnQsCiBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpsYXN0OwotCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlzdF9w b3J0OworCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlzdC5wb3J0 OwogCXN0cnVjdCByYl9ub2RlICpyYjsKIAlib29sIHN1Ym1pdCA9IGZhbHNlOwogCkBAIC00MzYs OCArNDM2LDggQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2RlcXVldWUoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQogCSAqLwogCiAJc3Bpbl9sb2NrX2lycSgmZW5naW5lLT50aW1lbGlu ZS0+bG9jayk7Ci0JcmIgPSBlbmdpbmUtPmV4ZWNsaXN0X2ZpcnN0OwotCUdFTV9CVUdfT04ocmJf Zmlyc3QoJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpICE9IHJiKTsKKwlyYiA9IGVuZ2luZS0+ZXhl Y2xpc3QuZmlyc3Q7CisJR0VNX0JVR19PTihyYl9maXJzdCgmZW5naW5lLT5leGVjbGlzdC5xdWV1 ZSkgIT0gcmIpOwogCXdoaWxlIChyYikgewogCQlzdHJ1Y3QgaTkxNV9wcmlvbGlzdCAqcCA9IHJi X2VudHJ5KHJiLCB0eXBlb2YoKnApLCBub2RlKTsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpycSwgKnJuOwpAQCAtNDYwLDcgKzQ2MCw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19k ZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJCQkgKiBjb21iaW5lIHRo aXMgcmVxdWVzdCB3aXRoIHRoZSBsYXN0LCB0aGVuIHdlCiAJCQkJICogYXJlIGRvbmUuCiAJCQkJ ICovCi0JCQkJaWYgKHBvcnQgIT0gZW5naW5lLT5leGVjbGlzdF9wb3J0KSB7CisJCQkJaWYgKHBv cnQgIT0gZW5naW5lLT5leGVjbGlzdC5wb3J0KSB7CiAJCQkJCV9fbGlzdF9kZWxfbWFueSgmcC0+ cmVxdWVzdHMsCiAJCQkJCQkJJnJxLT5wcmlvdHJlZS5saW5rKTsKIAkJCQkJZ290byBkb25lOwpA QCAtNDk3LDEzICs0OTcsMTMgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2RlcXVldWUoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCQl9CiAKIAkJcmIgPSByYl9uZXh0KHJiKTsKLQkJ cmJfZXJhc2UoJnAtPm5vZGUsICZlbmdpbmUtPmV4ZWNsaXN0X3F1ZXVlKTsKKwkJcmJfZXJhc2Uo JnAtPm5vZGUsICZlbmdpbmUtPmV4ZWNsaXN0LnF1ZXVlKTsKIAkJSU5JVF9MSVNUX0hFQUQoJnAt PnJlcXVlc3RzKTsKIAkJaWYgKHAtPnByaW9yaXR5ICE9IEk5MTVfUFJJT1JJVFlfTk9STUFMKQog CQkJa21lbV9jYWNoZV9mcmVlKGVuZ2luZS0+aTkxNS0+cHJpb3JpdGllcywgcCk7CiAJfQogZG9u ZToKLQllbmdpbmUtPmV4ZWNsaXN0X2ZpcnN0ID0gcmI7CisJZW5naW5lLT5leGVjbGlzdC5maXJz dCA9IHJiOwogCWlmIChzdWJtaXQpCiAJCXBvcnRfYXNzaWduKHBvcnQsIGxhc3QpOwogCXNwaW5f dW5sb2NrX2lycSgmZW5naW5lLT50aW1lbGluZS0+bG9jayk7CkBAIC01MTQsNyArNTE0LDcgQEAg c3RhdGljIHZvaWQgZXhlY2xpc3RzX2RlcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogCiBzdGF0aWMgYm9vbCBleGVjbGlzdHNfZWxzcF9yZWFkeShjb25zdCBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JY29uc3Qgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBv cnQgPSBlbmdpbmUtPmV4ZWNsaXN0X3BvcnQ7CisJY29uc3Qgc3RydWN0IGV4ZWNsaXN0X3BvcnQg KnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0LnBvcnQ7CiAKIAlyZXR1cm4gcG9ydF9jb3VudCgmcG9y dFswXSkgKyBwb3J0X2NvdW50KCZwb3J0WzFdKSA8IDI7CiB9CkBAIC01MjUsOCArNTI1LDkgQEAg c3RhdGljIGJvb2wgZXhlY2xpc3RzX2Vsc3BfcmVhZHkoY29uc3Qgc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogICovCiBzdGF0aWMgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIodW5z aWduZWQgbG9uZyBkYXRhKQogewotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICopZGF0YTsKLQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9y dCA9IGVuZ2luZS0+ZXhlY2xpc3RfcG9ydDsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICogY29u c3QgZW5naW5lID0gKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKilkYXRhOworCXN0cnVjdCBpbnRl bF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCA9ICZlbmdpbmUtPmV4ZWNsaXN0OworCXN0cnVj dCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZWwtPnBvcnQ7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCiAJLyogV2UgY2FuIHNraXAgYWNxdWlyaW5n IGludGVsX3J1bnRpbWVfcG1fZ2V0KCkgaGVyZSBhcyBpdCB3YXMgdGFrZW4KQEAgLTUzOCw3ICs1 MzksNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIodW5zaWduZWQgbG9uZyBk YXRhKQogCSAqLwogCUdFTV9CVUdfT04oIWRldl9wcml2LT5ndC5hd2FrZSk7CiAKLQlpbnRlbF91 bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwgZW5naW5lLT5md19kb21haW5zKTsKKwlpbnRl bF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwgZWwtPmZ3X2RvbWFpbnMpOwogCiAJLyog UHJlZmVyIGRvaW5nIHRlc3RfYW5kX2NsZWFyX2JpdCgpIGFzIGEgdHdvIHN0YWdlIG9wZXJhdGlv biB0byBhdm9pZAogCSAqIGltcG9zaW5nIHRoZSBjb3N0IG9mIGEgbG9ja2VkIGF0b21pYyB0cmFu c2FjdGlvbiB3aGVuIHN1Ym1pdHRpbmcgYQpAQCAtNjI2LDcgKzYyNyw3IEBAIHN0YXRpYyB2b2lk IGludGVsX2xyY19pcnFfaGFuZGxlcih1bnNpZ25lZCBsb25nIGRhdGEpCiAJaWYgKGV4ZWNsaXN0 c19lbHNwX3JlYWR5KGVuZ2luZSkpCiAJCWV4ZWNsaXN0c19kZXF1ZXVlKGVuZ2luZSk7CiAKLQlp bnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgZW5naW5lLT5md19kb21haW5zKTsK KwlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgZWwtPmZ3X2RvbWFpbnMpOwog fQogCiBzdGF0aWMgYm9vbApAQCAtNjM0LDE3ICs2MzUsMTggQEAgaW5zZXJ0X3JlcXVlc3Qoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCSAgICAgICBzdHJ1Y3QgaTkxNV9wcmlvdHJl ZSAqcHQsCiAJICAgICAgIGludCBwcmlvKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xp c3QgKmVsID0gJmVuZ2luZS0+ZXhlY2xpc3Q7CiAJc3RydWN0IGk5MTVfcHJpb2xpc3QgKnA7CiAJ c3RydWN0IHJiX25vZGUgKipwYXJlbnQsICpyYjsKIAlib29sIGZpcnN0ID0gdHJ1ZTsKIAotCWlm ICh1bmxpa2VseShlbmdpbmUtPm5vX3ByaW9saXN0KSkKKwlpZiAodW5saWtlbHkoZW5naW5lLT5l eGVjbGlzdC5ub19wcmlvbGlzdCkpCiAJCXByaW8gPSBJOTE1X1BSSU9SSVRZX05PUk1BTDsKIAog ZmluZF9wcmlvbGlzdDoKIAkvKiBtb3N0IHBvc2l0aXZlIHByaW9yaXR5IGlzIHNjaGVkdWxlZCBm aXJzdCwgZXF1YWwgcHJpb3JpdGllcyBmaWZvICovCiAJcmIgPSBOVUxMOwotCXBhcmVudCA9ICZl bmdpbmUtPmV4ZWNsaXN0X3F1ZXVlLnJiX25vZGU7CisJcGFyZW50ID0gJmVsLT5xdWV1ZS5yYl9u b2RlOwogCXdoaWxlICgqcGFyZW50KSB7CiAJCXJiID0gKnBhcmVudDsKIAkJcCA9IHJiX2VudHJ5 KHJiLCB0eXBlb2YoKnApLCBub2RlKTsKQEAgLTY2MCw3ICs2NjIsNyBAQCBpbnNlcnRfcmVxdWVz dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJfQogCiAJaWYgKHByaW8gPT0gSTkx NV9QUklPUklUWV9OT1JNQUwpIHsKLQkJcCA9ICZlbmdpbmUtPmRlZmF1bHRfcHJpb2xpc3Q7CisJ CXAgPSAmZWwtPmRlZmF1bHRfcHJpb2xpc3Q7CiAJfSBlbHNlIHsKIAkJcCA9IGttZW1fY2FjaGVf YWxsb2MoZW5naW5lLT5pOTE1LT5wcmlvcml0aWVzLCBHRlBfQVRPTUlDKTsKIAkJLyogQ29udmVy dCBhbiBhbGxvY2F0aW9uIGZhaWx1cmUgdG8gYSBwcmlvcml0eSBidW1wICovCkBAIC02NzUsMjAg KzY3NywyMCBAQCBpbnNlcnRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUs CiAJCQkgKiByZXF1ZXN0cywgc28gaWYgdXNlcnNwYWNlIGxpZWQgYWJvdXQgdGhlaXIKIAkJCSAq IGRlcGVuZGVuY2llcyB0aGF0IHJlb3JkZXJpbmcgbWF5IGJlIHZpc2libGUuCiAJCQkgKi8KLQkJ CWVuZ2luZS0+bm9fcHJpb2xpc3QgPSB0cnVlOworCQkJZWwtPm5vX3ByaW9saXN0ID0gdHJ1ZTsK IAkJCWdvdG8gZmluZF9wcmlvbGlzdDsKIAkJfQogCX0KIAogCXAtPnByaW9yaXR5ID0gcHJpbzsK IAlyYl9saW5rX25vZGUoJnAtPm5vZGUsIHJiLCBwYXJlbnQpOwotCXJiX2luc2VydF9jb2xvcigm cC0+bm9kZSwgJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpOworCXJiX2luc2VydF9jb2xvcigmcC0+ bm9kZSwgJmVsLT5xdWV1ZSk7CiAKIAlJTklUX0xJU1RfSEVBRCgmcC0+cmVxdWVzdHMpOwogCWxp c3RfYWRkX3RhaWwoJnB0LT5saW5rLCAmcC0+cmVxdWVzdHMpOwogCiAJaWYgKGZpcnN0KQotCQll bmdpbmUtPmV4ZWNsaXN0X2ZpcnN0ID0gJnAtPm5vZGU7CisJCWVsLT5maXJzdCA9ICZwLT5ub2Rl OwogCiAJcmV0dXJuIGZpcnN0OwogfQpAQCAtNzA1LDEwICs3MDcsMTAgQEAgc3RhdGljIHZvaWQg ZXhlY2xpc3RzX3N1Ym1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdCkKIAkJCSAgICZyZXF1ZXN0LT5wcmlvdHJlZSwKIAkJCSAgIHJlcXVlc3QtPnByaW90cmVl LnByaW9yaXR5KSkgewogCQlpZiAoZXhlY2xpc3RzX2Vsc3BfcmVhZHkoZW5naW5lKSkKLQkJCXRh c2tsZXRfaGlfc2NoZWR1bGUoJmVuZ2luZS0+aXJxX3Rhc2tsZXQpOworCQkJdGFza2xldF9oaV9z Y2hlZHVsZSgmZW5naW5lLT5leGVjbGlzdC5pcnFfdGFza2xldCk7CiAJfQogCi0JR0VNX0JVR19P TighZW5naW5lLT5leGVjbGlzdF9maXJzdCk7CisJR0VNX0JVR19PTighZW5naW5lLT5leGVjbGlz dC5maXJzdCk7CiAJR0VNX0JVR19PTihsaXN0X2VtcHR5KCZyZXF1ZXN0LT5wcmlvdHJlZS5saW5r KSk7CiAKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrLCBm bGFncyk7CkBAIC0xMjM0LDcgKzEyMzYsNyBAQCBzdGF0aWMgdTggZ3RpaXJbXSA9IHsKIHN0YXRp YyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7 Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0X3BvcnQ7CisJ c3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0LnBvcnQ7CiAJdW5z aWduZWQgaW50IG47CiAJYm9vbCBzdWJtaXQ7CiAJaW50IHJldDsKQEAgLTEyNzIsNyArMTI3NCw3 IEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKIAogCS8qIEFmdGVyIGEgR1BVIHJlc2V0LCB3ZSBtYXkgaGF2ZSByZXF1ZXN0 cyB0byByZXBsYXkgKi8KIAlzdWJtaXQgPSBmYWxzZTsKLQlmb3IgKG4gPSAwOyBuIDwgQVJSQVlf U0laRShlbmdpbmUtPmV4ZWNsaXN0X3BvcnQpOyBuKyspIHsKKwlmb3IgKG4gPSAwOyBuIDwgQVJS QVlfU0laRShlbmdpbmUtPmV4ZWNsaXN0LnBvcnQpOyBuKyspIHsKIAkJaWYgKCFwb3J0X2lzc2V0 KCZwb3J0W25dKSkKIAkJCWJyZWFrOwogCkBAIC0xMzI3LDcgKzEzMjksNyBAQCBzdGF0aWMgaW50 IGdlbjlfaW5pdF9yZW5kZXJfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiBz dGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7Ci0J c3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0X3BvcnQ7CisJc3Ry dWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0LnBvcnQ7CiAJc3RydWN0 IGludGVsX2NvbnRleHQgKmNlOwogCXVuc2lnbmVkIGludCBuOwogCkBAIC0xMzQxLDkgKzEzNDMs OSBAQCBzdGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUsCiAJICogcmVxdWVzdHMgd2VyZSBjb21wbGV0ZWQuCiAJICovCiAJaWYgKCFyZXF1 ZXN0KSB7Ci0JCWZvciAobiA9IDA7IG4gPCBBUlJBWV9TSVpFKGVuZ2luZS0+ZXhlY2xpc3RfcG9y dCk7IG4rKykKKwkJZm9yIChuID0gMDsgbiA8IEFSUkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdC5w b3J0KTsgbisrKQogCQkJaTkxNV9nZW1fcmVxdWVzdF9wdXQocG9ydF9yZXF1ZXN0KCZwb3J0W25d KSk7Ci0JCW1lbXNldChlbmdpbmUtPmV4ZWNsaXN0X3BvcnQsIDAsIHNpemVvZihlbmdpbmUtPmV4 ZWNsaXN0X3BvcnQpKTsKKwkJbWVtc2V0KGVuZ2luZS0+ZXhlY2xpc3QucG9ydCwgMCwgc2l6ZW9m KGVuZ2luZS0+ZXhlY2xpc3QucG9ydCkpOwogCQlyZXR1cm47CiAJfQogCkBAIC0xNjY4LDggKzE2 NzAsOCBAQCB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19jbGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKIAkgKiBUYXNrbGV0IGNhbm5vdCBiZSBhY3RpdmUgYXQgdGhpcyBwb2lu dCBkdWUgaW50ZWxfbWFya19hY3RpdmUvaWRsZQogCSAqIHNvIHRoaXMgaXMganVzdCBmb3IgZG9j dW1lbnRhdGlvbi4KIAkgKi8KLQlpZiAoV0FSTl9PTih0ZXN0X2JpdChUQVNLTEVUX1NUQVRFX1ND SEVELCAmZW5naW5lLT5pcnFfdGFza2xldC5zdGF0ZSkpKQotCQl0YXNrbGV0X2tpbGwoJmVuZ2lu ZS0+aXJxX3Rhc2tsZXQpOworCWlmIChXQVJOX09OKHRlc3RfYml0KFRBU0tMRVRfU1RBVEVfU0NI RUQsICZlbmdpbmUtPmV4ZWNsaXN0LmlycV90YXNrbGV0LnN0YXRlKSkpCisJCXRhc2tsZXRfa2ls bCgmZW5naW5lLT5leGVjbGlzdC5pcnFfdGFza2xldCk7CiAKIAlkZXZfcHJpdiA9IGVuZ2luZS0+ aTkxNTsKIApAQCAtMTY5Nyw3ICsxNjk5LDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX3NldF9k ZWZhdWx0X3N1Ym1pc3Npb24oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCWVu Z2luZS0+c3VibWl0X3JlcXVlc3QgPSBleGVjbGlzdHNfc3VibWl0X3JlcXVlc3Q7CiAJZW5naW5l LT5zY2hlZHVsZSA9IGV4ZWNsaXN0c19zY2hlZHVsZTsKLQllbmdpbmUtPmlycV90YXNrbGV0LmZ1 bmMgPSBpbnRlbF9scmNfaXJxX2hhbmRsZXI7CisJZW5naW5lLT5leGVjbGlzdC5pcnFfdGFza2xl dC5mdW5jID0gaW50ZWxfbHJjX2lycV9oYW5kbGVyOwogfQogCiBzdGF0aWMgdm9pZApAQCAtMTc3 Miw5ICsxNzc0LDkgQEAgbG9naWNhbF9yaW5nX3NldHVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKIAkJCQkJCSAgICAgUklOR19DT05URVhUX1NUQVRVU19CVUZfQkFTRShlbmdpbmUp LAogCQkJCQkJICAgICBGV19SRUdfUkVBRCk7CiAKLQllbmdpbmUtPmZ3X2RvbWFpbnMgPSBmd19k b21haW5zOworCWVuZ2luZS0+ZXhlY2xpc3QuZndfZG9tYWlucyA9IGZ3X2RvbWFpbnM7CiAKLQl0 YXNrbGV0X2luaXQoJmVuZ2luZS0+aXJxX3Rhc2tsZXQsCisJdGFza2xldF9pbml0KCZlbmdpbmUt PmV4ZWNsaXN0LmlycV90YXNrbGV0LAogCQkgICAgIGludGVsX2xyY19pcnFfaGFuZGxlciwgKHVu c2lnbmVkIGxvbmcpZW5naW5lKTsKIAogCWxvZ2ljYWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhlbmdp bmUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDc5YzAwMjFm MzcwMC4uMzI2Y2ExNDUzZTkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCkBAIC0xODQsNiArMTg0LDc0IEBAIHN0cnVjdCBpOTE1X3ByaW9saXN0IHsKIAlpbnQgcHJp b3JpdHk7CiB9OwogCisvKioKKyAqIHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgLSBleGVj bGlzdCBzdWJtaXNzaW9uIHF1ZXVlIGFuZCBwb3J0IHN0YXRlCisgKgorICogVGhlIHN0cnVjdCBp bnRlbF9lbmdpbmVfZXhlY2xpc3QgcmVwcmVzZW50cyB0aGUgY29tYmluZWQgbG9naWNhbCBzdGF0 ZSBvZiBkcml2ZXIKKyAqIGFuZCB0aGUgaGFyZHdhcmUgc3RhdGUgZm9yIGV4ZWNsaXN0IG1vZGUg b2Ygc3VibWlzc2lvbi4KKyAqLworc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCB7CisJLyoq CisJICogQGlycV90YXNrbGV0OiBzb2Z0aXJxIHRhc2tsZXQgZm9yIGJvdHRvbSBoYW5kbGVyCisJ ICovCisJc3RydWN0IHRhc2tsZXRfc3RydWN0IGlycV90YXNrbGV0OworCisJLyoqCisJICogQGRl ZmF1bHRfcHJpb2xpc3Q6IHByaW9yaXR5IGxpc3QgZm9yIEk5MTVfUFJJT1JJVFlfTk9STUFMCisJ ICovCisJc3RydWN0IGk5MTVfcHJpb2xpc3QgZGVmYXVsdF9wcmlvbGlzdDsKKworCS8qKgorCSAq IEBub19wcmlvbGlzdDogcHJpb3JpdHkgbGlzdHMgZGlzYWJsZWQKKwkgKi8KKwlib29sIG5vX3By aW9saXN0OworCisJLyoqCisJICogQHBvcnQ6IGV4ZWNsaXN0IHBvcnQgc3RhdGVzCisJICoKKwkg KiBGb3IgZWFjaCBoYXJkd2FyZSBFTFNQIChFeGVjTGlzdCBTdWJtaXNzaW9uIFBvcnQpIHdlIGtl ZXAKKwkgKiB0cmFjayBvZiB0aGUgbGFzdCByZXF1ZXN0IGFuZCB0aGUgbnVtYmVyIG9mIHRpbWVz IHdlIHN1Ym1pdHRlZAorCSAqIHRoYXQgcG9ydCB0byBody4gV2UgdGhlbiBjb3VudCB0aGUgbnVt YmVyIG9mIHRpbWVzIHRoZSBodyByZXBvcnRzCisJICogYSBjb250ZXh0IGNvbXBsZXRpb24gb3Ig cHJlZW1wdGlvbi4gQXMgb25seSBvbmUgY29udGV4dCBjYW4KKwkgKiBiZSBhY3RpdmUgb24gaHcs IHdlIGxpbWl0IHJlc3VibWlzc2lvbiBvZiBjb250ZXh0IHRvIHBvcnRbMF0uIFRoaXMKKwkgKiBp cyBjYWxsZWQgTGl0ZSBSZXN0b3JlLCBvZiB0aGUgY29udGV4dC4KKwkgKi8KKwlzdHJ1Y3QgZXhl Y2xpc3RfcG9ydCB7CisJCS8qKgorCQkgKiBAcmVxdWVzdF9jb3VudDogY29tYmluZWQgcmVxdWVz dCBhbmQgc3VibWlzc2lvbiBjb3VudAorCQkgKi8KKwkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXF1ZXN0X2NvdW50OworI2RlZmluZSBFWEVDTElTVF9DT1VOVF9CSVRTIDIKKyNkZWZp bmUgcG9ydF9yZXF1ZXN0KHApIHB0cl9tYXNrX2JpdHMoKHApLT5yZXF1ZXN0X2NvdW50LCBFWEVD TElTVF9DT1VOVF9CSVRTKQorI2RlZmluZSBwb3J0X2NvdW50KHApIHB0cl91bm1hc2tfYml0cygo cCktPnJlcXVlc3RfY291bnQsIEVYRUNMSVNUX0NPVU5UX0JJVFMpCisjZGVmaW5lIHBvcnRfcGFj ayhycSwgY291bnQpIHB0cl9wYWNrX2JpdHMocnEsIGNvdW50LCBFWEVDTElTVF9DT1VOVF9CSVRT KQorI2RlZmluZSBwb3J0X3VucGFjayhwLCBjb3VudCkgcHRyX3VucGFja19iaXRzKChwKS0+cmVx dWVzdF9jb3VudCwgY291bnQsIEVYRUNMSVNUX0NPVU5UX0JJVFMpCisjZGVmaW5lIHBvcnRfc2V0 KHAsIHBhY2tlZCkgKChwKS0+cmVxdWVzdF9jb3VudCA9IChwYWNrZWQpKQorI2RlZmluZSBwb3J0 X2lzc2V0KHApICgocCktPnJlcXVlc3RfY291bnQpCisjZGVmaW5lIHBvcnRfaW5kZXgocCwgZSkg KChwKSAtIChlKS0+ZXhlY2xpc3QucG9ydCkKKworCQkvKioKKwkJICogQGNvbnRleHRfaWQ6IGNv bnRleHQgSUQgZm9yIHBvcnQKKwkJICovCisJCUdFTV9ERUJVR19ERUNMKHUzMiBjb250ZXh0X2lk KTsKKwl9IHBvcnRbMl07CisKKwkvKioKKwkgKiBAcXVldWU6IHF1ZXVlIG9mIHJlcXVlc3RzLCBp biBwcmlvcml0eSBsaXN0cworCSAqLworCXN0cnVjdCByYl9yb290IHF1ZXVlOworCisJLyoqCisJ ICogQGZpcnN0OiBsZWZ0bW9zdCBsZXZlbCBpbiBwcmlvcml0eSBAcXVldWUKKwkgKi8KKwlzdHJ1 Y3QgcmJfbm9kZSAqZmlyc3Q7CisKKwkvKioKKwkgKiBAZndfZG9tYWluczogZm9yY2V3YWtlIGRv bWFpbnMgZm9yIGlycSB0YXNrbGV0CisJICovCisJdW5zaWduZWQgaW50IGZ3X2RvbWFpbnM7Cit9 OworCiAjZGVmaW5lIElOVEVMX0VOR0lORV9DU19NQVhfTkFNRSA4CiAKIHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgewpAQCAtMzcyLDI1ICs0NDAsNyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsK IAkJdTMyCSooKnNpZ25hbCkoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHUzMiAq Y3MpOwogCX0gc2VtYXBob3JlOwogCi0JLyogRXhlY2xpc3RzICovCi0Jc3RydWN0IHRhc2tsZXRf c3RydWN0IGlycV90YXNrbGV0OwotCXN0cnVjdCBpOTE1X3ByaW9saXN0IGRlZmF1bHRfcHJpb2xp c3Q7Ci0JYm9vbCBub19wcmlvbGlzdDsKLQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCB7Ci0JCXN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdF9jb3VudDsKLSNkZWZpbmUgRVhFQ0xJU1Rf Q09VTlRfQklUUyAyCi0jZGVmaW5lIHBvcnRfcmVxdWVzdChwKSBwdHJfbWFza19iaXRzKChwKS0+ cmVxdWVzdF9jb3VudCwgRVhFQ0xJU1RfQ09VTlRfQklUUykKLSNkZWZpbmUgcG9ydF9jb3VudChw KSBwdHJfdW5tYXNrX2JpdHMoKHApLT5yZXF1ZXN0X2NvdW50LCBFWEVDTElTVF9DT1VOVF9CSVRT KQotI2RlZmluZSBwb3J0X3BhY2socnEsIGNvdW50KSBwdHJfcGFja19iaXRzKHJxLCBjb3VudCwg RVhFQ0xJU1RfQ09VTlRfQklUUykKLSNkZWZpbmUgcG9ydF91bnBhY2socCwgY291bnQpIHB0cl91 bnBhY2tfYml0cygocCktPnJlcXVlc3RfY291bnQsIGNvdW50LCBFWEVDTElTVF9DT1VOVF9CSVRT KQotI2RlZmluZSBwb3J0X3NldChwLCBwYWNrZWQpICgocCktPnJlcXVlc3RfY291bnQgPSAocGFj a2VkKSkKLSNkZWZpbmUgcG9ydF9pc3NldChwKSAoKHApLT5yZXF1ZXN0X2NvdW50KQotI2RlZmlu ZSBwb3J0X2luZGV4KHAsIGUpICgocCkgLSAoZSktPmV4ZWNsaXN0X3BvcnQpCi0JCUdFTV9ERUJV R19ERUNMKHUzMiBjb250ZXh0X2lkKTsKLQl9IGV4ZWNsaXN0X3BvcnRbMl07Ci0Jc3RydWN0IHJi X3Jvb3QgZXhlY2xpc3RfcXVldWU7Ci0Jc3RydWN0IHJiX25vZGUgKmV4ZWNsaXN0X2ZpcnN0Owot CXVuc2lnbmVkIGludCBmd19kb21haW5zOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3Qg ZXhlY2xpc3Q7CiAKIAkvKiBDb250ZXh0cyBhcmUgcGlubmVkIHdoaWxzdCB0aGV5IGFyZSBhY3Rp dmUgb24gdGhlIEdQVS4gVGhlIGxhc3QKIAkgKiBjb250ZXh0IGV4ZWN1dGVkIHJlbWFpbnMgYWN0 aXZlIHdoaWxzdCB0aGUgR1BVIGlzIGlkbGUgLSB0aGUKLS0gCjIuMTEuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==