From: Eric Anholt Subject: [PATCH i-g-t 5/5] lib: Use drm-uapi/i915_drm.h instead of local defines. Date: Fri, 10 Nov 2017 13:26:18 -0800 Message-ID: <20171110212618.904-6-eric@anholt.net> References: <20171110212618.904-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id C4A0E6EB5F for ; Fri, 10 Nov 2017 21:27:07 +0000 (UTC) In-Reply-To: <20171110212618.904-1-eric@anholt.net> 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 VGhlIE1NQVBfVjIgaXMgcmVwbGFjZWQgYnkganVzdCB1c2luZyBNTUFQLCBzaW5jZSB0aGUgb2Zm aWNpYWwgaGVhZGVyCmhhcyB0aGUgdXBkYXRlZCBzdHJ1Y3QuICBUaGUgZ2VtX2NyZWF0ZV92MiBh bmQgZ2VtX2dldF9hcGVydHVyZSBhcmUKbGVmdCBhcyBpcywgYmVjYXVzZSB0aGV5IHNlZW0gdG8g bm90IGJlIHJlZmxlY3RlZCBpbiB0aGUgVUFCSSBoZWFkZXIhCgpTaWduZWQtb2ZmLWJ5OiBFcmlj IEFuaG9sdCA8ZXJpY0BhbmhvbHQubmV0PgotLS0KIGJlbmNobWFya3MvTWFrZWZpbGUuYW0gfCAg NiArKysrLQogYmVuY2htYXJrcy9nZW1fd3NpbS5jICB8ICA2ICsrLS0tCiBsaWIvaTkxNS9nZW1f Y29udGV4dC5jIHwgNDYgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogbGliL2k5 MTUvZ2VtX2NvbnRleHQuaCB8IDE5ICsrKy0tLS0tLS0tLS0tCiBsaWIvaWd0X2d0LmMgICAgICAg ICAgIHwgMzggKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogbGliL2lvY3RsX3dyYXBwZXJz LmMgICB8IDY3ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiB0ZXN0cy9NYWtlZmlsZS5hbSAgICAgIHwgIDMgKystCiB0ZXN0cy9nZW1fY3R4X3BhcmFt LmMgIHwgMzggKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogOCBmaWxlcyBjaGFuZ2VkLCA5 MiBpbnNlcnRpb25zKCspLCAxMzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYmVuY2htYXJr cy9NYWtlZmlsZS5hbSBiL2JlbmNobWFya3MvTWFrZWZpbGUuYW0KaW5kZXggZDA2NjExMmEzMmEy Li45ZjI2NzFiZTE5MmIgMTAwNjQ0Ci0tLSBhL2JlbmNobWFya3MvTWFrZWZpbGUuYW0KKysrIGIv YmVuY2htYXJrcy9NYWtlZmlsZS5hbQpAQCAtOCw3ICs4LDExIEBAIGlmIEhBVkVfTElCRFJNX0lO VEVMCiBiZW5jaG1hcmtzX1BST0dSQU1TICs9ICQoTElCRFJNX0lOVEVMX0JFTkNITUFSS1MpCiBl bmRpZgogCi1BTV9DUFBGTEFHUyA9IC1JJCh0b3Bfc3JjZGlyKSAtSSQodG9wX3NyY2RpcikvbGli CitBTV9DUFBGTEFHUyA9IFwKKwktSSQodG9wX3NyY2RpcikgXAorCS1JJCh0b3Bfc3JjZGlyKS9p bmNsdWRlL2RybS11YXBpIFwKKwktSSQodG9wX3NyY2RpcikvbGliCisKIEFNX0NGTEFHUyA9ICQo RFJNX0NGTEFHUykgJChDV0FSTkZMQUdTKSAkKENBSVJPX0NGTEFHUykgJChMSUJVTldJTkRfQ0ZM QUdTKSBcCiAJICAgICQoV0VSUk9SX0NGTEFHUykgLURfR05VX1NPVVJDRQogTERBREQgPSAkKHRv cF9idWlsZGRpcikvbGliL2xpYmludGVsX3Rvb2xzLmxhCmRpZmYgLS1naXQgYS9iZW5jaG1hcmtz L2dlbV93c2ltLmMgYi9iZW5jaG1hcmtzL2dlbV93c2ltLmMKaW5kZXggODJmZTZiYTllYzVmLi4w NjNmM2NhMzdmMDAgMTAwNjQ0Ci0tLSBhL2JlbmNobWFya3MvZ2VtX3dzaW0uYworKysgYi9iZW5j aG1hcmtzL2dlbV93c2ltLmMKQEAgLTg5Myw5ICs4OTMsOSBAQCBwcmVwYXJlX3dvcmtsb2FkKHVu c2lnbmVkIGludCBpZCwgc3RydWN0IHdvcmtsb2FkICp3cmssIHVuc2lnbmVkIGludCBmbGFncykK IAkJCX0KIAogCQkJaWYgKHdyay0+cHJpbykgewotCQkJCXN0cnVjdCBsb2NhbF9pOTE1X2dlbV9j b250ZXh0X3BhcmFtIHBhcmFtID0gewotCQkJCQkuY29udGV4dCA9IGFyZy5jdHhfaWQsCi0JCQkJ CS5wYXJhbSA9IDB4NiwKKwkJCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gcGFy YW0gPSB7CisJCQkJCS5jdHhfaWQgPSBhcmcuY3R4X2lkLAorCQkJCQkucGFyYW0gPSBJOTE1X0NP TlRFWFRfUEFSQU1fUFJJT1JJVFksCiAJCQkJCS52YWx1ZSA9IHdyay0+cHJpbywKIAkJCQl9Owog CQkJCWdlbV9jb250ZXh0X3NldF9wYXJhbShmZCwgJnBhcmFtKTsKZGlmZiAtLWdpdCBhL2xpYi9p OTE1L2dlbV9jb250ZXh0LmMgYi9saWIvaTkxNS9nZW1fY29udGV4dC5jCmluZGV4IDZkOWVkZjVl MzI2My4uOGYzODNhOTcyNmVjIDEwMDY0NAotLS0gYS9saWIvaTkxNS9nZW1fY29udGV4dC5jCisr KyBiL2xpYi9pOTE1L2dlbV9jb250ZXh0LmMKQEAgLTEwMCwxMSArMTAwLDkgQEAgdm9pZCBnZW1f Y29udGV4dF9kZXN0cm95KGludCBmZCwgdWludDMyX3QgY3R4X2lkKQogCWRvX2lvY3RsKGZkLCBE Uk1fSU9DVExfSTkxNV9HRU1fQ09OVEVYVF9ERVNUUk9ZLCAmZGVzdHJveSk7CiB9CiAKLWludCBf X2dlbV9jb250ZXh0X2dldF9wYXJhbShpbnQgZmQsIHN0cnVjdCBsb2NhbF9pOTE1X2dlbV9jb250 ZXh0X3BhcmFtICpwKQoraW50IF9fZ2VtX2NvbnRleHRfZ2V0X3BhcmFtKGludCBmZCwgc3RydWN0 IGRybV9pOTE1X2dlbV9jb250ZXh0X3BhcmFtICpwKQogewotI2RlZmluZSBMT0NBTF9JOTE1X0dF TV9DT05URVhUX0dFVFBBUkFNICAgICAgIDB4MzQKLSNkZWZpbmUgTE9DQUxfSU9DVExfSTkxNV9H RU1fQ09OVEVYVF9HRVRQQVJBTSBEUk1fSU9XUiAoRFJNX0NPTU1BTkRfQkFTRSArIExPQ0FMX0k5 MTVfR0VNX0NPTlRFWFRfR0VUUEFSQU0sIHN0cnVjdCBsb2NhbF9pOTE1X2dlbV9jb250ZXh0X3Bh cmFtKQotCWlmIChpZ3RfaW9jdGwoZmQsIExPQ0FMX0lPQ1RMX0k5MTVfR0VNX0NPTlRFWFRfR0VU UEFSQU0sIHApKQorCWlmIChpZ3RfaW9jdGwoZmQsIERSTV9JT0NUTF9JOTE1X0dFTV9DT05URVhU X0dFVFBBUkFNLCBwKSkKIAkJcmV0dXJuIC1lcnJubzsKIAogCWVycm5vID0gMDsKQEAgLTExOSwx NyArMTE3LDE1IEBAIGludCBfX2dlbV9jb250ZXh0X2dldF9wYXJhbShpbnQgZmQsIHN0cnVjdCBs b2NhbF9pOTE1X2dlbV9jb250ZXh0X3BhcmFtICpwKQogICogVGhpcyB3cmFwcyB0aGUgQ09OVEVY VF9HRVRfUEFSQU0gaW9jdGwsIHdoaWNoIGlzIHVzZWQgdG8gZ2V0IGEgY29udGV4dAogICogcGFy YW1ldGVyLgogICovCi12b2lkIGdlbV9jb250ZXh0X2dldF9wYXJhbShpbnQgZmQsIHN0cnVjdCBs b2NhbF9pOTE1X2dlbV9jb250ZXh0X3BhcmFtICpwKQordm9pZCBnZW1fY29udGV4dF9nZXRfcGFy YW0oaW50IGZkLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gKnApCiB7CiAJaWd0 X2Fzc2VydChfX2dlbV9jb250ZXh0X2dldF9wYXJhbShmZCwgcCkgPT0gMCk7CiB9CiAKIAotaW50 IF9fZ2VtX2NvbnRleHRfc2V0X3BhcmFtKGludCBmZCwgc3RydWN0IGxvY2FsX2k5MTVfZ2VtX2Nv bnRleHRfcGFyYW0gKnApCitpbnQgX19nZW1fY29udGV4dF9zZXRfcGFyYW0oaW50IGZkLCBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gKnApCiB7Ci0jZGVmaW5lIExPQ0FMX0k5MTVf R0VNX0NPTlRFWFRfU0VUUEFSQU0gICAgICAgMHgzNQotI2RlZmluZSBMT0NBTF9JT0NUTF9JOTE1 X0dFTV9DT05URVhUX1NFVFBBUkFNIERSTV9JT1dSIChEUk1fQ09NTUFORF9CQVNFICsgTE9DQUxf STkxNV9HRU1fQ09OVEVYVF9TRVRQQVJBTSwgc3RydWN0IGxvY2FsX2k5MTVfZ2VtX2NvbnRleHRf cGFyYW0pCi0JaWYgKGlndF9pb2N0bChmZCwgTE9DQUxfSU9DVExfSTkxNV9HRU1fQ09OVEVYVF9T RVRQQVJBTSwgcCkpCisJaWYgKGlndF9pb2N0bChmZCwgRFJNX0lPQ1RMX0k5MTVfR0VNX0NPTlRF WFRfU0VUUEFSQU0sIHApKQogCQlyZXR1cm4gLWVycm5vOwogCiAJZXJybm8gPSAwOwpAQCAtMTQz LDcgKzEzOSw3IEBAIGludCBfX2dlbV9jb250ZXh0X3NldF9wYXJhbShpbnQgZmQsIHN0cnVjdCBs b2NhbF9pOTE1X2dlbV9jb250ZXh0X3BhcmFtICpwKQogICogVGhpcyB3cmFwcyB0aGUgQ09OVEVY VF9TRVRfUEFSQU0gaW9jdGwsIHdoaWNoIGlzIHVzZWQgdG8gc2V0IGEgY29udGV4dAogICogcGFy YW1ldGVyLgogICovCi12b2lkIGdlbV9jb250ZXh0X3NldF9wYXJhbShpbnQgZmQsIHN0cnVjdCBs b2NhbF9pOTE1X2dlbV9jb250ZXh0X3BhcmFtICpwKQordm9pZCBnZW1fY29udGV4dF9zZXRfcGFy YW0oaW50IGZkLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gKnApCiB7CiAJaWd0 X2Fzc2VydChfX2dlbV9jb250ZXh0X3NldF9wYXJhbShmZCwgcCkgPT0gMCk7CiB9CkBAIC0xNTgs MTQgKzE1NCwxNCBAQCB2b2lkIGdlbV9jb250ZXh0X3NldF9wYXJhbShpbnQgZmQsIHN0cnVjdCBs b2NhbF9pOTE1X2dlbV9jb250ZXh0X3BhcmFtICpwKQogICovCiB2b2lkIGdlbV9jb250ZXh0X3Jl cXVpcmVfcGFyYW0oaW50IGZkLCB1aW50NjRfdCBwYXJhbSkKIHsKLQlzdHJ1Y3QgbG9jYWxfaTkx NV9nZW1fY29udGV4dF9wYXJhbSBwOworCXN0cnVjdCBkcm1faTkxNV9nZW1fY29udGV4dF9wYXJh bSBwOwogCi0JcC5jb250ZXh0ID0gMDsKKwlwLmN0eF9pZCA9IDA7CiAJcC5wYXJhbSA9IHBhcmFt OwogCXAudmFsdWUgPSAwOwogCXAuc2l6ZSA9IDA7CiAKLQlpZ3RfcmVxdWlyZShpZ3RfaW9jdGwo ZmQsIExPQ0FMX0lPQ1RMX0k5MTVfR0VNX0NPTlRFWFRfR0VUUEFSQU0sICZwKSA9PSAwKTsKKwlp Z3RfcmVxdWlyZShpZ3RfaW9jdGwoZmQsIERSTV9JT0NUTF9JOTE1X0dFTV9DT05URVhUX0dFVFBB UkFNLCAmcCkgPT0gMCk7CiB9CiAKIHZvaWQgZ2VtX2NvbnRleHRfcmVxdWlyZV9iYW5uYWJsZShp bnQgZmQpCkBAIC0xNzQsMzEgKzE3MCwzMSBAQCB2b2lkIGdlbV9jb250ZXh0X3JlcXVpcmVfYmFu bmFibGUoaW50IGZkKQogCXN0YXRpYyBpbnQgaGFzX2Jhbm5hYmxlID0gLTE7CiAKIAlpZiAoaGFz X2Jhbm5hYmxlIDwgMCkgewotCQlzdHJ1Y3QgbG9jYWxfaTkxNV9nZW1fY29udGV4dF9wYXJhbSBw OworCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gcDsKIAotCQlwLmNvbnRleHQg PSAwOwotCQlwLnBhcmFtID0gTE9DQUxfQ09OVEVYVF9QQVJBTV9CQU5OQUJMRTsKKwkJcC5jdHhf aWQgPSAwOworCQlwLnBhcmFtID0gSTkxNV9DT05URVhUX1BBUkFNX0JBTk5BQkxFOwogCQlwLnZh bHVlID0gMDsKIAkJcC5zaXplID0gMDsKIAotCQloYXNfYmFubmFibGUgPSBpZ3RfaW9jdGwoZmQs IExPQ0FMX0lPQ1RMX0k5MTVfR0VNX0NPTlRFWFRfR0VUUEFSQU0sICZwKSA9PSAwOworCQloYXNf YmFubmFibGUgPSBpZ3RfaW9jdGwoZmQsIERSTV9JT0NUTF9JOTE1X0dFTV9DT05URVhUX0dFVFBB UkFNLCAmcCkgPT0gMDsKIAl9CiAKIAlpZiAoaGFzX2Jhbl9wZXJpb2QgPCAwKSB7Ci0JCXN0cnVj dCBsb2NhbF9pOTE1X2dlbV9jb250ZXh0X3BhcmFtIHA7CisJCXN0cnVjdCBkcm1faTkxNV9nZW1f Y29udGV4dF9wYXJhbSBwOwogCi0JCXAuY29udGV4dCA9IDA7Ci0JCXAucGFyYW0gPSBMT0NBTF9D T05URVhUX1BBUkFNX0JBTl9QRVJJT0Q7CisJCXAuY3R4X2lkID0gMDsKKwkJcC5wYXJhbSA9IEk5 MTVfQ09OVEVYVF9QQVJBTV9CQU5fUEVSSU9EOwogCQlwLnZhbHVlID0gMDsKIAkJcC5zaXplID0g MDsKIAotCQloYXNfYmFuX3BlcmlvZCA9IGlndF9pb2N0bChmZCwgTE9DQUxfSU9DVExfSTkxNV9H RU1fQ09OVEVYVF9HRVRQQVJBTSwgJnApID09IDA7CisJCWhhc19iYW5fcGVyaW9kID0gaWd0X2lv Y3RsKGZkLCBEUk1fSU9DVExfSTkxNV9HRU1fQ09OVEVYVF9HRVRQQVJBTSwgJnApID09IDA7CiAJ fQogCiAJaWd0X3JlcXVpcmUoaGFzX2Jhbl9wZXJpb2QgfHwgaGFzX2Jhbm5hYmxlKTsKIH0KIAot I2RlZmluZSBMT0NBTF9JOTE1X0NPTlRFWFRfUEFSQU1fUFJJT1JJVFkgMHg2CisjZGVmaW5lIERS TV9JOTE1X0NPTlRFWFRfUEFSQU1fUFJJT1JJVFkgMHg2CiAKIC8qKgogICogX19nZW1fY29udGV4 dF9zZXRfcHJpb3JpdHk6CkBAIC0yMTQsMTIgKzIxMCwxMiBAQCB2b2lkIGdlbV9jb250ZXh0X3Jl cXVpcmVfYmFubmFibGUoaW50IGZkKQogICovCiBpbnQgX19nZW1fY29udGV4dF9zZXRfcHJpb3Jp dHkoaW50IGZkLCB1aW50MzJfdCBjdHhfaWQsIGludCBwcmlvKQogewotCXN0cnVjdCBsb2NhbF9p OTE1X2dlbV9jb250ZXh0X3BhcmFtIHA7CisJc3RydWN0IGRybV9pOTE1X2dlbV9jb250ZXh0X3Bh cmFtIHA7CiAKIAltZW1zZXQoJnAsIDAsIHNpemVvZihwKSk7Ci0JcC5jb250ZXh0ID0gY3R4X2lk OworCXAuY3R4X2lkID0gY3R4X2lkOwogCXAuc2l6ZSA9IDA7Ci0JcC5wYXJhbSA9IExPQ0FMX0k5 MTVfQ09OVEVYVF9QQVJBTV9QUklPUklUWTsKKwlwLnBhcmFtID0gRFJNX0k5MTVfQ09OVEVYVF9Q QVJBTV9QUklPUklUWTsKIAlwLnZhbHVlID0gcHJpbzsKIAogCXJldHVybiBfX2dlbV9jb250ZXh0 X3NldF9wYXJhbShmZCwgJnApOwpkaWZmIC0tZ2l0IGEvbGliL2k5MTUvZ2VtX2NvbnRleHQuaCBi L2xpYi9pOTE1L2dlbV9jb250ZXh0LmgKaW5kZXggYTIzMzljNGI2ZGEyLi45NjEwNmI3MThmZmIg MTAwNjQ0Ci0tLSBhL2xpYi9pOTE1L2dlbV9jb250ZXh0LmgKKysrIGIvbGliL2k5MTUvZ2VtX2Nv bnRleHQuaApAQCAtMjcsMjMgKzI3LDEyIEBACiB1aW50MzJfdCBnZW1fY29udGV4dF9jcmVhdGUo aW50IGZkKTsKIHZvaWQgZ2VtX2NvbnRleHRfZGVzdHJveShpbnQgZmQsIHVpbnQzMl90IGN0eF9p ZCk7CiBpbnQgX19nZW1fY29udGV4dF9kZXN0cm95KGludCBmZCwgdWludDMyX3QgY3R4X2lkKTsK LXN0cnVjdCBsb2NhbF9pOTE1X2dlbV9jb250ZXh0X3BhcmFtIHsKLQl1aW50MzJfdCBjb250ZXh0 OwotCXVpbnQzMl90IHNpemU7Ci0JdWludDY0X3QgcGFyYW07Ci0jZGVmaW5lIExPQ0FMX0NPTlRF WFRfUEFSQU1fQkFOX1BFUklPRAkweDEKLSNkZWZpbmUgTE9DQUxfQ09OVEVYVF9QQVJBTV9OT19a RVJPTUFQCTB4MgotI2RlZmluZSBMT0NBTF9DT05URVhUX1BBUkFNX0dUVF9TSVpFCTB4MwotI2Rl ZmluZSBMT0NBTF9DT05URVhUX1BBUkFNX05PX0VSUk9SX0NBUFRVUkUJMHg0Ci0jZGVmaW5lIExP Q0FMX0NPTlRFWFRfUEFSQU1fQkFOTkFCTEUJMHg1Ci0JdWludDY0X3QgdmFsdWU7Ci19Owogdm9p ZCBnZW1fY29udGV4dF9yZXF1aXJlX2Jhbm5hYmxlKGludCBmZCk7CiB2b2lkIGdlbV9jb250ZXh0 X3JlcXVpcmVfcGFyYW0oaW50IGZkLCB1aW50NjRfdCBwYXJhbSk7Ci12b2lkIGdlbV9jb250ZXh0 X2dldF9wYXJhbShpbnQgZmQsIHN0cnVjdCBsb2NhbF9pOTE1X2dlbV9jb250ZXh0X3BhcmFtICpw KTsKLXZvaWQgZ2VtX2NvbnRleHRfc2V0X3BhcmFtKGludCBmZCwgc3RydWN0IGxvY2FsX2k5MTVf Z2VtX2NvbnRleHRfcGFyYW0gKnApOwotaW50IF9fZ2VtX2NvbnRleHRfc2V0X3BhcmFtKGludCBm ZCwgc3RydWN0IGxvY2FsX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gKnApOwotaW50IF9fZ2VtX2Nv bnRleHRfZ2V0X3BhcmFtKGludCBmZCwgc3RydWN0IGxvY2FsX2k5MTVfZ2VtX2NvbnRleHRfcGFy YW0gKnApOwordm9pZCBnZW1fY29udGV4dF9nZXRfcGFyYW0oaW50IGZkLCBzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX2NvbnRleHRfcGFyYW0gKnApOwordm9pZCBnZW1fY29udGV4dF9zZXRfcGFyYW0oaW50 IGZkLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gKnApOworaW50IF9fZ2VtX2Nv bnRleHRfc2V0X3BhcmFtKGludCBmZCwgc3RydWN0IGRybV9pOTE1X2dlbV9jb250ZXh0X3BhcmFt ICpwKTsKK2ludCBfX2dlbV9jb250ZXh0X2dldF9wYXJhbShpbnQgZmQsIHN0cnVjdCBkcm1faTkx NV9nZW1fY29udGV4dF9wYXJhbSAqcCk7CiAKICNkZWZpbmUgTE9DQUxfSTkxNV9DT05URVhUX01B WF9VU0VSX1BSSU9SSVRZCTEwMjMKICNkZWZpbmUgTE9DQUxfSTkxNV9DT05URVhUX0RFRkFVTFRf UFJJT1JJVFkJMApkaWZmIC0tZ2l0IGEvbGliL2lndF9ndC5jIGIvbGliL2lndF9ndC5jCmluZGV4 IDg5NzI3ZDIyZGQ1Yy4uNjRhMmRmZDYyZGE3IDEwMDY0NAotLS0gYS9saWIvaWd0X2d0LmMKKysr IGIvbGliL2lndF9ndC5jCkBAIC0xMjYsMTUgKzEyNiwxNSBAQCB2b2lkIGlndF9yZXF1aXJlX2hh bmdfcmluZyhpbnQgZmQsIGludCByaW5nKQogCiBzdGF0aWMgdW5zaWduZWQgY29udGV4dF9nZXRf YmFuKGludCBmZCwgdW5zaWduZWQgY3R4KQogewotCXN0cnVjdCBsb2NhbF9pOTE1X2dlbV9jb250 ZXh0X3BhcmFtIHBhcmFtOworCXN0cnVjdCBkcm1faTkxNV9nZW1fY29udGV4dF9wYXJhbSBwYXJh bTsKIAotCXBhcmFtLnBhcmFtID0gTE9DQUxfQ09OVEVYVF9QQVJBTV9CQU5OQUJMRTsKKwlwYXJh bS5wYXJhbSA9IEk5MTVfQ09OVEVYVF9QQVJBTV9CQU5OQUJMRTsKIAlwYXJhbS52YWx1ZSA9IDA7 CiAJcGFyYW0uc2l6ZSA9IDA7CiAKIAlpZiAoX19nZW1fY29udGV4dF9nZXRfcGFyYW0oZmQsICZw YXJhbSkgPT0gLUVJTlZBTCkgewogCQlpZ3RfYXNzZXJ0KHBhcmFtLnZhbHVlID09IDApOwotCQlw YXJhbS5wYXJhbSA9IExPQ0FMX0NPTlRFWFRfUEFSQU1fQkFOX1BFUklPRDsKKwkJcGFyYW0ucGFy YW0gPSBJOTE1X0NPTlRFWFRfUEFSQU1fQkFOX1BFUklPRDsKIAkJZ2VtX2NvbnRleHRfZ2V0X3Bh cmFtKGZkLCAmcGFyYW0pOwogCX0KIApAQCAtMTQzLDI0ICsxNDMsMjQgQEAgc3RhdGljIHVuc2ln bmVkIGNvbnRleHRfZ2V0X2JhbihpbnQgZmQsIHVuc2lnbmVkIGN0eCkKIAogc3RhdGljIHZvaWQg Y29udGV4dF9zZXRfYmFuKGludCBmZCwgdW5zaWduZWQgY3R4LCB1bnNpZ25lZCBiYW4pCiB7Ci0J c3RydWN0IGxvY2FsX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gcGFyYW07CisJc3RydWN0IGRybV9p OTE1X2dlbV9jb250ZXh0X3BhcmFtIHBhcmFtOwogCiAJbWVtc2V0KCZwYXJhbSwgMCwgc2l6ZW9m KHBhcmFtKSk7Ci0JcGFyYW0uY29udGV4dCA9IGN0eDsKKwlwYXJhbS5jdHhfaWQgPSBjdHg7CiAJ cGFyYW0udmFsdWUgPSBiYW47CiAJcGFyYW0uc2l6ZSA9IDA7Ci0JcGFyYW0ucGFyYW0gPSBMT0NB TF9DT05URVhUX1BBUkFNX0JBTk5BQkxFOworCXBhcmFtLnBhcmFtID0gSTkxNV9DT05URVhUX1BB UkFNX0JBTk5BQkxFOwogCiAJaWYoX19nZW1fY29udGV4dF9zZXRfcGFyYW0oZmQsICZwYXJhbSkg PT0gLUVJTlZBTCkgewogCQlpZ3RfYXNzZXJ0KHBhcmFtLnZhbHVlID09IGJhbik7Ci0JCXBhcmFt LnBhcmFtID0gTE9DQUxfQ09OVEVYVF9QQVJBTV9CQU5fUEVSSU9EOworCQlwYXJhbS5wYXJhbSA9 IEk5MTVfQ09OVEVYVF9QQVJBTV9CQU5fUEVSSU9EOwogCQlnZW1fY29udGV4dF9zZXRfcGFyYW0o ZmQsICZwYXJhbSk7CiAJfQogfQogCiBpZ3RfaGFuZ190IGlndF9hbGxvd19oYW5nKGludCBmZCwg dW5zaWduZWQgY3R4LCB1bnNpZ25lZCBmbGFncykKIHsKLQlzdHJ1Y3QgbG9jYWxfaTkxNV9nZW1f Y29udGV4dF9wYXJhbSBwYXJhbTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0g cGFyYW07CiAJdW5zaWduZWQgYmFuOwogCiAJaWd0X2Fzc2VydChpZ3Rfc3lzZnNfc2V0X3BhcmFt ZXRlcgpAQCAtMTcyLDExICsxNzIsMTEgQEAgaWd0X2hhbmdfdCBpZ3RfYWxsb3dfaGFuZyhpbnQg ZmQsIHVuc2lnbmVkIGN0eCwgdW5zaWduZWQgZmxhZ3MpCiAJaWYgKCFpZ3RfY2hlY2tfYm9vbGVh bl9lbnZfdmFyKCJJR1RfSEFOR19XSVRIT1VUX1JFU0VUIiwgZmFsc2UpKQogCQlpZ3RfcmVxdWly ZShoYXNfZ3B1X3Jlc2V0KGZkKSk7CiAKLQlwYXJhbS5jb250ZXh0ID0gY3R4OworCXBhcmFtLmN0 eF9pZCA9IGN0eDsKIAlwYXJhbS5zaXplID0gMDsKIAogCWlmICgoZmxhZ3MgJiBIQU5HX0FMTE9X X0NBUFRVUkUpID09IDApIHsKLQkJcGFyYW0ucGFyYW0gPSBMT0NBTF9DT05URVhUX1BBUkFNX05P X0VSUk9SX0NBUFRVUkU7CisJCXBhcmFtLnBhcmFtID0gSTkxNV9DT05URVhUX1BBUkFNX05PX0VS Uk9SX0NBUFRVUkU7CiAJCXBhcmFtLnZhbHVlID0gMTsKIAkJLyogT2xkZXIga2VybmVscyBtYXkg bm90IGhhdmUgTk9fRVJST1JfQ0FQVFVSRSwgaW4gd2hpY2ggY2FzZQogCQkgKiB3ZSBqdXN0IGVh dCB0aGUgZXJyb3Igc3RhdGUgaW4gcG9zdC1oYW5nIChhbmQgaG9wZSB3ZSBlYXQKQEAgLTE5OCw5 ICsxOTgsOSBAQCB2b2lkIGlndF9kaXNhbGxvd19oYW5nKGludCBmZCwgaWd0X2hhbmdfdCBhcmcp CiAJY29udGV4dF9zZXRfYmFuKGZkLCBhcmcuY3R4LCBhcmcuYmFuKTsKIAogCWlmICgoYXJnLmZs YWdzICYgSEFOR19BTExPV19DQVBUVVJFKSA9PSAwKSB7Ci0JCXN0cnVjdCBsb2NhbF9pOTE1X2dl bV9jb250ZXh0X3BhcmFtIHBhcmFtID0gewotCQkJLmNvbnRleHQgPSBhcmcuY3R4LAotCQkJLnBh cmFtID0gTE9DQUxfQ09OVEVYVF9QQVJBTV9OT19FUlJPUl9DQVBUVVJFLAorCQlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gcGFyYW0gPSB7CisJCQkuY3R4X2lkID0gYXJnLmN0eCwK KwkJCS5wYXJhbSA9IEk5MTVfQ09OVEVYVF9QQVJBTV9OT19FUlJPUl9DQVBUVVJFLAogCQkJLnZh bHVlID0gMCwKIAkJfTsKIAkJX19nZW1fY29udGV4dF9zZXRfcGFyYW0oZmQsICZwYXJhbSk7CkBA IC0yNzIsNyArMjcyLDcgQEAgaWd0X2hhbmdfdCBpZ3RfaGFuZ19jdHgoaW50IGZkLAogCXN0cnVj dCBkcm1faTkxNV9nZW1fcmVsb2NhdGlvbl9lbnRyeSByZWxvYzsKIAlzdHJ1Y3QgZHJtX2k5MTVf Z2VtX2V4ZWNidWZmZXIyIGV4ZWNidWY7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9leGVjX29iamVj dDIgZXhlYzsKLQlzdHJ1Y3QgbG9jYWxfaTkxNV9nZW1fY29udGV4dF9wYXJhbSBwYXJhbTsKKwlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gcGFyYW07CiAJdWludDMyX3QgYlsxNl07 CiAJdW5zaWduZWQgYmFuOwogCXVuc2lnbmVkIGxlbjsKQEAgLTI4MiwxMSArMjgyLDExIEBAIGln dF9oYW5nX3QgaWd0X2hhbmdfY3R4KGludCBmZCwKIAkvKiBjaGVjayBpZiBub24tZGVmYXVsdCBj dHggc3VibWlzc2lvbiBpcyBhbGxvd2VkICovCiAJaWd0X3JlcXVpcmUoY3R4ID09IDAgfHwgaGFz X2N0eF9leGVjKGZkLCByaW5nLCBjdHgpKTsKIAotCXBhcmFtLmNvbnRleHQgPSBjdHg7CisJcGFy YW0uY3R4X2lkID0gY3R4OwogCXBhcmFtLnNpemUgPSAwOwogCiAJaWYgKChmbGFncyAmIEhBTkdf QUxMT1dfQ0FQVFVSRSkgPT0gMCkgewotCQlwYXJhbS5wYXJhbSA9IExPQ0FMX0NPTlRFWFRfUEFS QU1fTk9fRVJST1JfQ0FQVFVSRTsKKwkJcGFyYW0ucGFyYW0gPSBJOTE1X0NPTlRFWFRfUEFSQU1f Tk9fRVJST1JfQ0FQVFVSRTsKIAkJcGFyYW0udmFsdWUgPSAxOwogCQkvKiBPbGRlciBrZXJuZWxz IG1heSBub3QgaGF2ZSBOT19FUlJPUl9DQVBUVVJFLCBpbiB3aGljaCBjYXNlCiAJCSAqIHdlIGp1 c3QgZWF0IHRoZSBlcnJvciBzdGF0ZSBpbiBwb3N0LWhhbmcgKGFuZCBob3BlIHdlIGVhdApAQCAt MzcxLDkgKzM3MSw5IEBAIHZvaWQgaWd0X3Bvc3RfaGFuZ19yaW5nKGludCBmZCwgaWd0X2hhbmdf dCBhcmcpCiAJY29udGV4dF9zZXRfYmFuKGZkLCBhcmcuY3R4LCBhcmcuYmFuKTsKIAogCWlmICgo YXJnLmZsYWdzICYgSEFOR19BTExPV19DQVBUVVJFKSA9PSAwKSB7Ci0JCXN0cnVjdCBsb2NhbF9p OTE1X2dlbV9jb250ZXh0X3BhcmFtIHBhcmFtID0gewotCQkJLmNvbnRleHQgPSBhcmcuY3R4LAot CQkJLnBhcmFtID0gTE9DQUxfQ09OVEVYVF9QQVJBTV9OT19FUlJPUl9DQVBUVVJFLAorCQlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfcGFyYW0gcGFyYW0gPSB7CisJCQkuY3R4X2lkID0gYXJn LmN0eCwKKwkJCS5wYXJhbSA9IEk5MTVfQ09OVEVYVF9QQVJBTV9OT19FUlJPUl9DQVBUVVJFLAog CQkJLnZhbHVlID0gMCwKIAkJfTsKIAkJX19nZW1fY29udGV4dF9zZXRfcGFyYW0oZmQsICZwYXJh bSk7CmRpZmYgLS1naXQgYS9saWIvaW9jdGxfd3JhcHBlcnMuYyBiL2xpYi9pb2N0bF93cmFwcGVy cy5jCmluZGV4IGQ5OGU3NjYwYTk2Zi4uMTE4ZGNlZmU3OTM2IDEwMDY0NAotLS0gYS9saWIvaW9j dGxfd3JhcHBlcnMuYworKysgYi9saWIvaW9jdGxfd3JhcHBlcnMuYwpAQCAtMTk3LDIxICsxOTcs OSBAQCB2b2lkIGdlbV9zZXRfdGlsaW5nKGludCBmZCwgdWludDMyX3QgaGFuZGxlLCB1aW50MzJf dCB0aWxpbmcsIHVpbnQzMl90IHN0cmlkZSkKIAlpZ3RfYXNzZXJ0KF9fZ2VtX3NldF90aWxpbmco ZmQsIGhhbmRsZSwgdGlsaW5nLCBzdHJpZGUpID09IDApOwogfQogCi1zdHJ1Y3QgbG9jYWxfZHJt X2k5MTVfZ2VtX2NhY2hpbmcgewotCXVpbnQzMl90IGhhbmRsZTsKLQl1aW50MzJfdCBjYWNoaW5n OwotfTsKLQotI2RlZmluZSBMT0NBTF9EUk1fSTkxNV9HRU1fU0VUX0NBQ0hFSU5HICAgIDB4MmYK LSNkZWZpbmUgTE9DQUxfRFJNX0k5MTVfR0VNX0dFVF9DQUNIRUlORyAgICAweDMwCi0jZGVmaW5l IExPQ0FMX0RSTV9JT0NUTF9JOTE1X0dFTV9TRVRfQ0FDSEVJTkcgXAotCURSTV9JT1coRFJNX0NP TU1BTkRfQkFTRSArIExPQ0FMX0RSTV9JOTE1X0dFTV9TRVRfQ0FDSEVJTkcsIHN0cnVjdCBsb2Nh bF9kcm1faTkxNV9nZW1fY2FjaGluZykKLSNkZWZpbmUgTE9DQUxfRFJNX0lPQ1RMX0k5MTVfR0VN X0dFVF9DQUNIRUlORyBcCi0JRFJNX0lPV1IoRFJNX0NPTU1BTkRfQkFTRSArIExPQ0FMX0RSTV9J OTE1X0dFTV9HRVRfQ0FDSEVJTkcsIHN0cnVjdCBsb2NhbF9kcm1faTkxNV9nZW1fY2FjaGluZykK LQogc3RhdGljIGludCBfX2dlbV9zZXRfY2FjaGluZyhpbnQgZmQsIHVpbnQzMl90IGhhbmRsZSwg dWludDMyX3QgY2FjaGluZykKIHsKLQlzdHJ1Y3QgbG9jYWxfZHJtX2k5MTVfZ2VtX2NhY2hpbmcg YXJnOworCXN0cnVjdCBkcm1faTkxNV9nZW1fY2FjaGluZyBhcmc7CiAJaW50IGVycjsKIAogCW1l bXNldCgmYXJnLCAwLCBzaXplb2YoYXJnKSk7CkBAIC0yMTksNyArMjA3LDcgQEAgc3RhdGljIGlu dCBfX2dlbV9zZXRfY2FjaGluZyhpbnQgZmQsIHVpbnQzMl90IGhhbmRsZSwgdWludDMyX3QgY2Fj aGluZykKIAlhcmcuY2FjaGluZyA9IGNhY2hpbmc7CiAKIAllcnIgPSAwOwotCWlmIChpZ3RfaW9j dGwoZmQsIExPQ0FMX0RSTV9JT0NUTF9JOTE1X0dFTV9TRVRfQ0FDSEVJTkcsICZhcmcpKSB7CisJ aWYgKGlndF9pb2N0bChmZCwgRFJNX0lPQ1RMX0k5MTVfR0VNX1NFVF9DQUNISU5HLCAmYXJnKSkg ewogCQllcnIgPSAtZXJybm87CiAJCWlndF9hc3NlcnQoZXJybm8gPT0gRU5PVFRZIHx8IGVycm5v ID09IEVJTlZBTCk7CiAJfQpAQCAtMjU0LDEyICsyNDIsMTIgQEAgdm9pZCBnZW1fc2V0X2NhY2hp bmcoaW50IGZkLCB1aW50MzJfdCBoYW5kbGUsIHVpbnQzMl90IGNhY2hpbmcpCiAgKi8KIHVpbnQz Ml90IGdlbV9nZXRfY2FjaGluZyhpbnQgZmQsIHVpbnQzMl90IGhhbmRsZSkKIHsKLQlzdHJ1Y3Qg bG9jYWxfZHJtX2k5MTVfZ2VtX2NhY2hpbmcgYXJnOworCXN0cnVjdCBkcm1faTkxNV9nZW1fY2Fj aGluZyBhcmc7CiAJaW50IHJldDsKIAogCW1lbXNldCgmYXJnLCAwLCBzaXplb2YoYXJnKSk7CiAJ YXJnLmhhbmRsZSA9IGhhbmRsZTsKLQlyZXQgPSBpb2N0bChmZCwgTE9DQUxfRFJNX0lPQ1RMX0k5 MTVfR0VNX0dFVF9DQUNIRUlORywgJmFyZyk7CisJcmV0ID0gaW9jdGwoZmQsIERSTV9JT0NUTF9J OTE1X0dFTV9HRVRfQ0FDSElORywgJmFyZyk7CiAJaWd0X2Fzc2VydChyZXQgPT0gMCk7CiAJZXJy bm8gPSAwOwogCkBAIC02MTYsOSArNjA0LDYgQEAgdm9pZCBnZW1fZXhlY2J1ZihpbnQgZmQsIHN0 cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmV4ZWNidWYpCiAJaWd0X2Fzc2VydF9lcShf X2dlbV9leGVjYnVmKGZkLCBleGVjYnVmKSwgMCk7CiB9CiAKLSNkZWZpbmUgTE9DQUxfSU9DVExf STkxNV9HRU1fRVhFQ0JVRkZFUjJfV1IgXAotICAgIERSTV9JT1dSKERSTV9DT01NQU5EX0JBU0Ug KyBEUk1fSTkxNV9HRU1fRVhFQ0JVRkZFUjIsIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZl cjIpCi0KIC8qKgogICogX19nZW1fZXhlY2J1Zl93cjoKICAqIEBmZDogb3BlbiBpOTE1IGRybSBm aWxlIGRlc2NyaXB0b3IKQEAgLTYzMCw3ICs2MTUsNyBAQCB2b2lkIGdlbV9leGVjYnVmKGludCBm ZCwgc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqZXhlY2J1ZikKIGludCBfX2dlbV9l eGVjYnVmX3dyKGludCBmZCwgc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqZXhlY2J1 ZikKIHsKIAlpbnQgZXJyID0gMDsKLQlpZiAoaWd0X2lvY3RsKGZkLCBMT0NBTF9JT0NUTF9JOTE1 X0dFTV9FWEVDQlVGRkVSMl9XUiwgZXhlY2J1ZikpCisJaWYgKGlndF9pb2N0bChmZCwgRFJNX0lP Q1RMX0k5MTVfR0VNX0VYRUNCVUZGRVIyX1dSLCBleGVjYnVmKSkKIAkJZXJyID0gLWVycm5vOwog CWVycm5vID0gMDsKIAlyZXR1cm4gZXJyOwpAQCAtNzEwLDE3ICs2OTUsNiBAQCBpbnQgZ2VtX211 bm1hcCh2b2lkICpwdHIsIHVpbnQ2NF90IHNpemUpCiAJcmV0dXJuIHJldDsKIH0KIAotc3RydWN0 IGxvY2FsX2k5MTVfZ2VtX21tYXBfdjIgewotCXVpbnQzMl90IGhhbmRsZTsKLQl1aW50MzJfdCBw YWQ7Ci0JdWludDY0X3Qgb2Zmc2V0OwotCXVpbnQ2NF90IHNpemU7Ci0JdWludDY0X3QgYWRkcl9w dHI7Ci0JdWludDY0X3QgZmxhZ3M7Ci0jZGVmaW5lIEk5MTVfTU1BUF9XQyAweDEKLX07Ci0jZGVm aW5lIExPQ0FMX0lPQ1RMX0k5MTVfR0VNX01NQVBfdjIgRFJNX0lPV1IoRFJNX0NPTU1BTkRfQkFT RSArIERSTV9JOTE1X0dFTV9NTUFQLCBzdHJ1Y3QgbG9jYWxfaTkxNV9nZW1fbW1hcF92MikKLQog Ym9vbCBnZW1fbW1hcF9faGFzX3djKGludCBmZCkKIHsKIAlzdGF0aWMgaW50IGhhc193YyA9IC0x OwpAQCAtNzQ0LDcgKzcxOCw3IEBAIGJvb2wgZ2VtX21tYXBfX2hhc193YyhpbnQgZmQpCiAKIAkJ LyogRG8gd2UgaGF2ZSB0aGUgbmV3IG1tYXBfaW9jdGwgd2l0aCBET01BSU5fV0M/ICovCiAJCWlm IChtbWFwX3ZlcnNpb24gPj0gMSAmJiBndHRfdmVyc2lvbiA+PSAyKSB7Ci0JCQlzdHJ1Y3QgbG9j YWxfaTkxNV9nZW1fbW1hcF92MiBhcmc7CisJCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX21tYXAgYXJn OwogCiAJCQkvKiBEb2VzIHRoaXMgZGV2aWNlIHN1cHBvcnQgd2MtbW1hcHMgPyAqLwogCQkJbWVt c2V0KCZhcmcsIDAsIHNpemVvZihhcmcpKTsKQEAgLTc1Miw3ICs3MjYsNyBAQCBib29sIGdlbV9t bWFwX19oYXNfd2MoaW50IGZkKQogCQkJYXJnLm9mZnNldCA9IDA7CiAJCQlhcmcuc2l6ZSA9IDQw OTY7CiAJCQlhcmcuZmxhZ3MgPSBJOTE1X01NQVBfV0M7Ci0JCQloYXNfd2MgPSBpZ3RfaW9jdGwo ZmQsIExPQ0FMX0lPQ1RMX0k5MTVfR0VNX01NQVBfdjIsICZhcmcpID09IDA7CisJCQloYXNfd2Mg PSBpZ3RfaW9jdGwoZmQsIERSTV9JT0NUTF9JOTE1X0dFTV9NTUFQLCAmYXJnKSA9PSAwOwogCQkJ Z2VtX2Nsb3NlKGZkLCBhcmcuaGFuZGxlKTsKIAkJfQogCQllcnJubyA9IDA7CkBAIC03NzgsNyAr NzUyLDcgQEAgYm9vbCBnZW1fbW1hcF9faGFzX3djKGludCBmZCkKICAqLwogdm9pZCAqX19nZW1f bW1hcF9fd2MoaW50IGZkLCB1aW50MzJfdCBoYW5kbGUsIHVpbnQ2NF90IG9mZnNldCwgdWludDY0 X3Qgc2l6ZSwgdW5zaWduZWQgcHJvdCkKIHsKLQlzdHJ1Y3QgbG9jYWxfaTkxNV9nZW1fbW1hcF92 MiBhcmc7CisJc3RydWN0IGRybV9pOTE1X2dlbV9tbWFwIGFyZzsKIAogCWlmICghZ2VtX21tYXBf X2hhc193YyhmZCkpIHsKIAkJZXJybm8gPSBFTk9TWVM7CkBAIC03OTAsNyArNzY0LDcgQEAgdm9p ZCAqX19nZW1fbW1hcF9fd2MoaW50IGZkLCB1aW50MzJfdCBoYW5kbGUsIHVpbnQ2NF90IG9mZnNl dCwgdWludDY0X3Qgc2l6ZSwgdW4KIAlhcmcub2Zmc2V0ID0gb2Zmc2V0OwogCWFyZy5zaXplID0g c2l6ZTsKIAlhcmcuZmxhZ3MgPSBJOTE1X01NQVBfV0M7Ci0JaWYgKGlndF9pb2N0bChmZCwgTE9D QUxfSU9DVExfSTkxNV9HRU1fTU1BUF92MiwgJmFyZykpCisJaWYgKGlndF9pb2N0bChmZCwgRFJN X0lPQ1RMX0k5MTVfR0VNX01NQVAsICZhcmcpKQogCQlyZXR1cm4gTlVMTDsKIAogCVZHKFZBTEdS SU5EX01BS0VfTUVNX0RFRklORUQoZnJvbV91c2VyX3BvaW50ZXIoYXJnLmFkZHJfcHRyKSwgYXJn LnNpemUpKTsKQEAgLTg5NiwxNiArODcwLDE2IEBAIGludCBnZW1fbWFkdmlzZShpbnQgZmQsIHVp bnQzMl90IGhhbmRsZSwgaW50IHN0YXRlKQogCiBpbnQgX19nZW1fdXNlcnB0cihpbnQgZmQsIHZv aWQgKnB0ciwgaW50IHNpemUsIGludCByZWFkX29ubHksIHVpbnQzMl90IGZsYWdzLCB1aW50MzJf dCAqaGFuZGxlKQogewotCXN0cnVjdCBsb2NhbF9pOTE1X2dlbV91c2VycHRyIHVzZXJwdHI7CisJ c3RydWN0IGRybV9pOTE1X2dlbV91c2VycHRyIHVzZXJwdHI7CiAKIAltZW1zZXQoJnVzZXJwdHIs IDAsIHNpemVvZih1c2VycHRyKSk7CiAJdXNlcnB0ci51c2VyX3B0ciA9IHRvX3VzZXJfcG9pbnRl cihwdHIpOwogCXVzZXJwdHIudXNlcl9zaXplID0gc2l6ZTsKIAl1c2VycHRyLmZsYWdzID0gZmxh Z3M7CiAJaWYgKHJlYWRfb25seSkKLQkJdXNlcnB0ci5mbGFncyB8PSBMT0NBTF9JOTE1X1VTRVJQ VFJfUkVBRF9PTkxZOworCQl1c2VycHRyLmZsYWdzIHw9IEk5MTVfVVNFUlBUUl9SRUFEX09OTFk7 CiAKLQlpZiAoaWd0X2lvY3RsKGZkLCBMT0NBTF9JT0NUTF9JOTE1X0dFTV9VU0VSUFRSLCAmdXNl cnB0cikpCisJaWYgKGlndF9pb2N0bChmZCwgRFJNX0lPQ1RMX0k5MTVfR0VNX1VTRVJQVFIsICZ1 c2VycHRyKSkKIAkJcmV0dXJuIC1lcnJubzsKIAogCSpoYW5kbGUgPSB1c2VycHRyLmhhbmRsZTsK QEAgLTExNzksNyArMTE1Myw2IEBAIGJvb2wgZ2VtX2hhc19ibHQoaW50IGZkKQogCXJldHVybiBo YXNfYmx0OwogfQogCi0jZGVmaW5lIExPQ0FMX0k5MTVfUEFSQU1fSEFTX1ZFQk9YIDIyCiAvKioK ICAqIGdlbV9oYXNfdmVib3g6CiAgKiBAZmQ6IG9wZW4gaTkxNSBkcm0gZmlsZSBkZXNjcmlwdG9y CkBAIC0xMTk1LDExICsxMTY4LDExIEBAIGJvb2wgZ2VtX2hhc192ZWJveChpbnQgZmQpCiB7CiAJ c3RhdGljIGludCBoYXNfdmVib3ggPSAtMTsKIAlpZiAoaGFzX3ZlYm94IDwgMCkKLQkJaGFzX3Zl Ym94ID0gIGhhc19wYXJhbShmZCwgTE9DQUxfSTkxNV9QQVJBTV9IQVNfVkVCT1gpOworCQloYXNf dmVib3ggPSAgaGFzX3BhcmFtKGZkLCBJOTE1X1BBUkFNX0hBU19WRUJPWCk7CiAJcmV0dXJuIGhh c192ZWJveDsKIH0KIAotI2RlZmluZSBMT0NBTF9JOTE1X1BBUkFNX0hBU19CU0QyIDMxCisjZGVm aW5lIEk5MTVfUEFSQU1fSEFTX0JTRDIgMzEKIC8qKgogICogZ2VtX2hhc19ic2QyOgogICogQGZk OiBvcGVuIGk5MTUgZHJtIGZpbGUgZGVzY3JpcHRvcgpAQCAtMTIxNCw3ICsxMTg3LDcgQEAgYm9v bCBnZW1faGFzX2JzZDIoaW50IGZkKQogewogCXN0YXRpYyBpbnQgaGFzX2JzZDIgPSAtMTsKIAlp ZiAoaGFzX2JzZDIgPCAwKQotCQloYXNfYnNkMiA9IGhhc19wYXJhbShmZCwgTE9DQUxfSTkxNV9Q QVJBTV9IQVNfQlNEMik7CisJCWhhc19ic2QyID0gaGFzX3BhcmFtKGZkLCBJOTE1X1BBUkFNX0hB U19CU0QyKTsKIAlyZXR1cm4gaGFzX2JzZDI7CiB9CiAKQEAgLTEyOTYsNyArMTI2OSw3IEBAIHVp bnQ2NF90IGdlbV9hcGVydHVyZV9zaXplKGludCBmZCkKIAlzdGF0aWMgdWludDY0X3QgYXBlcnR1 cmVfc2l6ZSA9IDA7CiAKIAlpZiAoYXBlcnR1cmVfc2l6ZSA9PSAwKSB7Ci0JCXN0cnVjdCBsb2Nh bF9pOTE1X2dlbV9jb250ZXh0X3BhcmFtIHA7CisJCXN0cnVjdCBkcm1faTkxNV9nZW1fY29udGV4 dF9wYXJhbSBwOwogCiAJCW1lbXNldCgmcCwgMCwgc2l6ZW9mKHApKTsKIAkJcC5wYXJhbSA9IDB4 MzsKQEAgLTEzNTcsNyArMTMzMCw2IEBAIHVpbnQ2NF90IGdlbV9nbG9iYWxfYXBlcnR1cmVfc2l6 ZShpbnQgZmQpCiAJcmV0dXJuIGFwZXJ0dXJlLmFwZXJfc2l6ZTsKIH0KIAotI2RlZmluZSBMT0NB TF9JOTE1X1BBUkFNX0hBU19FWEVDX1NPRlRQSU4gMzcKIC8qKgogICogZ2VtX2hhc19zb2Z0cGlu OgogICogQGZkOiBvcGVuIGk5MTUgZHJtIGZpbGUgZGVzY3JpcHRvcgpAQCAtMTM3NSw3ICsxMzQ3 LDcgQEAgYm9vbCBnZW1faGFzX3NvZnRwaW4oaW50IGZkKQogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2V0 cGFyYW0gZ3A7CiAKIAkJbWVtc2V0KCZncCwgMCwgc2l6ZW9mKGdwKSk7Ci0JCWdwLnBhcmFtID0g TE9DQUxfSTkxNV9QQVJBTV9IQVNfRVhFQ19TT0ZUUElOOworCQlncC5wYXJhbSA9IEk5MTVfUEFS QU1fSEFTX0VYRUNfU09GVFBJTjsKIAkJZ3AudmFsdWUgPSAmaGFzX3NvZnRwaW47CiAKIAkJaGFz X3NvZnRwaW4gPSAwOwpAQCAtMTM4Niw3ICsxMzU4LDYgQEAgYm9vbCBnZW1faGFzX3NvZnRwaW4o aW50IGZkKQogCXJldHVybiBoYXNfc29mdHBpbjsKIH0KIAotI2RlZmluZSBMT0NBTF9QQVJBTV9I QVNfRVhFQ19GRU5DRSA0NAogLyoqCiAgKiBnZW1faGFzX2V4ZWNfZmVuY2U6CiAgKiBAZmQ6IG9w ZW4gaTkxNSBkcm0gZmlsZSBkZXNjcmlwdG9yCkBAIC0xNDA0LDcgKzEzNzUsNyBAQCBib29sIGdl bV9oYXNfZXhlY19mZW5jZShpbnQgZmQpCiAJCXN0cnVjdCBkcm1faTkxNV9nZXRwYXJhbSBncDsK IAogCQltZW1zZXQoJmdwLCAwLCBzaXplb2YoZ3ApKTsKLQkJZ3AucGFyYW0gPSBMT0NBTF9QQVJB TV9IQVNfRVhFQ19GRU5DRTsKKwkJZ3AucGFyYW0gPSBJOTE1X1BBUkFNX0hBU19FWEVDX0ZFTkNF OwogCQlncC52YWx1ZSA9ICZoYXNfZXhlY19mZW5jZTsKIAogCQloYXNfZXhlY19mZW5jZSA9IDA7 CkBAIC0xNjc2LDcgKzE2NDcsNyBAQCBpbnQgX19rbXNfYWRkZmIoaW50IGZkLCB1aW50MzJfdCBo YW5kbGUsIHVpbnQzMl90IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQsCiAJCXVpbnQzMl90IHN0cmlk ZSwgdWludDMyX3QgcGl4ZWxfZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllciwKIAkJdWludDMyX3Qg ZmxhZ3MsIHVpbnQzMl90ICpidWZfaWQpCiB7Ci0Jc3RydWN0IGxvY2FsX2RybV9tb2RlX2ZiX2Nt ZDIgZjsKKwlzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiBmOwogCWludCByZXQ7CiAKIAlpZ3RfcmVx dWlyZV9mYl9tb2RpZmllcnMoZmQpOwpkaWZmIC0tZ2l0IGEvdGVzdHMvTWFrZWZpbGUuYW0gYi90 ZXN0cy9NYWtlZmlsZS5hbQppbmRleCAyN2FjZmIzNTg1ODIuLjM2ZjdkN2EwYjEwYSAxMDA2NDQK LS0tIGEvdGVzdHMvTWFrZWZpbGUuYW0KKysrIGIvdGVzdHMvTWFrZWZpbGUuYW0KQEAgLTg0LDcg Kzg0LDcgQEAgRVhUUkFfRElTVCA9IFwKIAogQ0xFQU5GSUxFUyA9ICQoRVhUUkFfUFJPR1JBTVMp IHRlc3QtbGlzdC50eHQgdGVzdC1saXN0LWZ1bGwudHh0IC5naXRpZ25vcmUKIAotQU1fQ0ZMQUdT ID0gJChEUk1fQ0ZMQUdTKSAkKENXQVJORkxBR1MpIC1Xbm8tdW51c2VkLXJlc3VsdCAkKERFQlVH X0NGTEFHUylcCitBTV9DRkxBR1MgPSAkKENXQVJORkxBR1MpIC1Xbm8tdW51c2VkLXJlc3VsdCAk KERFQlVHX0NGTEFHUylcCiAJLUkkKHRvcF9zcmNkaXIpL2luY2x1ZGUvZHJtLXVhcGkgXAogCS1J JChzcmNkaXIpLy4uIFwKIAktSSQoc3JjZGlyKS8uLi9saWIgXApAQCAtOTIsNiArOTIsNyBAQCBB TV9DRkxBR1MgPSAkKERSTV9DRkxBR1MpICQoQ1dBUk5GTEFHUykgLVduby11bnVzZWQtcmVzdWx0 ICQoREVCVUdfQ0ZMQUdTKVwKIAktRElHVF9TUkNESVI9XCIiJChhYnNfc3JjZGlyKSJcIiBcCiAJ LURJR1RfREFUQURJUj1cIiIkKHBrZ2RhdGFkaXIpIlwiIFwKIAktRF9HTlVfU09VUkNFIFwKKwkk KERSTV9DRkxBR1MpIFwKIAkkKExJQlVOV0lORF9DRkxBR1MpICQoV0VSUk9SX0NGTEFHUykgXAog CSQoTlVMTCkKIApkaWZmIC0tZ2l0IGEvdGVzdHMvZ2VtX2N0eF9wYXJhbS5jIGIvdGVzdHMvZ2Vt X2N0eF9wYXJhbS5jCmluZGV4IGVmZGFmMTkxYTFlZC4uYzIwYWUxZWVmZWExIDEwMDY0NAotLS0g YS90ZXN0cy9nZW1fY3R4X3BhcmFtLmMKKysrIGIvdGVzdHMvZ2VtX2N0eF9wYXJhbS5jCkBAIC0z MCw3ICszMCw3IEBAIElHVF9URVNUX0RFU0NSSVBUSU9OKCJCYXNpYyB0ZXN0IGZvciBjb250ZXh0 IHNldC9nZXQgcGFyYW0gaW5wdXQgdmFsaWRhdGlvbi4iKTsKIAogaWd0X21haW4KIHsKLQlzdHJ1 Y3QgbG9jYWxfaTkxNV9nZW1fY29udGV4dF9wYXJhbSBhcmc7CisJc3RydWN0IGRybV9pOTE1X2dl bV9jb250ZXh0X3BhcmFtIGFyZzsKIAlpbnQgZmQ7CiAJdWludDMyX3QgY3R4OwogCkBAIC00MSw0 NiArNDEsNDYgQEAgaWd0X21haW4KIAkJY3R4ID0gZ2VtX2NvbnRleHRfY3JlYXRlKGZkKTsKIAl9 CiAKLQlhcmcucGFyYW0gPSBMT0NBTF9DT05URVhUX1BBUkFNX0JBTl9QRVJJT0Q7CisJYXJnLnBh cmFtID0gSTkxNV9DT05URVhUX1BBUkFNX0JBTl9QRVJJT0Q7CiAKIAkvKiBYWFggc3RhcnQgdG8g ZW5mb3JjZSBiYW4gcGVyaW9kIHJldHVybmluZyAtRUlOVkFMIHdoZW4KIAkgKiB0cmFuc2l0aW9u IGhhcyBiZWVuIGRvbmUgKi8KIAlpZiAoX19nZW1fY29udGV4dF9nZXRfcGFyYW0oZmQsICZhcmcp ID09IC1FSU5WQUwpCi0JCWFyZy5wYXJhbSA9IExPQ0FMX0NPTlRFWFRfUEFSQU1fQkFOTkFCTEU7 CisJCWFyZy5wYXJhbSA9IEk5MTVfQ09OVEVYVF9QQVJBTV9CQU5OQUJMRTsKIAogCWlndF9zdWJ0 ZXN0KCJiYXNpYyIpIHsKLQkJYXJnLmNvbnRleHQgPSBjdHg7CisJCWFyZy5jdHhfaWQgPSBjdHg7 CiAJCWdlbV9jb250ZXh0X2dldF9wYXJhbShmZCwgJmFyZyk7CiAJCWdlbV9jb250ZXh0X3NldF9w YXJhbShmZCwgJmFyZyk7CiAJfQogCiAJaWd0X3N1YnRlc3QoImJhc2ljLWRlZmF1bHQiKSB7Ci0J CWFyZy5jb250ZXh0ID0gMDsKKwkJYXJnLmN0eF9pZCA9IDA7CiAJCWdlbV9jb250ZXh0X2dldF9w YXJhbShmZCwgJmFyZyk7CiAJCWdlbV9jb250ZXh0X3NldF9wYXJhbShmZCwgJmFyZyk7CiAJfQog CiAJaWd0X3N1YnRlc3QoImludmFsaWQtY3R4LWdldCIpIHsKLQkJYXJnLmNvbnRleHQgPSAyOwor CQlhcmcuY3R4X2lkID0gMjsKIAkJaWd0X2Fzc2VydF9lcShfX2dlbV9jb250ZXh0X2dldF9wYXJh bShmZCwgJmFyZyksIC1FTk9FTlQpOwogCX0KIAogCWlndF9zdWJ0ZXN0KCJpbnZhbGlkLWN0eC1z ZXQiKSB7Ci0JCWFyZy5jb250ZXh0ID0gY3R4OworCQlhcmcuY3R4X2lkID0gY3R4OwogCQlnZW1f Y29udGV4dF9nZXRfcGFyYW0oZmQsICZhcmcpOwotCQlhcmcuY29udGV4dCA9IDI7CisJCWFyZy5j dHhfaWQgPSAyOwogCQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX2NvbnRleHRfc2V0X3BhcmFtKGZkLCAm YXJnKSwgLUVOT0VOVCk7CiAJfQogCiAJaWd0X3N1YnRlc3QoImludmFsaWQtc2l6ZS1nZXQiKSB7 Ci0JCWFyZy5jb250ZXh0ID0gY3R4OworCQlhcmcuY3R4X2lkID0gY3R4OwogCQlhcmcuc2l6ZSA9 IDg7CiAJCWdlbV9jb250ZXh0X2dldF9wYXJhbShmZCwgJmFyZyk7CiAJCWlndF9hc3NlcnQoYXJn LnNpemUgPT0gMCk7CiAJfQogCiAJaWd0X3N1YnRlc3QoImludmFsaWQtc2l6ZS1zZXQiKSB7Ci0J CWFyZy5jb250ZXh0ID0gY3R4OworCQlhcmcuY3R4X2lkID0gY3R4OwogCQlnZW1fY29udGV4dF9n ZXRfcGFyYW0oZmQsICZhcmcpOwogCQlhcmcuc2l6ZSA9IDg7CiAJCWlndF9hc3NlcnRfZXEoX19n ZW1fY29udGV4dF9zZXRfcGFyYW0oZmQsICZhcmcpLCAtRUlOVkFMKTsKQEAgLTkxLDcgKzkxLDcg QEAgaWd0X21haW4KIAkJaWd0X2ZvcmsoY2hpbGQsIDEpIHsKIAkJCWlndF9kcm9wX3Jvb3QoKTsK IAotCQkJYXJnLmNvbnRleHQgPSBjdHg7CisJCQlhcmcuY3R4X2lkID0gY3R4OwogCQkJZ2VtX2Nv bnRleHRfZ2V0X3BhcmFtKGZkLCAmYXJnKTsKIAkJCWFyZy52YWx1ZS0tOwogCQkJaWd0X2Fzc2Vy dF9lcShfX2dlbV9jb250ZXh0X3NldF9wYXJhbShmZCwgJmFyZyksIC1FUEVSTSk7CkBAIC0xMDEs MTkgKzEwMSwxOSBAQCBpZ3RfbWFpbgogCX0KIAogCWlndF9zdWJ0ZXN0KCJyb290LXNldCIpIHsK LQkJYXJnLmNvbnRleHQgPSBjdHg7CisJCWFyZy5jdHhfaWQgPSBjdHg7CiAJCWdlbV9jb250ZXh0 X2dldF9wYXJhbShmZCwgJmFyZyk7CiAJCWFyZy52YWx1ZS0tOwogCQlnZW1fY29udGV4dF9zZXRf cGFyYW0oZmQsICZhcmcpOwogCX0KIAotCWFyZy5wYXJhbSA9IExPQ0FMX0NPTlRFWFRfUEFSQU1f Tk9fWkVST01BUDsKKwlhcmcucGFyYW0gPSBJOTE1X0NPTlRFWFRfUEFSQU1fTk9fWkVST01BUDsK IAogCWlndF9zdWJ0ZXN0KCJub24tcm9vdC1zZXQtbm8temVyb21hcCIpIHsKIAkJaWd0X2Zvcmso Y2hpbGQsIDEpIHsKIAkJCWlndF9kcm9wX3Jvb3QoKTsKIAotCQkJYXJnLmNvbnRleHQgPSBjdHg7 CisJCQlhcmcuY3R4X2lkID0gY3R4OwogCQkJZ2VtX2NvbnRleHRfZ2V0X3BhcmFtKGZkLCAmYXJn KTsKIAkJCWFyZy52YWx1ZS0tOwogCQkJZ2VtX2NvbnRleHRfc2V0X3BhcmFtKGZkLCAmYXJnKTsK QEAgLTEyMywxNCArMTIzLDE0IEBAIGlndF9tYWluCiAJfQogCiAJaWd0X3N1YnRlc3QoInJvb3Qt c2V0LW5vLXplcm9tYXAtZW5hYmxlZCIpIHsKLQkJYXJnLmNvbnRleHQgPSBjdHg7CisJCWFyZy5j dHhfaWQgPSBjdHg7CiAJCWdlbV9jb250ZXh0X2dldF9wYXJhbShmZCwgJmFyZyk7CiAJCWFyZy52 YWx1ZSA9IDE7CiAJCWdlbV9jb250ZXh0X3NldF9wYXJhbShmZCwgJmFyZyk7CiAJfQogCiAJaWd0 X3N1YnRlc3QoInJvb3Qtc2V0LW5vLXplcm9tYXAtZGlzYWJsZWQiKSB7Ci0JCWFyZy5jb250ZXh0 ID0gY3R4OworCQlhcmcuY3R4X2lkID0gY3R4OwogCQlnZW1fY29udGV4dF9nZXRfcGFyYW0oZmQs ICZhcmcpOwogCQlhcmcudmFsdWUgPSAwOwogCQlnZW1fY29udGV4dF9zZXRfcGFyYW0oZmQsICZh cmcpOwpAQCAtMTQwLDE1ICsxNDAsMTUgQEAgaWd0X21haW4KIAkgKiB0byBjYXRjaCBBQkkgZXh0 ZW5zaW9ucy4gRG9uJ3QgImZpeCIgdGhpcyB0ZXN0Y2FzZSB3aXRob3V0IGFkZGluZyBhbGwKIAkg KiB0aGUgdGVzdHMgZm9yIHRoZSBuZXcgcGFyYW0gZmlyc3QuCiAJICovCi0JYXJnLnBhcmFtID0g TE9DQUxfQ09OVEVYVF9QQVJBTV9CQU5OQUJMRSArIDE7CisJYXJnLnBhcmFtID0gSTkxNV9DT05U RVhUX1BBUkFNX0JBTk5BQkxFICsgMTsKIAogCWlndF9zdWJ0ZXN0KCJpbnZhbGlkLXBhcmFtLWdl dCIpIHsKLQkJYXJnLmNvbnRleHQgPSBjdHg7CisJCWFyZy5jdHhfaWQgPSBjdHg7CiAJCWlndF9h c3NlcnRfZXEoX19nZW1fY29udGV4dF9nZXRfcGFyYW0oZmQsICZhcmcpLCAtRUlOVkFMKTsKIAl9 CiAKIAlpZ3Rfc3VidGVzdCgiaW52YWxpZC1wYXJhbS1zZXQiKSB7Ci0JCWFyZy5jb250ZXh0ID0g Y3R4OworCQlhcmcuY3R4X2lkID0gY3R4OwogCQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX2NvbnRleHRf c2V0X3BhcmFtKGZkLCAmYXJnKSwgLUVJTlZBTCk7CiAJfQogCi0tIAoyLjE1LjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=