From: Mika Kuoppala Subject: [CI 1/5] drm/i915: Make own struct for execlist items Date: Fri, 22 Sep 2017 15:43:03 +0300 Message-ID: <20170922124307.10914-1-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id B51B16E2E9 for ; Fri, 22 Sep 2017 12:45:12 +0000 (UTC) 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 djI6IGFkZCBrZXJuZWxkb2MgYW5kIGZpeCB3aGl0ZXNwYWNlIChKb29uYXMsIENocmlzKQp2Mzog Y3NiX21taW8gY2hhbmdlcywgcmViYXNlCnY0OiBzL1xiKGVsfGV4ZWNsaXN0KVxiL2V4ZWNsaXN0 cy8gKEpvb25hcykKClN1Z2dlc3RlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxz b24uY28udWs+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6 IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+CkFja2VkLWJ5 OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+ClJldmll d2VkLWJ5OiBNaWNoYcWCIFdpbmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+ICh2 MykKUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPiAo djMpClJldmlld2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICAgICAg IHwgICA4ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgIHwg ICA2ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jICAgICAgfCAgIDQg Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8ICAzMSArKysr Ky0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICAgICAgICB8ICAgNSAr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgICAgIHwgIDEyICsrLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8IDEwMCArKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oICAgIHwgMTAwICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tCiA4IGZpbGVzIGNo YW5nZWQsIDE2NyBpbnNlcnRpb25zKCspLCA5OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jCmluZGV4IDEzZmMyNTk5N2Q2NS4uMTQ3MDc1NGU1M2QyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMzMyNCw3ICszMzI0LDcgQEAgc3RhdGljIGlu dCBpOTE1X2VuZ2luZV9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQkJ cmVhZCA9IEdFTjhfQ1NCX1JFQURfUFRSKHB0cik7CiAJCQl3cml0ZSA9IEdFTjhfQ1NCX1dSSVRF X1BUUihwdHIpOwogCQkJc2VxX3ByaW50ZihtLCAiXHRFeGVjbGlzdCBDU0IgcmVhZCAlZCBbJWQg Y2FjaGVkXSwgd3JpdGUgJWQgWyVkIGZyb20gaHdzXSwgaW50ZXJydXB0IHBvc3RlZD8gJXNcbiIs Ci0JCQkJICAgcmVhZCwgZW5naW5lLT5jc2JfaGVhZCwKKwkJCQkgICByZWFkLCBlbmdpbmUtPmV4 ZWNsaXN0cy5jc2JfaGVhZCwKIAkJCQkgICB3cml0ZSwKIAkJCQkgICBpbnRlbF9yZWFkX3N0YXR1 c19wYWdlKGVuZ2luZSwgaW50ZWxfaHdzX2NzYl93cml0ZV9pbmRleChlbmdpbmUtPmk5MTUpKSwK IAkJCQkgICB5ZXNubyh0ZXN0X2JpdChFTkdJTkVfSVJRX0VYRUNMSVNULApAQCAtMzM0NiwxMCAr MzM0NiwxMCBAQCBzdGF0aWMgaW50IGk5MTVfZW5naW5lX2luZm8oc3RydWN0IHNlcV9maWxlICpt LCB2b2lkICp1bnVzZWQpCiAJCQl9CiAKIAkJCXJjdV9yZWFkX2xvY2soKTsKLQkJCWZvciAoaWR4 ID0gMDsgaWR4IDwgQVJSQVlfU0laRShlbmdpbmUtPmV4ZWNsaXN0X3BvcnQpOyBpZHgrKykgewor CQkJZm9yIChpZHggPSAwOyBpZHggPCBBUlJBWV9TSVpFKGVuZ2luZS0+ZXhlY2xpc3RzLnBvcnQp OyBpZHgrKykgewogCQkJCXVuc2lnbmVkIGludCBjb3VudDsKIAotCQkJCXJxID0gcG9ydF91bnBh Y2soJmVuZ2luZS0+ZXhlY2xpc3RfcG9ydFtpZHhdLAorCQkJCXJxID0gcG9ydF91bnBhY2soJmVu Z2luZS0+ZXhlY2xpc3RzLnBvcnRbaWR4XSwKIAkJCQkJCSAmY291bnQpOwogCQkJCWlmIChycSkg ewogCQkJCQlzZXFfcHJpbnRmKG0sICJcdFx0RUxTUFslZF0gY291bnQ9JWQsICIsCkBAIC0zMzYz LDcgKzMzNjMsNyBAQCBzdGF0aWMgaW50IGk5MTVfZW5naW5lX2luZm8oc3RydWN0IHNlcV9maWxl ICptLCB2b2lkICp1bnVzZWQpCiAJCQlyY3VfcmVhZF91bmxvY2soKTsKIAogCQkJc3Bpbl9sb2Nr X2lycSgmZW5naW5lLT50aW1lbGluZS0+bG9jayk7Ci0JCQlmb3IgKHJiID0gZW5naW5lLT5leGVj bGlzdF9maXJzdDsgcmI7IHJiID0gcmJfbmV4dChyYikpeworCQkJZm9yIChyYiA9IGVuZ2luZS0+ ZXhlY2xpc3RzLmZpcnN0OyByYjsgcmIgPSByYl9uZXh0KHJiKSkgewogCQkJCXN0cnVjdCBpOTE1 X3ByaW9saXN0ICpwID0KIAkJCQkJcmJfZW50cnkocmIsIHR5cGVvZigqcCksIG5vZGUpOwogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAyYTY1MGY5MmFhNzQuLjczZWViNmIxZjFjZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yODE1LDggKzI4MTUsOCBAQCBpOTE1X2dlbV9yZXNl dF9wcmVwYXJlX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJICogVHVy bmluZyBvZmYgdGhlIGVuZ2luZS0+aXJxX3Rhc2tsZXQgdW50aWwgdGhlIHJlc2V0IGlzIG92ZXIK IAkgKiBwcmV2ZW50cyB0aGUgcmFjZS4KIAkgKi8KLQl0YXNrbGV0X2tpbGwoJmVuZ2luZS0+aXJx X3Rhc2tsZXQpOwotCXRhc2tsZXRfZGlzYWJsZSgmZW5naW5lLT5pcnFfdGFza2xldCk7CisJdGFz a2xldF9raWxsKCZlbmdpbmUtPmV4ZWNsaXN0cy5pcnFfdGFza2xldCk7CisJdGFza2xldF9kaXNh YmxlKCZlbmdpbmUtPmV4ZWNsaXN0cy5pcnFfdGFza2xldCk7CiAKIAlpZiAoZW5naW5lLT5pcnFf c2Vxbm9fYmFycmllcikKIAkJZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcihlbmdpbmUpOwpAQCAt Mjk5NSw3ICsyOTk1LDcgQEAgdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAKIHZvaWQgaTkxNV9nZW1fcmVzZXRfZmluaXNoX2VuZ2luZShzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JdGFza2xldF9lbmFibGUoJmVuZ2luZS0+ aXJxX3Rhc2tsZXQpOworCXRhc2tsZXRfZW5hYmxlKCZlbmdpbmUtPmV4ZWNsaXN0cy5pcnFfdGFz a2xldCk7CiAJa3RocmVhZF91bnBhcmsoZW5naW5lLT5icmVhZGNydW1icy5zaWduYWxlcik7CiB9 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IGM3YWFmNjI4ZTdlMC4u NDUxODk3OTViZTM1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9l cnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTEz MjcsMTAgKzEzMjcsMTAgQEAgc3RhdGljIHZvaWQgZW5naW5lX3JlY29yZF9yZXF1ZXN0cyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiBzdGF0aWMgdm9pZCBlcnJvcl9yZWNvcmRfZW5n aW5lX2V4ZWNsaXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQkJCSAgc3Ry dWN0IGRybV9pOTE1X2Vycm9yX2VuZ2luZSAqZWUpCiB7Ci0JY29uc3Qgc3RydWN0IGV4ZWNsaXN0 X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0X3BvcnQ7CisJY29uc3Qgc3RydWN0IGV4ZWNs aXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0cy5wb3J0OwogCXVuc2lnbmVkIGludCBu OwogCi0JZm9yIChuID0gMDsgbiA8IEFSUkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdF9wb3J0KTsg bisrKSB7CisJZm9yIChuID0gMDsgbiA8IEFSUkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdHMucG9y dCk7IG4rKykgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxID0gcG9ydF9yZXF1 ZXN0KCZwb3J0W25dKTsKIAogCQlpZiAoIXJxKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n dWNfc3VibWlzc2lvbi5jCmluZGV4IDA2YTI2YzYxMDgwNi4uYmNlM2YxYjU4OTJiIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC00OTQsMTEgKzQ5NCwx MiBAQCBzdGF0aWMgdm9pZCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkx NTsKIAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKIAlzdHJ1Y3QgaTkx NV9ndWNfY2xpZW50ICpjbGllbnQgPSBndWMtPmV4ZWNidWZfY2xpZW50OwotCXN0cnVjdCBleGVj bGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlzdF9wb3J0OwotCXVuc2lnbmVkIGludCBl bmdpbmVfaWQgPSBlbmdpbmUtPmlkOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICog Y29uc3QgZXhlY2xpc3RzID0gJmVuZ2luZS0+ZXhlY2xpc3RzOworCXN0cnVjdCBleGVjbGlzdF9w b3J0ICpwb3J0ID0gZXhlY2xpc3RzLT5wb3J0OworCWNvbnN0IHVuc2lnbmVkIGludCBlbmdpbmVf aWQgPSBlbmdpbmUtPmlkOwogCXVuc2lnbmVkIGludCBuOwogCi0JZm9yIChuID0gMDsgbiA8IEFS UkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdF9wb3J0KTsgbisrKSB7CisJZm9yIChuID0gMDsgbiA8 IEFSUkFZX1NJWkUoZXhlY2xpc3RzLT5wb3J0KTsgbisrKSB7CiAJCXN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcnE7CiAJCXVuc2lnbmVkIGludCBjb3VudDsKIApAQCAtNTU4LDcgKzU1OSw4 IEBAIHN0YXRpYyB2b2lkIHBvcnRfYXNzaWduKHN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0LAog CiBzdGF0aWMgdm9pZCBpOTE1X2d1Y19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIHsKLQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGVuZ2luZS0+ZXhlY2xpc3Rf cG9ydDsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cyA9 ICZlbmdpbmUtPmV4ZWNsaXN0czsKKwlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGV4ZWNs aXN0cy0+cG9ydDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmxhc3QgPSBOVUxMOwog CWJvb2wgc3VibWl0ID0gZmFsc2U7CiAJc3RydWN0IHJiX25vZGUgKnJiOwpAQCAtNTY3LDE1ICs1 NjksMTUgQEAgc3RhdGljIHZvaWQgaTkxNV9ndWNfZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCiAJCXBvcnQrKzsKIAogCXNwaW5fbG9ja19pcnEoJmVuZ2luZS0+dGltZWxp bmUtPmxvY2spOwotCXJiID0gZW5naW5lLT5leGVjbGlzdF9maXJzdDsKLQlHRU1fQlVHX09OKHJi X2ZpcnN0KCZlbmdpbmUtPmV4ZWNsaXN0X3F1ZXVlKSAhPSByYik7CisJcmIgPSBleGVjbGlzdHMt PmZpcnN0OworCUdFTV9CVUdfT04ocmJfZmlyc3QoJmV4ZWNsaXN0cy0+cXVldWUpICE9IHJiKTsK IAl3aGlsZSAocmIpIHsKIAkJc3RydWN0IGk5MTVfcHJpb2xpc3QgKnAgPSByYl9lbnRyeShyYiwg dHlwZW9mKCpwKSwgbm9kZSk7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEsICpy bjsKIAogCQlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUocnEsIHJuLCAmcC0+cmVxdWVzdHMsIHBy aW90cmVlLmxpbmspIHsKIAkJCWlmIChsYXN0ICYmIHJxLT5jdHggIT0gbGFzdC0+Y3R4KSB7Ci0J CQkJaWYgKHBvcnQgIT0gZW5naW5lLT5leGVjbGlzdF9wb3J0KSB7CisJCQkJaWYgKHBvcnQgIT0g ZXhlY2xpc3RzLT5wb3J0KSB7CiAJCQkJCV9fbGlzdF9kZWxfbWFueSgmcC0+cmVxdWVzdHMsCiAJ CQkJCQkJJnJxLT5wcmlvdHJlZS5saW5rKTsKIAkJCQkJZ290byBkb25lOwpAQCAtNTk2LDEzICs1 OTgsMTMgQEAgc3RhdGljIHZvaWQgaTkxNV9ndWNfZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCiAJCX0KIAogCQlyYiA9IHJiX25leHQocmIpOwotCQlyYl9lcmFzZSgmcC0+ bm9kZSwgJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpOworCQlyYl9lcmFzZSgmcC0+bm9kZSwgJmV4 ZWNsaXN0cy0+cXVldWUpOwogCQlJTklUX0xJU1RfSEVBRCgmcC0+cmVxdWVzdHMpOwogCQlpZiAo cC0+cHJpb3JpdHkgIT0gSTkxNV9QUklPUklUWV9OT1JNQUwpCiAJCQlrbWVtX2NhY2hlX2ZyZWUo ZW5naW5lLT5pOTE1LT5wcmlvcml0aWVzLCBwKTsKIAl9CiBkb25lOgotCWVuZ2luZS0+ZXhlY2xp c3RfZmlyc3QgPSByYjsKKwlleGVjbGlzdHMtPmZpcnN0ID0gcmI7CiAJaWYgKHN1Ym1pdCkgewog CQlwb3J0X2Fzc2lnbihwb3J0LCBsYXN0KTsKIAkJaTkxNV9ndWNfc3VibWl0KGVuZ2luZSk7CkBA IC02MTIsOCArNjE0LDggQEAgc3RhdGljIHZvaWQgaTkxNV9ndWNfZGVxdWV1ZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCiAKIHN0YXRpYyB2b2lkIGk5MTVfZ3VjX2lycV9oYW5kbGVy KHVuc2lnbmVkIGxvbmcgZGF0YSkKIHsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUg PSAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqKWRhdGE7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQg KnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0X3BvcnQ7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq IGNvbnN0IGVuZ2luZSA9IChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICopZGF0YTsKKwlzdHJ1Y3Qg ZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGVuZ2luZS0+ZXhlY2xpc3RzLnBvcnQ7CiAJc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpycTsKIAogCXJxID0gcG9ydF9yZXF1ZXN0KCZwb3J0WzBdKTsK QEAgLTExNDQsNyArMTE0Niw3IEBAIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2VuYWJsZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICogYW5kIGl0IGlzIGd1YXJhbnRlZWQg dGhhdCBpdCB3aWxsIHJlbW92ZSB0aGUgd29yayBpdGVtIGZyb20gdGhlCiAJICogcXVldWUgYmVm b3JlIG91ciByZXF1ZXN0IGlzIGNvbXBsZXRlZC4KIAkgKi8KLQlCVUlMRF9CVUdfT04oQVJSQVlf U0laRShlbmdpbmUtPmV4ZWNsaXN0X3BvcnQpICoKKwlCVUlMRF9CVUdfT04oQVJSQVlfU0laRShl bmdpbmUtPmV4ZWNsaXN0cy5wb3J0KSAqCiAJCSAgICAgc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRl bSkgKgogCQkgICAgIEk5MTVfTlVNX0VOR0lORVMgPiBHVUNfV1FfU0laRSk7CiAKQEAgLTExNzUs MTQgKzExNzcsMTUgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlndWNfaW50ZXJydXB0c19jYXB0dXJlKGRldl9wcml2 KTsKIAogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgeworCQlzdHJ1Y3Qg aW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cyA9ICZlbmdpbmUtPmV4ZWNs aXN0czsKIAkJLyogVGhlIHRhc2tsZXQgd2FzIGluaXRpYWxpc2VkIGJ5IGV4ZWNsaXN0cywgYW5k IG1heSBiZSBpbgogCQkgKiBhIHN0YXRlIG9mIGZsdXggKGFjcm9zcyBhIHJlc2V0KSBhbmQgc28g d2UganVzdCB3YW50IHRvCiAJCSAqIHRha2Ugb3ZlciB0aGUgY2FsbGJhY2sgd2l0aG91dCBjaGFu Z2luZyBhbnkgb3RoZXIgc3RhdGUKIAkJICogaW4gdGhlIHRhc2tsZXQuCiAJCSAqLwotCQllbmdp bmUtPmlycV90YXNrbGV0LmZ1bmMgPSBpOTE1X2d1Y19pcnFfaGFuZGxlcjsKKwkJZXhlY2xpc3Rz LT5pcnFfdGFza2xldC5mdW5jID0gaTkxNV9ndWNfaXJxX2hhbmRsZXI7CiAJCWNsZWFyX2JpdChF TkdJTkVfSVJRX0VYRUNMSVNULCAmZW5naW5lLT5pcnFfcG9zdGVkKTsKLQkJdGFza2xldF9zY2hl ZHVsZSgmZW5naW5lLT5pcnFfdGFza2xldCk7CisJCXRhc2tsZXRfc2NoZWR1bGUoJmV4ZWNsaXN0 cy0+aXJxX3Rhc2tsZXQpOwogCX0KIAogCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMK aW5kZXggYjFiYWI3NjA1ZGI5Li5hZjgyYmQ3MjFkYmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu YwpAQCAtMTM0NiwxMCArMTM0NiwxMSBAQCBzdGF0aWMgdm9pZCBzbmJfZ3RfaXJxX2hhbmRsZXIo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogc3RhdGljIHZvaWQKIGdlbjhfY3Nf aXJxX2hhbmRsZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1MzIgaWlyLCBpbnQg dGVzdF9zaGlmdCkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4 ZWNsaXN0cyA9ICZlbmdpbmUtPmV4ZWNsaXN0czsKIAlib29sIHRhc2tsZXQgPSBmYWxzZTsKIAog CWlmIChpaXIgJiAoR1RfQ09OVEVYVF9TV0lUQ0hfSU5URVJSVVBUIDw8IHRlc3Rfc2hpZnQpKSB7 Ci0JCWlmIChwb3J0X2NvdW50KCZlbmdpbmUtPmV4ZWNsaXN0X3BvcnRbMF0pKSB7CisJCWlmIChw b3J0X2NvdW50KCZleGVjbGlzdHMtPnBvcnRbMF0pKSB7CiAJCQlfX3NldF9iaXQoRU5HSU5FX0lS UV9FWEVDTElTVCwgJmVuZ2luZS0+aXJxX3Bvc3RlZCk7CiAJCQl0YXNrbGV0ID0gdHJ1ZTsKIAkJ fQpAQCAtMTM2MSw3ICsxMzYyLDcgQEAgZ2VuOF9jc19pcnFfaGFuZGxlcihzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUsIHUzMiBpaXIsIGludCB0ZXN0X3NoaWZ0KQogCX0KIAogCWlmICh0 YXNrbGV0KQotCQl0YXNrbGV0X2hpX3NjaGVkdWxlKCZlbmdpbmUtPmlycV90YXNrbGV0KTsKKwkJ dGFza2xldF9oaV9zY2hlZHVsZSgmZXhlY2xpc3RzLT5pcnFfdGFza2xldCk7CiB9CiAKIHN0YXRp YyBpcnFyZXR1cm5fdCBnZW44X2d0X2lycV9hY2soc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2Nz LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRleCBkNzU1YTJh ZTQyMjMuLjk1N2IwZDQ3ZjYzNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZW5naW5lX2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2Nz LmMKQEAgLTM5MSw4ICszOTEsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF90aW1l bGluZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAgKi8KIHZvaWQgaW50ZWxfZW5n aW5lX3NldHVwX2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JZW5n aW5lLT5leGVjbGlzdF9xdWV1ZSA9IFJCX1JPT1Q7Ci0JZW5naW5lLT5leGVjbGlzdF9maXJzdCA9 IE5VTEw7CisJZW5naW5lLT5leGVjbGlzdHMucXVldWUgPSBSQl9ST09UOworCWVuZ2luZS0+ZXhl Y2xpc3RzLmZpcnN0ID0gTlVMTDsKIAogCWludGVsX2VuZ2luZV9pbml0X3RpbWVsaW5lKGVuZ2lu ZSk7CiAJaW50ZWxfZW5naW5lX2luaXRfaGFuZ2NoZWNrKGVuZ2luZSk7CkBAIC0xNDczLDExICsx NDczLDExIEBAIGJvb2wgaW50ZWxfZW5naW5lX2lzX2lkbGUoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKQogCQlyZXR1cm4gZmFsc2U7CiAKIAkvKiBCb3RoIHBvcnRzIGRyYWluZWQsIG5v IG1vcmUgRUxTUCBzdWJtaXNzaW9uPyAqLwotCWlmIChwb3J0X3JlcXVlc3QoJmVuZ2luZS0+ZXhl Y2xpc3RfcG9ydFswXSkpCisJaWYgKHBvcnRfcmVxdWVzdCgmZW5naW5lLT5leGVjbGlzdHMucG9y dFswXSkpCiAJCXJldHVybiBmYWxzZTsKIAogCS8qIEVMU1AgaXMgZW1wdHksIGJ1dCB0aGVyZSBh cmUgcmVhZHkgcmVxdWVzdHM/ICovCi0JaWYgKFJFQURfT05DRShlbmdpbmUtPmV4ZWNsaXN0X2Zp cnN0KSkKKwlpZiAoUkVBRF9PTkNFKGVuZ2luZS0+ZXhlY2xpc3RzLmZpcnN0KSkKIAkJcmV0dXJu IGZhbHNlOwogCiAJLyogUmluZyBzdG9wcGVkPyAqLwpAQCAtMTUyNiw4ICsxNTI2LDggQEAgdm9p ZCBpbnRlbF9lbmdpbmVzX21hcmtfaWRsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkK IAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBpOTE1LCBpZCkgewogCQlpbnRlbF9lbmdpbmVfZGlz YXJtX2JyZWFkY3J1bWJzKGVuZ2luZSk7CiAJCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfZmluaSgmZW5n aW5lLT5iYXRjaF9wb29sKTsKLQkJdGFza2xldF9raWxsKCZlbmdpbmUtPmlycV90YXNrbGV0KTsK LQkJZW5naW5lLT5ub19wcmlvbGlzdCA9IGZhbHNlOworCQl0YXNrbGV0X2tpbGwoJmVuZ2luZS0+ ZXhlY2xpc3RzLmlycV90YXNrbGV0KTsKKwkJZW5naW5lLT5leGVjbGlzdHMubm9fcHJpb2xpc3Qg PSBmYWxzZTsKIAl9CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggOTU1Yzg3OTk5 MjgwLi40ZjIwMmI4NDBlM2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0yOTEsMTcg KzI5MSwxOCBAQCBsb29rdXBfcHJpb2xpc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LAogCQlzdHJ1Y3QgaTkxNV9wcmlvdHJlZSAqcHQsCiAJCWludCBwcmlvKQogeworCXN0cnVjdCBp bnRlbF9lbmdpbmVfZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3RzID0gJmVuZ2luZS0+ZXhlY2xp c3RzOwogCXN0cnVjdCBpOTE1X3ByaW9saXN0ICpwOwogCXN0cnVjdCByYl9ub2RlICoqcGFyZW50 LCAqcmI7CiAJYm9vbCBmaXJzdCA9IHRydWU7CiAKLQlpZiAodW5saWtlbHkoZW5naW5lLT5ub19w cmlvbGlzdCkpCisJaWYgKHVubGlrZWx5KGV4ZWNsaXN0cy0+bm9fcHJpb2xpc3QpKQogCQlwcmlv ID0gSTkxNV9QUklPUklUWV9OT1JNQUw7CiAKIGZpbmRfcHJpb2xpc3Q6CiAJLyogbW9zdCBwb3Np dGl2ZSBwcmlvcml0eSBpcyBzY2hlZHVsZWQgZmlyc3QsIGVxdWFsIHByaW9yaXRpZXMgZmlmbyAq LwogCXJiID0gTlVMTDsKLQlwYXJlbnQgPSAmZW5naW5lLT5leGVjbGlzdF9xdWV1ZS5yYl9ub2Rl OworCXBhcmVudCA9ICZleGVjbGlzdHMtPnF1ZXVlLnJiX25vZGU7CiAJd2hpbGUgKCpwYXJlbnQp IHsKIAkJcmIgPSAqcGFyZW50OwogCQlwID0gcmJfZW50cnkocmIsIHR5cGVvZigqcCksIG5vZGUp OwpAQCAtMzE2LDcgKzMxNyw3IEBAIGxvb2t1cF9wcmlvbGlzdChzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUsCiAJfQogCiAJaWYgKHByaW8gPT0gSTkxNV9QUklPUklUWV9OT1JNQUwpIHsK LQkJcCA9ICZlbmdpbmUtPmRlZmF1bHRfcHJpb2xpc3Q7CisJCXAgPSAmZXhlY2xpc3RzLT5kZWZh dWx0X3ByaW9saXN0OwogCX0gZWxzZSB7CiAJCXAgPSBrbWVtX2NhY2hlX2FsbG9jKGVuZ2luZS0+ aTkxNS0+cHJpb3JpdGllcywgR0ZQX0FUT01JQyk7CiAJCS8qIENvbnZlcnQgYW4gYWxsb2NhdGlv biBmYWlsdXJlIHRvIGEgcHJpb3JpdHkgYnVtcCAqLwpAQCAtMzMxLDcgKzMzMiw3IEBAIGxvb2t1 cF9wcmlvbGlzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQkgKiByZXF1ZXN0 cywgc28gaWYgdXNlcnNwYWNlIGxpZWQgYWJvdXQgdGhlaXIKIAkJCSAqIGRlcGVuZGVuY2llcyB0 aGF0IHJlb3JkZXJpbmcgbWF5IGJlIHZpc2libGUuCiAJCQkgKi8KLQkJCWVuZ2luZS0+bm9fcHJp b2xpc3QgPSB0cnVlOworCQkJZXhlY2xpc3RzLT5ub19wcmlvbGlzdCA9IHRydWU7CiAJCQlnb3Rv IGZpbmRfcHJpb2xpc3Q7CiAJCX0KIAl9CkBAIC0zMzksMTAgKzM0MCwxMCBAQCBsb29rdXBfcHJp b2xpc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCXAtPnByaW9yaXR5ID0gcHJp bzsKIAlJTklUX0xJU1RfSEVBRCgmcC0+cmVxdWVzdHMpOwogCXJiX2xpbmtfbm9kZSgmcC0+bm9k ZSwgcmIsIHBhcmVudCk7Ci0JcmJfaW5zZXJ0X2NvbG9yKCZwLT5ub2RlLCAmZW5naW5lLT5leGVj bGlzdF9xdWV1ZSk7CisJcmJfaW5zZXJ0X2NvbG9yKCZwLT5ub2RlLCAmZXhlY2xpc3RzLT5xdWV1 ZSk7CiAKIAlpZiAoZmlyc3QpCi0JCWVuZ2luZS0+ZXhlY2xpc3RfZmlyc3QgPSAmcC0+bm9kZTsK KwkJZXhlY2xpc3RzLT5maXJzdCA9ICZwLT5ub2RlOwogCiAJcmV0dXJuIHB0cl9wYWNrX2JpdHMo cCwgZmlyc3QsIDEpOwogfQpAQCAtMzkzLDEyICszOTQsMTIgQEAgc3RhdGljIHU2NCBleGVjbGlz dHNfdXBkYXRlX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIAogc3Rh dGljIHZvaWQgZXhlY2xpc3RzX3N1Ym1pdF9wb3J0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCiB7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0 X3BvcnQ7CisJc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0cy5w b3J0OwogCXUzMiBfX2lvbWVtICplbHNwID0KIAkJZW5naW5lLT5pOTE1LT5yZWdzICsgaTkxNV9t bWlvX3JlZ19vZmZzZXQoUklOR19FTFNQKGVuZ2luZSkpOwogCXVuc2lnbmVkIGludCBuOwogCi0J Zm9yIChuID0gQVJSQVlfU0laRShlbmdpbmUtPmV4ZWNsaXN0X3BvcnQpOyBuLS07ICkgeworCWZv ciAobiA9IEFSUkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdHMucG9ydCk7IG4tLTsgKSB7CiAJCXN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7CiAJCXVuc2lnbmVkIGludCBjb3VudDsKIAkJ dTY0IGRlc2M7CkBAIC00NTMsNyArNDU0LDcgQEAgc3RhdGljIHZvaWQgcG9ydF9hc3NpZ24oc3Ry dWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQsCiBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpsYXN0OwotCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVj bGlzdF9wb3J0OworCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlz dHMucG9ydDsKIAlzdHJ1Y3QgcmJfbm9kZSAqcmI7CiAJYm9vbCBzdWJtaXQgPSBmYWxzZTsKIApA QCAtNDkxLDggKzQ5Miw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkgKi8KIAogCXNwaW5fbG9ja19pcnEoJmVuZ2luZS0+ dGltZWxpbmUtPmxvY2spOwotCXJiID0gZW5naW5lLT5leGVjbGlzdF9maXJzdDsKLQlHRU1fQlVH X09OKHJiX2ZpcnN0KCZlbmdpbmUtPmV4ZWNsaXN0X3F1ZXVlKSAhPSByYik7CisJcmIgPSBlbmdp bmUtPmV4ZWNsaXN0cy5maXJzdDsKKwlHRU1fQlVHX09OKHJiX2ZpcnN0KCZlbmdpbmUtPmV4ZWNs aXN0cy5xdWV1ZSkgIT0gcmIpOwogCXdoaWxlIChyYikgewogCQlzdHJ1Y3QgaTkxNV9wcmlvbGlz dCAqcCA9IHJiX2VudHJ5KHJiLCB0eXBlb2YoKnApLCBub2RlKTsKIAkJc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpycSwgKnJuOwpAQCAtNTE1LDcgKzUxNiw3IEBAIHN0YXRpYyB2b2lkIGV4 ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJCQkgKiBj b21iaW5lIHRoaXMgcmVxdWVzdCB3aXRoIHRoZSBsYXN0LCB0aGVuIHdlCiAJCQkJICogYXJlIGRv bmUuCiAJCQkJICovCi0JCQkJaWYgKHBvcnQgIT0gZW5naW5lLT5leGVjbGlzdF9wb3J0KSB7CisJ CQkJaWYgKHBvcnQgIT0gZW5naW5lLT5leGVjbGlzdHMucG9ydCkgewogCQkJCQlfX2xpc3RfZGVs X21hbnkoJnAtPnJlcXVlc3RzLAogCQkJCQkJCSZycS0+cHJpb3RyZWUubGluayk7CiAJCQkJCWdv dG8gZG9uZTsKQEAgLTU1MiwxMyArNTUzLDEzIEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1 ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJfQogCiAJCXJiID0gcmJfbmV4 dChyYik7Ci0JCXJiX2VyYXNlKCZwLT5ub2RlLCAmZW5naW5lLT5leGVjbGlzdF9xdWV1ZSk7CisJ CXJiX2VyYXNlKCZwLT5ub2RlLCAmZW5naW5lLT5leGVjbGlzdHMucXVldWUpOwogCQlJTklUX0xJ U1RfSEVBRCgmcC0+cmVxdWVzdHMpOwogCQlpZiAocC0+cHJpb3JpdHkgIT0gSTkxNV9QUklPUklU WV9OT1JNQUwpCiAJCQlrbWVtX2NhY2hlX2ZyZWUoZW5naW5lLT5pOTE1LT5wcmlvcml0aWVzLCBw KTsKIAl9CiBkb25lOgotCWVuZ2luZS0+ZXhlY2xpc3RfZmlyc3QgPSByYjsKKwllbmdpbmUtPmV4 ZWNsaXN0cy5maXJzdCA9IHJiOwogCWlmIChzdWJtaXQpCiAJCXBvcnRfYXNzaWduKHBvcnQsIGxh c3QpOwogCXNwaW5fdW5sb2NrX2lycSgmZW5naW5lLT50aW1lbGluZS0+bG9jayk7CkBAIC01Njks NyArNTcwLDggQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2RlcXVldWUoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQogCiBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY2FuY2VsX3JlcXVlc3Rz KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKLQlzdHJ1Y3QgZXhlY2xpc3RfcG9y dCAqcG9ydCA9IGVuZ2luZS0+ZXhlY2xpc3RfcG9ydDsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4 ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cyA9ICZlbmdpbmUtPmV4ZWNsaXN0czsKKwlzdHJ1Y3Qg ZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGV4ZWNsaXN0cy0+cG9ydDsKIAlzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJxLCAqcm47CiAJc3RydWN0IHJiX25vZGUgKnJiOwogCXVuc2lnbmVkIGxv bmcgZmxhZ3M7CkBAIC01NzgsOSArNTgwLDkgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NhbmNl bF9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJc3Bpbl9sb2NrX2ly cXNhdmUoJmVuZ2luZS0+dGltZWxpbmUtPmxvY2ssIGZsYWdzKTsKIAogCS8qIENhbmNlbCB0aGUg cmVxdWVzdHMgb24gdGhlIEhXIGFuZCBjbGVhciB0aGUgRUxTUCB0cmFja2VyLiAqLwotCWZvciAo biA9IDA7IG4gPCBBUlJBWV9TSVpFKGVuZ2luZS0+ZXhlY2xpc3RfcG9ydCk7IG4rKykKKwlmb3Ig KG4gPSAwOyBuIDwgQVJSQVlfU0laRShleGVjbGlzdHMtPnBvcnQpOyBuKyspCiAJCWk5MTVfZ2Vt X3JlcXVlc3RfcHV0KHBvcnRfcmVxdWVzdCgmcG9ydFtuXSkpOwotCW1lbXNldChlbmdpbmUtPmV4 ZWNsaXN0X3BvcnQsIDAsIHNpemVvZihlbmdpbmUtPmV4ZWNsaXN0X3BvcnQpKTsKKwltZW1zZXQo ZXhlY2xpc3RzLT5wb3J0LCAwLCBzaXplb2YoZXhlY2xpc3RzLT5wb3J0KSk7CiAKIAkvKiBNYXJr IGFsbCBleGVjdXRpbmcgcmVxdWVzdHMgYXMgc2tpcHBlZC4gKi8KIAlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KHJxLCAmZW5naW5lLT50aW1lbGluZS0+cmVxdWVzdHMsIGxpbmspIHsKQEAgLTU5MCw3ICs1 OTIsNyBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY2FuY2VsX3JlcXVlc3RzKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAl9CiAKIAkvKiBGbHVzaCB0aGUgcXVldWVkIHJlcXVlc3Rz IHRvIHRoZSB0aW1lbGluZSBsaXN0IChmb3IgcmV0aXJpbmcpLiAqLwotCXJiID0gZW5naW5lLT5l eGVjbGlzdF9maXJzdDsKKwlyYiA9IGV4ZWNsaXN0cy0+Zmlyc3Q7CiAJd2hpbGUgKHJiKSB7CiAJ CXN0cnVjdCBpOTE1X3ByaW9saXN0ICpwID0gcmJfZW50cnkocmIsIHR5cGVvZigqcCksIG5vZGUp OwogCkBAIC02MDMsNyArNjA1LDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NhbmNlbF9yZXF1 ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCX0KIAogCQlyYiA9IHJiX25l eHQocmIpOwotCQlyYl9lcmFzZSgmcC0+bm9kZSwgJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpOwor CQlyYl9lcmFzZSgmcC0+bm9kZSwgJmV4ZWNsaXN0cy0+cXVldWUpOwogCQlJTklUX0xJU1RfSEVB RCgmcC0+cmVxdWVzdHMpOwogCQlpZiAocC0+cHJpb3JpdHkgIT0gSTkxNV9QUklPUklUWV9OT1JN QUwpCiAJCQlrbWVtX2NhY2hlX2ZyZWUoZW5naW5lLT5pOTE1LT5wcmlvcml0aWVzLCBwKTsKQEAg LTYxMSw4ICs2MTMsOCBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY2FuY2VsX3JlcXVlc3RzKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCS8qIFJlbWFpbmluZyBfdW5yZWFkeV8g cmVxdWVzdHMgd2lsbCBiZSBub3AnZWQgd2hlbiBzdWJtaXR0ZWQgKi8KIAotCWVuZ2luZS0+ZXhl Y2xpc3RfcXVldWUgPSBSQl9ST09UOwotCWVuZ2luZS0+ZXhlY2xpc3RfZmlyc3QgPSBOVUxMOwor CWV4ZWNsaXN0cy0+cXVldWUgPSBSQl9ST09UOworCWV4ZWNsaXN0cy0+Zmlyc3QgPSBOVUxMOwog CUdFTV9CVUdfT04ocG9ydF9pc3NldCgmcG9ydFswXSkpOwogCiAJLyoKQEAgLTYyOCw3ICs2MzAs NyBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY2FuY2VsX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKIAogc3RhdGljIGJvb2wgZXhlY2xpc3RzX2Vsc3BfcmVhZHkoY29u c3Qgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCWNvbnN0IHN0cnVjdCBleGVj bGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlzdF9wb3J0OworCWNvbnN0IHN0cnVjdCBl eGVjbGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlzdHMucG9ydDsKIAogCXJldHVybiBw b3J0X2NvdW50KCZwb3J0WzBdKSArIHBvcnRfY291bnQoJnBvcnRbMV0pIDwgMjsKIH0KQEAgLTYz OSw4ICs2NDEsOSBAQCBzdGF0aWMgYm9vbCBleGVjbGlzdHNfZWxzcF9yZWFkeShjb25zdCBzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAgKi8KIHN0YXRpYyB2b2lkIGludGVsX2xyY19p cnFfaGFuZGxlcih1bnNpZ25lZCBsb25nIGRhdGEpCiB7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lID0gKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKilkYXRhOwotCXN0cnVjdCBleGVj bGlzdF9wb3J0ICpwb3J0ID0gZW5naW5lLT5leGVjbGlzdF9wb3J0OworCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKiBjb25zdCBlbmdpbmUgPSAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqKWRhdGE7 CisJc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlzdHMgPSAmZW5n aW5lLT5leGVjbGlzdHM7CisJc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBleGVjbGlzdHMt PnBvcnQ7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1 OwogCiAJLyogV2UgY2FuIHNraXAgYWNxdWlyaW5nIGludGVsX3J1bnRpbWVfcG1fZ2V0KCkgaGVy ZSBhcyBpdCB3YXMgdGFrZW4KQEAgLTY1Miw3ICs2NTUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9s cmNfaXJxX2hhbmRsZXIodW5zaWduZWQgbG9uZyBkYXRhKQogCSAqLwogCUdFTV9CVUdfT04oIWRl dl9wcml2LT5ndC5hd2FrZSk7CiAKLQlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJp diwgZW5naW5lLT5md19kb21haW5zKTsKKwlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZf cHJpdiwgZXhlY2xpc3RzLT5md19kb21haW5zKTsKIAogCS8qIFByZWZlciBkb2luZyB0ZXN0X2Fu ZF9jbGVhcl9iaXQoKSBhcyBhIHR3byBzdGFnZSBvcGVyYXRpb24gdG8gYXZvaWQKIAkgKiBpbXBv c2luZyB0aGUgY29zdCBvZiBhIGxvY2tlZCBhdG9taWMgdHJhbnNhY3Rpb24gd2hlbiBzdWJtaXR0 aW5nIGEKQEAgLTY2NSwxMCArNjY4LDEwIEBAIHN0YXRpYyB2b2lkIGludGVsX2xyY19pcnFfaGFu ZGxlcih1bnNpZ25lZCBsb25nIGRhdGEpCiAJCXVuc2lnbmVkIGludCBoZWFkLCB0YWlsOwogCiAJ CS8qIEhvd2V2ZXIgR1ZUIGVtdWxhdGlvbiBkZXBlbmRzIHVwb24gaW50ZXJjZXB0aW5nIENTQiBt bWlvICovCi0JCWlmICh1bmxpa2VseShlbmdpbmUtPmNzYl91c2VfbW1pbykpIHsKKwkJaWYgKHVu bGlrZWx5KGV4ZWNsaXN0cy0+Y3NiX3VzZV9tbWlvKSkgewogCQkJYnVmID0gKHUzMiAqIF9fZm9y Y2UpCiAJCQkJKGRldl9wcml2LT5yZWdzICsgaTkxNV9tbWlvX3JlZ19vZmZzZXQoUklOR19DT05U RVhUX1NUQVRVU19CVUZfTE8oZW5naW5lLCAwKSkpOwotCQkJZW5naW5lLT5jc2JfaGVhZCA9IC0x OyAvKiBmb3JjZSBtbWlvIHJlYWQgb2YgQ1NCIHB0cnMgKi8KKwkJCWV4ZWNsaXN0cy0+Y3NiX2hl YWQgPSAtMTsgLyogZm9yY2UgbW1pbyByZWFkIG9mIENTQiBwdHJzICovCiAJCX0KIAogCQkvKiBU aGUgd3JpdGUgd2lsbCBiZSBvcmRlcmVkIGJ5IHRoZSB1bmNhY2hlZCByZWFkIChpdHNlbGYKQEAg LTY4MiwxOSArNjg1LDIwIEBAIHN0YXRpYyB2b2lkIGludGVsX2xyY19pcnFfaGFuZGxlcih1bnNp Z25lZCBsb25nIGRhdGEpCiAJCSAqIGlzIHNldCBhbmQgd2UgZG8gYSBuZXcgbG9vcC4KIAkJICov CiAJCV9fY2xlYXJfYml0KEVOR0lORV9JUlFfRVhFQ0xJU1QsICZlbmdpbmUtPmlycV9wb3N0ZWQp OwotCQlpZiAodW5saWtlbHkoZW5naW5lLT5jc2JfaGVhZCA9PSAtMSkpIHsgLyogZm9sbG93aW5n IGEgcmVzZXQgKi8KKwkJaWYgKHVubGlrZWx5KGV4ZWNsaXN0cy0+Y3NiX2hlYWQgPT0gLTEpKSB7 IC8qIGZvbGxvd2luZyBhIHJlc2V0ICovCiAJCQloZWFkID0gcmVhZGwoZGV2X3ByaXYtPnJlZ3Mg KyBpOTE1X21taW9fcmVnX29mZnNldChSSU5HX0NPTlRFWFRfU1RBVFVTX1BUUihlbmdpbmUpKSk7 CiAJCQl0YWlsID0gR0VOOF9DU0JfV1JJVEVfUFRSKGhlYWQpOwogCQkJaGVhZCA9IEdFTjhfQ1NC X1JFQURfUFRSKGhlYWQpOwotCQkJZW5naW5lLT5jc2JfaGVhZCA9IGhlYWQ7CisJCQlleGVjbGlz dHMtPmNzYl9oZWFkID0gaGVhZDsKIAkJfSBlbHNlIHsKIAkJCWNvbnN0IGludCB3cml0ZV9pZHgg PQogCQkJCWludGVsX2h3c19jc2Jfd3JpdGVfaW5kZXgoZGV2X3ByaXYpIC0KIAkJCQlJOTE1X0hX U19DU0JfQlVGMF9JTkRFWDsKIAotCQkJaGVhZCA9IGVuZ2luZS0+Y3NiX2hlYWQ7CisJCQloZWFk ID0gZXhlY2xpc3RzLT5jc2JfaGVhZDsKIAkJCXRhaWwgPSBSRUFEX09OQ0UoYnVmW3dyaXRlX2lk eF0pOwogCQl9CisKIAkJd2hpbGUgKGhlYWQgIT0gdGFpbCkgewogCQkJc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpycTsKIAkJCXVuc2lnbmVkIGludCBzdGF0dXM7CkBAIC03NDgsOCArNzUy LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfbHJjX2lycV9oYW5kbGVyKHVuc2lnbmVkIGxvbmcgZGF0 YSkKIAkJCQkgICAhKHN0YXR1cyAmIEdFTjhfQ1RYX1NUQVRVU19BQ1RJVkVfSURMRSkpOwogCQl9 CiAKLQkJaWYgKGhlYWQgIT0gZW5naW5lLT5jc2JfaGVhZCkgewotCQkJZW5naW5lLT5jc2JfaGVh ZCA9IGhlYWQ7CisJCWlmIChoZWFkICE9IGV4ZWNsaXN0cy0+Y3NiX2hlYWQpIHsKKwkJCWV4ZWNs aXN0cy0+Y3NiX2hlYWQgPSBoZWFkOwogCQkJd3JpdGVsKF9NQVNLRURfRklFTEQoR0VOOF9DU0Jf UkVBRF9QVFJfTUFTSywgaGVhZCA8PCA4KSwKIAkJCSAgICAgICBkZXZfcHJpdi0+cmVncyArIGk5 MTVfbW1pb19yZWdfb2Zmc2V0KFJJTkdfQ09OVEVYVF9TVEFUVVNfUFRSKGVuZ2luZSkpKTsKIAkJ fQpAQCAtNzU4LDcgKzc2Miw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2xyY19pcnFfaGFuZGxlcih1 bnNpZ25lZCBsb25nIGRhdGEpCiAJaWYgKGV4ZWNsaXN0c19lbHNwX3JlYWR5KGVuZ2luZSkpCiAJ CWV4ZWNsaXN0c19kZXF1ZXVlKGVuZ2luZSk7CiAKLQlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1 dChkZXZfcHJpdiwgZW5naW5lLT5md19kb21haW5zKTsKKwlpbnRlbF91bmNvcmVfZm9yY2V3YWtl X3B1dChkZXZfcHJpdiwgZXhlY2xpc3RzLT5md19kb21haW5zKTsKIH0KIAogc3RhdGljIHZvaWQg aW5zZXJ0X3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLApAQCAtNzY5LDcg Kzc3Myw3IEBAIHN0YXRpYyB2b2lkIGluc2VydF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSwKIAogCWxpc3RfYWRkX3RhaWwoJnB0LT5saW5rLCAmcHRyX21hc2tfYml0cyhw LCAxKS0+cmVxdWVzdHMpOwogCWlmIChwdHJfdW5tYXNrX2JpdHMocCwgMSkgJiYgZXhlY2xpc3Rz X2Vsc3BfcmVhZHkoZW5naW5lKSkKLQkJdGFza2xldF9oaV9zY2hlZHVsZSgmZW5naW5lLT5pcnFf dGFza2xldCk7CisJCXRhc2tsZXRfaGlfc2NoZWR1bGUoJmVuZ2luZS0+ZXhlY2xpc3RzLmlycV90 YXNrbGV0KTsKIH0KIAogc3RhdGljIHZvaWQgZXhlY2xpc3RzX3N1Ym1pdF9yZXF1ZXN0KHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKQEAgLTc4Miw3ICs3ODYsNyBAQCBzdGF0 aWMgdm9pZCBleGVjbGlzdHNfc3VibWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXF1ZXN0KQogCiAJaW5zZXJ0X3JlcXVlc3QoZW5naW5lLCAmcmVxdWVzdC0+cHJpb3Ry ZWUsIHJlcXVlc3QtPnByaW90cmVlLnByaW9yaXR5KTsKIAotCUdFTV9CVUdfT04oIWVuZ2luZS0+ ZXhlY2xpc3RfZmlyc3QpOworCUdFTV9CVUdfT04oIWVuZ2luZS0+ZXhlY2xpc3RzLmZpcnN0KTsK IAlHRU1fQlVHX09OKGxpc3RfZW1wdHkoJnJlcXVlc3QtPnByaW90cmVlLmxpbmspKTsKIAogCXNw aW5fdW5sb2NrX2lycXJlc3RvcmUoJmVuZ2luZS0+dGltZWxpbmUtPmxvY2ssIGZsYWdzKTsKQEAg LTEyODksNiArMTI5Myw3IEBAIHN0YXRpYyB1OCBndGlpcltdID0gewogc3RhdGljIGludCBnZW44 X2luaXRfY29tbW9uX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKKwlzdHJ1Y3Qg aW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cyA9ICZlbmdpbmUtPmV4ZWNs aXN0czsKIAlpbnQgcmV0OwogCiAJcmV0ID0gaW50ZWxfbW9jc19pbml0X2VuZ2luZShlbmdpbmUp OwpAQCAtMTMyMSwxMSArMTMyNiwxMSBAQCBzdGF0aWMgaW50IGdlbjhfaW5pdF9jb21tb25fcmlu ZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJSTkxNV9XUklURShHRU44X0dUX0lJ UihndGlpcltlbmdpbmUtPmlkXSksCiAJCSAgIEdUX0NPTlRFWFRfU1dJVENIX0lOVEVSUlVQVCA8 PCBlbmdpbmUtPmlycV9zaGlmdCk7CiAJY2xlYXJfYml0KEVOR0lORV9JUlFfRVhFQ0xJU1QsICZl bmdpbmUtPmlycV9wb3N0ZWQpOwotCWVuZ2luZS0+Y3NiX2hlYWQgPSAtMTsKKwlleGVjbGlzdHMt PmNzYl9oZWFkID0gLTE7CiAKIAkvKiBBZnRlciBhIEdQVSByZXNldCwgd2UgbWF5IGhhdmUgcmVx dWVzdHMgdG8gcmVwbGF5ICovCi0JaWYgKCFpOTE1X21vZHBhcmFtcy5lbmFibGVfZ3VjX3N1Ym1p c3Npb24gJiYgZW5naW5lLT5leGVjbGlzdF9maXJzdCkKLQkJdGFza2xldF9zY2hlZHVsZSgmZW5n aW5lLT5pcnFfdGFza2xldCk7CisJaWYgKCFpOTE1X21vZHBhcmFtcy5lbmFibGVfZ3VjX3N1Ym1p c3Npb24gJiYgZXhlY2xpc3RzLT5maXJzdCkKKwkJdGFza2xldF9zY2hlZHVsZSgmZXhlY2xpc3Rz LT5pcnFfdGFza2xldCk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTEzNjYsNyArMTM3MSw4IEBAIHN0 YXRpYyBpbnQgZ2VuOV9pbml0X3JlbmRlcl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIHN0YXRpYyB2b2lkIHJlc2V0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSwKIAkJCSAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVz dCkKIHsKLQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGVuZ2luZS0+ZXhlY2xpc3RfcG9y dDsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cyA9ICZl bmdpbmUtPmV4ZWNsaXN0czsKKwlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGV4ZWNsaXN0 cy0+cG9ydDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxLCAqcm47CiAJc3RydWN0 IGludGVsX2NvbnRleHQgKmNlOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CkBAIC0xMzgzLDkgKzEz ODksOSBAQCBzdGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUsCiAJICogZ3Vlc3NpbmcgdGhlIG1pc3NlZCBjb250ZXh0LXN3aXRjaCBldmVu dHMgYnkgbG9va2luZyBhdCB3aGF0CiAJICogcmVxdWVzdHMgd2VyZSBjb21wbGV0ZWQuCiAJICov Ci0JZm9yIChuID0gMDsgbiA8IEFSUkFZX1NJWkUoZW5naW5lLT5leGVjbGlzdF9wb3J0KTsgbisr KQorCWZvciAobiA9IDA7IG4gPCBBUlJBWV9TSVpFKGV4ZWNsaXN0cy0+cG9ydCk7IG4rKykKIAkJ aTkxNV9nZW1fcmVxdWVzdF9wdXQocG9ydF9yZXF1ZXN0KCZwb3J0W25dKSk7Ci0JbWVtc2V0KGVu Z2luZS0+ZXhlY2xpc3RfcG9ydCwgMCwgc2l6ZW9mKGVuZ2luZS0+ZXhlY2xpc3RfcG9ydCkpOwor CW1lbXNldChleGVjbGlzdHMtPnBvcnQsIDAsIHNpemVvZihleGVjbGlzdHMtPnBvcnQpKTsKIAog CS8qIFB1c2ggYmFjayBhbnkgaW5jb21wbGV0ZSByZXF1ZXN0cyBmb3IgcmVwbGF5IGFmdGVyIHRo ZSByZXNldC4gKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmVfcmV2ZXJzZShycSwgcm4sCkBA IC0xNzE5LDggKzE3MjUsOCBAQCB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19jbGVhbnVwKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkgKiBUYXNrbGV0IGNhbm5vdCBiZSBhY3RpdmUg YXQgdGhpcyBwb2ludCBkdWUgaW50ZWxfbWFya19hY3RpdmUvaWRsZQogCSAqIHNvIHRoaXMgaXMg anVzdCBmb3IgZG9jdW1lbnRhdGlvbi4KIAkgKi8KLQlpZiAoV0FSTl9PTih0ZXN0X2JpdChUQVNL TEVUX1NUQVRFX1NDSEVELCAmZW5naW5lLT5pcnFfdGFza2xldC5zdGF0ZSkpKQotCQl0YXNrbGV0 X2tpbGwoJmVuZ2luZS0+aXJxX3Rhc2tsZXQpOworCWlmIChXQVJOX09OKHRlc3RfYml0KFRBU0tM RVRfU1RBVEVfU0NIRUQsICZlbmdpbmUtPmV4ZWNsaXN0cy5pcnFfdGFza2xldC5zdGF0ZSkpKQor CQl0YXNrbGV0X2tpbGwoJmVuZ2luZS0+ZXhlY2xpc3RzLmlycV90YXNrbGV0KTsKIAogCWRldl9w cml2ID0gZW5naW5lLT5pOTE1OwogCkBAIC0xNzQ0LDcgKzE3NTAsNyBAQCBzdGF0aWMgdm9pZCBl eGVjbGlzdHNfc2V0X2RlZmF1bHRfc3VibWlzc2lvbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCiAJZW5naW5lLT5zdWJtaXRfcmVxdWVzdCA9IGV4ZWNsaXN0c19zdWJtaXRfcmVxdWVz dDsKIAllbmdpbmUtPmNhbmNlbF9yZXF1ZXN0cyA9IGV4ZWNsaXN0c19jYW5jZWxfcmVxdWVzdHM7 CiAJZW5naW5lLT5zY2hlZHVsZSA9IGV4ZWNsaXN0c19zY2hlZHVsZTsKLQllbmdpbmUtPmlycV90 YXNrbGV0LmZ1bmMgPSBpbnRlbF9scmNfaXJxX2hhbmRsZXI7CisJZW5naW5lLT5leGVjbGlzdHMu aXJxX3Rhc2tsZXQuZnVuYyA9IGludGVsX2xyY19pcnFfaGFuZGxlcjsKIH0KIAogc3RhdGljIHZv aWQKQEAgLTE4MDYsNyArMTgxMiw3IEBAIGxvZ2ljYWxfcmluZ19zZXR1cChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiAJLyogSW50ZW50aW9uYWxseSBsZWZ0IGJsYW5rLiAqLwogCWVu Z2luZS0+YnVmZmVyID0gTlVMTDsKIAotCWVuZ2luZS0+Y3NiX3VzZV9tbWlvID0gaXJxX2hhbmRs ZXJfZm9yY2VfbW1pbyhkZXZfcHJpdik7CisJZW5naW5lLT5leGVjbGlzdHMuY3NiX3VzZV9tbWlv ID0gaXJxX2hhbmRsZXJfZm9yY2VfbW1pbyhkZXZfcHJpdik7CiAKIAlmd19kb21haW5zID0gaW50 ZWxfdW5jb3JlX2ZvcmNld2FrZV9mb3JfcmVnKGRldl9wcml2LAogCQkJCQkJICAgIFJJTkdfRUxT UChlbmdpbmUpLApAQCAtMTgyMCw5ICsxODI2LDkgQEAgbG9naWNhbF9yaW5nX3NldHVwKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJCQkJCSAgICAgUklOR19DT05URVhUX1NUQVRV U19CVUZfQkFTRShlbmdpbmUpLAogCQkJCQkJICAgICBGV19SRUdfUkVBRCk7CiAKLQllbmdpbmUt PmZ3X2RvbWFpbnMgPSBmd19kb21haW5zOworCWVuZ2luZS0+ZXhlY2xpc3RzLmZ3X2RvbWFpbnMg PSBmd19kb21haW5zOwogCi0JdGFza2xldF9pbml0KCZlbmdpbmUtPmlycV90YXNrbGV0LAorCXRh c2tsZXRfaW5pdCgmZW5naW5lLT5leGVjbGlzdHMuaXJxX3Rhc2tsZXQsCiAJCSAgICAgaW50ZWxf bHJjX2lycV9oYW5kbGVyLCAodW5zaWduZWQgbG9uZyllbmdpbmUpOwogCiAJbG9naWNhbF9yaW5n X2RlZmF1bHRfdmZ1bmNzKGVuZ2luZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmgKaW5kZXggMTM4MTE2YTNiNTM3Li40MjFlNzY5YWRiNzkgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTE4NCw2ICsxODQsODQgQEAgc3RydWN0IGk5MTVf cHJpb2xpc3QgewogCWludCBwcmlvcml0eTsKIH07CiAKKy8qKgorICogc3RydWN0IGludGVsX2Vu Z2luZV9leGVjbGlzdHMgLSBleGVjbGlzdCBzdWJtaXNzaW9uIHF1ZXVlIGFuZCBwb3J0IHN0YXRl CisgKgorICogVGhlIHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzIHJlcHJlc2VudHMgdGhl IGNvbWJpbmVkIGxvZ2ljYWwgc3RhdGUgb2YKKyAqIGRyaXZlciBhbmQgdGhlIGhhcmR3YXJlIHN0 YXRlIGZvciBleGVjbGlzdCBtb2RlIG9mIHN1Ym1pc3Npb24uCisgKi8KK3N0cnVjdCBpbnRlbF9l bmdpbmVfZXhlY2xpc3RzIHsKKwkvKioKKwkgKiBAaXJxX3Rhc2tsZXQ6IHNvZnRpcnEgdGFza2xl dCBmb3IgYm90dG9tIGhhbmRsZXIKKwkgKi8KKwlzdHJ1Y3QgdGFza2xldF9zdHJ1Y3QgaXJxX3Rh c2tsZXQ7CisKKwkvKioKKwkgKiBAZGVmYXVsdF9wcmlvbGlzdDogcHJpb3JpdHkgbGlzdCBmb3Ig STkxNV9QUklPUklUWV9OT1JNQUwKKwkgKi8KKwlzdHJ1Y3QgaTkxNV9wcmlvbGlzdCBkZWZhdWx0 X3ByaW9saXN0OworCisJLyoqCisJICogQG5vX3ByaW9saXN0OiBwcmlvcml0eSBsaXN0cyBkaXNh YmxlZAorCSAqLworCWJvb2wgbm9fcHJpb2xpc3Q7CisKKwkvKioKKwkgKiBAcG9ydDogZXhlY2xp c3QgcG9ydCBzdGF0ZXMKKwkgKgorCSAqIEZvciBlYWNoIGhhcmR3YXJlIEVMU1AgKEV4ZWNMaXN0 IFN1Ym1pc3Npb24gUG9ydCkgd2Uga2VlcAorCSAqIHRyYWNrIG9mIHRoZSBsYXN0IHJlcXVlc3Qg YW5kIHRoZSBudW1iZXIgb2YgdGltZXMgd2Ugc3VibWl0dGVkCisJICogdGhhdCBwb3J0IHRvIGh3 LiBXZSB0aGVuIGNvdW50IHRoZSBudW1iZXIgb2YgdGltZXMgdGhlIGh3IHJlcG9ydHMKKwkgKiBh IGNvbnRleHQgY29tcGxldGlvbiBvciBwcmVlbXB0aW9uLiBBcyBvbmx5IG9uZSBjb250ZXh0IGNh bgorCSAqIGJlIGFjdGl2ZSBvbiBodywgd2UgbGltaXQgcmVzdWJtaXNzaW9uIG9mIGNvbnRleHQg dG8gcG9ydFswXS4gVGhpcworCSAqIGlzIGNhbGxlZCBMaXRlIFJlc3RvcmUsIG9mIHRoZSBjb250 ZXh0LgorCSAqLworCXN0cnVjdCBleGVjbGlzdF9wb3J0IHsKKwkJLyoqCisJCSAqIEByZXF1ZXN0 X2NvdW50OiBjb21iaW5lZCByZXF1ZXN0IGFuZCBzdWJtaXNzaW9uIGNvdW50CisJCSAqLworCQlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3RfY291bnQ7CisjZGVmaW5lIEVYRUNM SVNUX0NPVU5UX0JJVFMgMgorI2RlZmluZSBwb3J0X3JlcXVlc3QocCkgcHRyX21hc2tfYml0cygo cCktPnJlcXVlc3RfY291bnQsIEVYRUNMSVNUX0NPVU5UX0JJVFMpCisjZGVmaW5lIHBvcnRfY291 bnQocCkgcHRyX3VubWFza19iaXRzKChwKS0+cmVxdWVzdF9jb3VudCwgRVhFQ0xJU1RfQ09VTlRf QklUUykKKyNkZWZpbmUgcG9ydF9wYWNrKHJxLCBjb3VudCkgcHRyX3BhY2tfYml0cyhycSwgY291 bnQsIEVYRUNMSVNUX0NPVU5UX0JJVFMpCisjZGVmaW5lIHBvcnRfdW5wYWNrKHAsIGNvdW50KSBw dHJfdW5wYWNrX2JpdHMoKHApLT5yZXF1ZXN0X2NvdW50LCBjb3VudCwgRVhFQ0xJU1RfQ09VTlRf QklUUykKKyNkZWZpbmUgcG9ydF9zZXQocCwgcGFja2VkKSAoKHApLT5yZXF1ZXN0X2NvdW50ID0g KHBhY2tlZCkpCisjZGVmaW5lIHBvcnRfaXNzZXQocCkgKChwKS0+cmVxdWVzdF9jb3VudCkKKyNk ZWZpbmUgcG9ydF9pbmRleChwLCBlKSAoKHApIC0gKGUpLT5leGVjbGlzdHMucG9ydCkKKworCQkv KioKKwkJICogQGNvbnRleHRfaWQ6IGNvbnRleHQgSUQgZm9yIHBvcnQKKwkJICovCisJCUdFTV9E RUJVR19ERUNMKHUzMiBjb250ZXh0X2lkKTsKKwl9IHBvcnRbMl07CisKKwkvKioKKwkgKiBAcXVl dWU6IHF1ZXVlIG9mIHJlcXVlc3RzLCBpbiBwcmlvcml0eSBsaXN0cworCSAqLworCXN0cnVjdCBy Yl9yb290IHF1ZXVlOworCisJLyoqCisJICogQGZpcnN0OiBsZWZ0bW9zdCBsZXZlbCBpbiBwcmlv cml0eSBAcXVldWUKKwkgKi8KKwlzdHJ1Y3QgcmJfbm9kZSAqZmlyc3Q7CisKKwkvKioKKwkgKiBA ZndfZG9tYWluczogZm9yY2V3YWtlIGRvbWFpbnMgZm9yIGlycSB0YXNrbGV0CisJICovCisJdW5z aWduZWQgaW50IGZ3X2RvbWFpbnM7CisKKwkvKioKKwkgKiBAY3NiX2hlYWQ6IGNvbnRleHQgc3Rh dHVzIGJ1ZmZlciBoZWFkCisJICovCisJdW5zaWduZWQgaW50IGNzYl9oZWFkOworCisJLyoqCisJ ICogQGNzYl91c2VfbW1pbzogYWNjZXNzIGNzYiB0aHJvdWdoIG1taW8sIGluc3RlYWQgb2YgaHdz cAorCSAqLworCWJvb2wgY3NiX3VzZV9tbWlvOworfTsKKwogI2RlZmluZSBJTlRFTF9FTkdJTkVf Q1NfTUFYX05BTUUgOAogCiBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKQEAgLTM4MCwyNyArNDU4 LDcgQEAgc3RydWN0IGludGVsX2VuZ2luZV9jcyB7CiAJCXUzMgkqKCpzaWduYWwpKHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCB1MzIgKmNzKTsKIAl9IHNlbWFwaG9yZTsKIAotCS8q IEV4ZWNsaXN0cyAqLwotCXN0cnVjdCB0YXNrbGV0X3N0cnVjdCBpcnFfdGFza2xldDsKLQlzdHJ1 Y3QgaTkxNV9wcmlvbGlzdCBkZWZhdWx0X3ByaW9saXN0OwotCWJvb2wgbm9fcHJpb2xpc3Q7Ci0J c3RydWN0IGV4ZWNsaXN0X3BvcnQgewotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3RfY291bnQ7Ci0jZGVmaW5lIEVYRUNMSVNUX0NPVU5UX0JJVFMgMgotI2RlZmluZSBwb3J0 X3JlcXVlc3QocCkgcHRyX21hc2tfYml0cygocCktPnJlcXVlc3RfY291bnQsIEVYRUNMSVNUX0NP VU5UX0JJVFMpCi0jZGVmaW5lIHBvcnRfY291bnQocCkgcHRyX3VubWFza19iaXRzKChwKS0+cmVx dWVzdF9jb3VudCwgRVhFQ0xJU1RfQ09VTlRfQklUUykKLSNkZWZpbmUgcG9ydF9wYWNrKHJxLCBj b3VudCkgcHRyX3BhY2tfYml0cyhycSwgY291bnQsIEVYRUNMSVNUX0NPVU5UX0JJVFMpCi0jZGVm aW5lIHBvcnRfdW5wYWNrKHAsIGNvdW50KSBwdHJfdW5wYWNrX2JpdHMoKHApLT5yZXF1ZXN0X2Nv dW50LCBjb3VudCwgRVhFQ0xJU1RfQ09VTlRfQklUUykKLSNkZWZpbmUgcG9ydF9zZXQocCwgcGFj a2VkKSAoKHApLT5yZXF1ZXN0X2NvdW50ID0gKHBhY2tlZCkpCi0jZGVmaW5lIHBvcnRfaXNzZXQo cCkgKChwKS0+cmVxdWVzdF9jb3VudCkKLSNkZWZpbmUgcG9ydF9pbmRleChwLCBlKSAoKHApIC0g KGUpLT5leGVjbGlzdF9wb3J0KQotCQlHRU1fREVCVUdfREVDTCh1MzIgY29udGV4dF9pZCk7Ci0J fSBleGVjbGlzdF9wb3J0WzJdOwotCXN0cnVjdCByYl9yb290IGV4ZWNsaXN0X3F1ZXVlOwotCXN0 cnVjdCByYl9ub2RlICpleGVjbGlzdF9maXJzdDsKLQl1bnNpZ25lZCBpbnQgZndfZG9tYWluczsK LQl1bnNpZ25lZCBpbnQgY3NiX2hlYWQ7Ci0JYm9vbCBjc2JfdXNlX21taW87CisJc3RydWN0IGlu dGVsX2VuZ2luZV9leGVjbGlzdHMgZXhlY2xpc3RzOwogCiAJLyogQ29udGV4dHMgYXJlIHBpbm5l ZCB3aGlsc3QgdGhleSBhcmUgYWN0aXZlIG9uIHRoZSBHUFUuIFRoZSBsYXN0CiAJICogY29udGV4 dCBleGVjdXRlZCByZW1haW5zIGFjdGl2ZSB3aGlsc3QgdGhlIEdQVSBpcyBpZGxlIC0gdGhlCi0t IAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=