From: Harry Wentland Subject: [PATCH 033/120] drm/amd/display: Roll core_sink into dc_sink Date: Wed, 9 Aug 2017 11:01:19 -0400 Message-ID: <20170809150246.8835-34-harry.wentland@amd.com> References: <20170809150246.8835-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170809150246.8835-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Harry Wentland U2lnbmVkLW9mZi1ieTogSGFycnkgV2VudGxhbmQgPGhhcnJ5LndlbnRsYW5kQGFtZC5jb20+ClJl dmlld2VkLWJ5OiBUb255IENoZW5nIDxUb255LkNoZW5nQGFtZC5jb20+CkFja2VkLWJ5OiBIYXJy eSBXZW50bGFuZCA8SGFycnkuV2VudGxhbmRAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oICAgICAgICAgICB8ICA0ICstCiBkcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jICB8ICAyICstCiAuLi4vZHJtL2Ft ZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYyAgICB8ICA0ICstCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jICAgICAgICAgICB8ICA0ICstCiBkcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rLmMgICAgICB8IDYwICsrKysr KysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2Rj X3Jlc291cmNlLmMgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3Jl L2RjX3NpbmsuYyAgICAgIHwgMzAgKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9jb3JlL2RjX3N0cmVhbS5jICAgIHwgMTUgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGMuaCAgICAgICAgICAgICAgICB8IDE5ICsrKystLS0KIC4uLi9hbWQv ZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX2h3X3NlcXVlbmNlci5jICAgIHwgIDIgKy0KIGRyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvY29yZV90eXBlcy5oICAgIHwgMjEgKy0tLS0t LS0KIDExIGZpbGVzIGNoYW5nZWQsIDcyIGluc2VydGlvbnMoKyksIDkxIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9tb2RlLmggYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oCmluZGV4IGY1N2E1MTM0YTMy Ny4uY2IxNzM2NzhmN2RmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfbW9kZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9tb2Rl LmgKQEAgLTU2Nyw5ICs1NjcsOSBAQCBzdHJ1Y3QgYW1kZ3B1X2Nvbm5lY3RvciB7CiAJaW50IG51 bV9tb2RlczsKIAkvKiBUaGUgJ29sZCcgc2luayAtIGJlZm9yZSBhbiBIUEQuCiAJICogVGhlICdj dXJyZW50JyBzaW5rIGlzIGluIGRjX2xpbmstPnNpbmsuICovCi0JY29uc3Qgc3RydWN0IGRjX3Np bmsgKmRjX3Npbms7CisJc3RydWN0IGRjX3NpbmsgKmRjX3Npbms7CiAJc3RydWN0IGRjX2xpbmsg KmRjX2xpbms7Ci0JY29uc3Qgc3RydWN0IGRjX3NpbmsgKmRjX2VtX3Npbms7CisJc3RydWN0IGRj X3NpbmsgKmRjX2VtX3Npbms7CiAJY29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqc3RyZWFtOwogCXZv aWQgKmNvbl9wcml2OwogCWJvb2wgZGFjX2xvYWRfZGV0ZWN0OwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMKaW5kZXggOGYxODA1ODQxMTUw Li43MTE3OGM4OGUzOWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9h bWRncHVfZG0vYW1kZ3B1X2RtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Ft ZGdwdV9kbS9hbWRncHVfZG0uYwpAQCAtNjk3LDcgKzY5Nyw3IEBAIHZvaWQgYW1kZ3B1X2RtX3Vw ZGF0ZV9jb25uZWN0b3JfYWZ0ZXJfZGV0ZWN0KAogewogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3IgPSAmYWNvbm5lY3Rvci0+YmFzZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g Y29ubmVjdG9yLT5kZXY7Ci0JY29uc3Qgc3RydWN0IGRjX3NpbmsgKnNpbms7CisJc3RydWN0IGRj X3NpbmsgKnNpbms7CiAKIAkvKiBNU1QgaGFuZGxlZCBieSBkcm1fbXN0IGZyYW1ld29yayAqLwog CWlmIChhY29ubmVjdG9yLT5tc3RfbWdyLm1zdF9zdGF0ZSA9PSB0cnVlKQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMK aW5kZXggNDU2ZjY2NTczZWRlLi5iN2MwMWYzNTNkMzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYwpAQCAtMTQw OSw3ICsxNDA5LDcgQEAgaW50IGFtZGdwdV9kbV9jb25uZWN0b3JfbW9kZV92YWxpZCgKIAkJc3Ry dWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCiB7CiAJaW50IHJlc3VsdCA9IE1PREVfRVJST1I7 Ci0JY29uc3Qgc3RydWN0IGRjX3NpbmsgKmRjX3Npbms7CisJc3RydWN0IGRjX3NpbmsgKmRjX3Np bms7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBjb25uZWN0b3ItPmRldi0+ZGV2X3By aXZhdGU7CiAJc3RydWN0IGRjX3ZhbGlkYXRpb25fc2V0IHZhbF9zZXQgPSB7IDAgfTsKIAkvKiBU T0RPOiBVbmhhcmRjb2RlIHN0cmVhbSBjb3VudCAqLwpAQCAtMTY3OSw3ICsxNjc5LDcgQEAgaW50 IGRtX2NyZWF0ZV92YWxpZGF0aW9uX3NldF9mb3JfY29ubmVjdG9yKHN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3IsCiAJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlLCBzdHJ1Y3Qg ZGNfdmFsaWRhdGlvbl9zZXQgKnZhbF9zZXQpCiB7CiAJaW50IHJlc3VsdCA9IE1PREVfRVJST1I7 Ci0JY29uc3Qgc3RydWN0IGRjX3NpbmsgKmRjX3NpbmsgPQorCXN0cnVjdCBkY19zaW5rICpkY19z aW5rID0KIAkJCXRvX2FtZGdwdV9jb25uZWN0b3IoY29ubmVjdG9yKS0+ZGNfc2luazsKIAkvKiBU T0RPOiBVbmhhcmRjb2RlIHN0cmVhbSBjb3VudCAqLwogCXN0cnVjdCBkY19zdHJlYW0gKnN0cmVh bTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jCmluZGV4IDczNzQwZTJh NTgxOS4uMzAzNzRmZmFhZTBiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvY29yZS9kYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3Jl L2RjLmMKQEAgLTkzOSw3ICs5MzksNyBAQCBzdGF0aWMgYm9vbCBkY19jb21taXRfY29udGV4dF9u b19jaGVjayhzdHJ1Y3QgZGMgKmRjLCBzdHJ1Y3QgdmFsaWRhdGVfY29udGV4dCAqYwogCXByb2dy YW1fdGltaW5nX3N5bmMoY29yZV9kYywgY29udGV4dCk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgY29u dGV4dC0+c3RyZWFtX2NvdW50OyBpKyspIHsKLQkJY29uc3Qgc3RydWN0IGNvcmVfc2luayAqc2lu ayA9IGNvbnRleHQtPnN0cmVhbXNbaV0tPnNpbms7CisJCWNvbnN0IHN0cnVjdCBkY19zaW5rICpz aW5rID0gY29udGV4dC0+c3RyZWFtc1tpXS0+c2luazsKIAogCQlmb3IgKGogPSAwOyBqIDwgY29u dGV4dC0+c3RyZWFtX3N0YXR1c1tpXS5zdXJmYWNlX2NvdW50OyBqKyspIHsKIAkJCWNvbnN0IHN0 cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlID0KQEAgLTE5ODQsNyArMTk4NCw3IEBAIHZvaWQgZGNf bGlua19zZXRfc2luayhzdHJ1Y3QgZGNfbGluayAqbGluaywgc3RydWN0IGRjX3NpbmsgKnNpbmsp CiAJfQogfQogCi12b2lkIGRjX2xpbmtfcmVtb3ZlX3JlbW90ZV9zaW5rKHN0cnVjdCBkY19saW5r ICpsaW5rLCBjb25zdCBzdHJ1Y3QgZGNfc2luayAqc2luaykKK3ZvaWQgZGNfbGlua19yZW1vdmVf cmVtb3RlX3Npbmsoc3RydWN0IGRjX2xpbmsgKmxpbmssIHN0cnVjdCBkY19zaW5rICpzaW5rKQog ewogCWludCBpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv Y29yZS9kY19saW5rLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19s aW5rLmMKaW5kZXggNDI4ZGJmZjg1MDViLi5lNzA2MjA2OWQ5YTEgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX2xpbmsuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rLmMKQEAgLTU0MSw4ICs1NDEsNyBAQCBi b29sIGRjX2xpbmtfZGV0ZWN0KHN0cnVjdCBkY19saW5rICpsaW5rLCBib29sIGJvb3QpCiAJc3Ry dWN0IGF1ZGlvX3N1cHBvcnQgKmF1ZF9zdXBwb3J0ID0gJmxpbmstPmRjLT5yZXNfcG9vbC0+YXVk aW9fc3VwcG9ydDsKIAllbnVtIGRjX2VkaWRfc3RhdHVzIGVkaWRfc3RhdHVzOwogCXN0cnVjdCBk Y19jb250ZXh0ICpkY19jdHggPSBsaW5rLT5jdHg7Ci0Jc3RydWN0IGRjX3NpbmsgKmRjX3Npbms7 Ci0Jc3RydWN0IGNvcmVfc2luayAqc2luayA9IE5VTEw7CisJc3RydWN0IGRjX3NpbmsgKnNpbms7 CiAJZW51bSBkY19jb25uZWN0aW9uX3R5cGUgbmV3X2Nvbm5lY3Rpb25fdHlwZSA9IGRjX2Nvbm5l Y3Rpb25fbm9uZTsKIAogCWlmIChsaW5rLT5jb25uZWN0b3Jfc2lnbmFsID09IFNJR05BTF9UWVBF X1ZJUlRVQUwpCkBAIC02MzcsMjIgKzYzNiwyMSBAQCBib29sIGRjX2xpbmtfZGV0ZWN0KHN0cnVj dCBkY19saW5rICpsaW5rLCBib29sIGJvb3QpCiAJCXNpbmtfaW5pdF9kYXRhLmxpbmsgPSBsaW5r OwogCQlzaW5rX2luaXRfZGF0YS5zaW5rX3NpZ25hbCA9IHNpbmtfY2Fwcy5zaWduYWw7CiAKLQkJ ZGNfc2luayA9IGRjX3NpbmtfY3JlYXRlKCZzaW5rX2luaXRfZGF0YSk7Ci0JCWlmICghZGNfc2lu aykgeworCQlzaW5rID0gZGNfc2lua19jcmVhdGUoJnNpbmtfaW5pdF9kYXRhKTsKKwkJaWYgKCFz aW5rKSB7CiAJCQlEQ19FUlJPUigiRmFpbGVkIHRvIGNyZWF0ZSBzaW5rIVxuIik7CiAJCQlyZXR1 cm4gZmFsc2U7CiAJCX0KIAotCQlkY19zaW5rLT5kb25nbGVfbWF4X3BpeF9jbGsgPSBzaW5rX2Nh cHMubWF4X2hkbWlfcGl4ZWxfY2xvY2s7Ci0JCWRjX3NpbmstPmNvbnZlcnRlcl9kaXNhYmxlX2F1 ZGlvID0gY29udmVydGVyX2Rpc2FibGVfYXVkaW87CisJCXNpbmstPmRvbmdsZV9tYXhfcGl4X2Ns ayA9IHNpbmtfY2Fwcy5tYXhfaGRtaV9waXhlbF9jbG9jazsKKwkJc2luay0+Y29udmVydGVyX2Rp c2FibGVfYXVkaW8gPSBjb252ZXJ0ZXJfZGlzYWJsZV9hdWRpbzsKIAotCQlzaW5rID0gRENfU0lO S19UT19DT1JFKGRjX3NpbmspOwotCQlsaW5rLT5sb2NhbF9zaW5rID0gJnNpbmstPnB1YmxpYzsK KwkJbGluay0+bG9jYWxfc2luayA9IHNpbms7CiAKIAkJZWRpZF9zdGF0dXMgPSBkbV9oZWxwZXJz X3JlYWRfbG9jYWxfZWRpZCgKIAkJCQlsaW5rLT5jdHgsCiAJCQkJbGluaywKLQkJCQkmc2luay0+ cHVibGljKTsKKwkJCQlzaW5rKTsKIAogCQlzd2l0Y2ggKGVkaWRfc3RhdHVzKSB7CiAJCWNhc2Ug RURJRF9CQURfQ0hFQ0tTVU06CkBAIC02NjksMTYgKzY2NywxNiBAQCBib29sIGRjX2xpbmtfZGV0 ZWN0KHN0cnVjdCBkY19saW5rICpsaW5rLCBib29sIGJvb3QpCiAJCX0KIAogCQkvKiBIRE1JLURW SSBEb25nbGUgKi8KLQkJaWYgKGRjX3NpbmstPnNpbmtfc2lnbmFsID09IFNJR05BTF9UWVBFX0hE TUlfVFlQRV9BICYmCi0JCQkJIWRjX3NpbmstPmVkaWRfY2Fwcy5lZGlkX2hkbWkpCi0JCQlkY19z aW5rLT5zaW5rX3NpZ25hbCA9IFNJR05BTF9UWVBFX0RWSV9TSU5HTEVfTElOSzsKKwkJaWYgKHNp bmstPnNpbmtfc2lnbmFsID09IFNJR05BTF9UWVBFX0hETUlfVFlQRV9BICYmCisJCQkJIXNpbmst PmVkaWRfY2Fwcy5lZGlkX2hkbWkpCisJCQlzaW5rLT5zaW5rX3NpZ25hbCA9IFNJR05BTF9UWVBF X0RWSV9TSU5HTEVfTElOSzsKIAogCQkvKiBDb25uZWN0aXZpdHkgbG9nOiBkZXRlY3Rpb24gKi8K LQkJZm9yIChpID0gMDsgaSA8IHNpbmstPnB1YmxpYy5kY19lZGlkLmxlbmd0aCAvIEVESURfQkxP Q0tfU0laRTsgaSsrKSB7CisJCWZvciAoaSA9IDA7IGkgPCBzaW5rLT5kY19lZGlkLmxlbmd0aCAv IEVESURfQkxPQ0tfU0laRTsgaSsrKSB7CiAJCQlDT05OX0RBVEFfREVURUNUKGxpbmssCi0JCQkJ CSZzaW5rLT5wdWJsaWMuZGNfZWRpZC5yYXdfZWRpZFtpICogRURJRF9CTE9DS19TSVpFXSwKKwkJ CQkJJnNpbmstPmRjX2VkaWQucmF3X2VkaWRbaSAqIEVESURfQkxPQ0tfU0laRV0sCiAJCQkJCUVE SURfQkxPQ0tfU0laRSwKLQkJCQkJIiVzOiBbQmxvY2sgJWRdICIsIHNpbmstPnB1YmxpYy5lZGlk X2NhcHMuZGlzcGxheV9uYW1lLCBpKTsKKwkJCQkJIiVzOiBbQmxvY2sgJWRdICIsIHNpbmstPmVk aWRfY2Fwcy5kaXNwbGF5X25hbWUsIGkpOwogCQl9CiAKIAkJZG1fbG9nZ2VyX3dyaXRlKGxpbmst PmN0eC0+bG9nZ2VyLCBMT0dfREVURUNUSU9OX0VESURfUEFSU0VSLApAQCAtNjkyLDE2ICs2OTAs MTYgQEAgYm9vbCBkY19saW5rX2RldGVjdChzdHJ1Y3QgZGNfbGluayAqbGluaywgYm9vbCBib290 KQogCQkJInNwZWFrZXJfZmxhZyA9ICVkLCAiCiAJCQkiYXVkaW9fbW9kZV9jb3VudCA9ICVkXG4i LAogCQkJX19mdW5jX18sCi0JCQlzaW5rLT5wdWJsaWMuZWRpZF9jYXBzLm1hbnVmYWN0dXJlcl9p ZCwKLQkJCXNpbmstPnB1YmxpYy5lZGlkX2NhcHMucHJvZHVjdF9pZCwKLQkJCXNpbmstPnB1Ymxp Yy5lZGlkX2NhcHMuc2VyaWFsX251bWJlciwKLQkJCXNpbmstPnB1YmxpYy5lZGlkX2NhcHMubWFu dWZhY3R1cmVfd2VlaywKLQkJCXNpbmstPnB1YmxpYy5lZGlkX2NhcHMubWFudWZhY3R1cmVfeWVh ciwKLQkJCXNpbmstPnB1YmxpYy5lZGlkX2NhcHMuZGlzcGxheV9uYW1lLAotCQkJc2luay0+cHVi bGljLmVkaWRfY2Fwcy5zcGVha2VyX2ZsYWdzLAotCQkJc2luay0+cHVibGljLmVkaWRfY2Fwcy5h dWRpb19tb2RlX2NvdW50KTsKLQotCQlmb3IgKGkgPSAwOyBpIDwgc2luay0+cHVibGljLmVkaWRf Y2Fwcy5hdWRpb19tb2RlX2NvdW50OyBpKyspIHsKKwkJCXNpbmstPmVkaWRfY2Fwcy5tYW51ZmFj dHVyZXJfaWQsCisJCQlzaW5rLT5lZGlkX2NhcHMucHJvZHVjdF9pZCwKKwkJCXNpbmstPmVkaWRf Y2Fwcy5zZXJpYWxfbnVtYmVyLAorCQkJc2luay0+ZWRpZF9jYXBzLm1hbnVmYWN0dXJlX3dlZWss CisJCQlzaW5rLT5lZGlkX2NhcHMubWFudWZhY3R1cmVfeWVhciwKKwkJCXNpbmstPmVkaWRfY2Fw cy5kaXNwbGF5X25hbWUsCisJCQlzaW5rLT5lZGlkX2NhcHMuc3BlYWtlcl9mbGFncywKKwkJCXNp bmstPmVkaWRfY2Fwcy5hdWRpb19tb2RlX2NvdW50KTsKKworCQlmb3IgKGkgPSAwOyBpIDwgc2lu ay0+ZWRpZF9jYXBzLmF1ZGlvX21vZGVfY291bnQ7IGkrKykgewogCQkJZG1fbG9nZ2VyX3dyaXRl KGxpbmstPmN0eC0+bG9nZ2VyLCBMT0dfREVURUNUSU9OX0VESURfUEFSU0VSLAogCQkJCSIlczog bW9kZSBudW1iZXIgPSAlZCwgIgogCQkJCSJmb3JtYXRfY29kZSA9ICVkLCAiCkBAIC03MTAsMTAg KzcwOCwxMCBAQCBib29sIGRjX2xpbmtfZGV0ZWN0KHN0cnVjdCBkY19saW5rICpsaW5rLCBib29s IGJvb3QpCiAJCQkJInNhbXBsZV9zaXplID0gJWRcbiIsCiAJCQkJX19mdW5jX18sCiAJCQkJaSwK LQkJCQlzaW5rLT5wdWJsaWMuZWRpZF9jYXBzLmF1ZGlvX21vZGVzW2ldLmZvcm1hdF9jb2RlLAot CQkJCXNpbmstPnB1YmxpYy5lZGlkX2NhcHMuYXVkaW9fbW9kZXNbaV0uY2hhbm5lbF9jb3VudCwK LQkJCQlzaW5rLT5wdWJsaWMuZWRpZF9jYXBzLmF1ZGlvX21vZGVzW2ldLnNhbXBsZV9yYXRlLAot CQkJCXNpbmstPnB1YmxpYy5lZGlkX2NhcHMuYXVkaW9fbW9kZXNbaV0uc2FtcGxlX3NpemUpOwor CQkJCXNpbmstPmVkaWRfY2Fwcy5hdWRpb19tb2Rlc1tpXS5mb3JtYXRfY29kZSwKKwkJCQlzaW5r LT5lZGlkX2NhcHMuYXVkaW9fbW9kZXNbaV0uY2hhbm5lbF9jb3VudCwKKwkJCQlzaW5rLT5lZGlk X2NhcHMuYXVkaW9fbW9kZXNbaV0uc2FtcGxlX3JhdGUsCisJCQkJc2luay0+ZWRpZF9jYXBzLmF1 ZGlvX21vZGVzW2ldLnNhbXBsZV9zaXplKTsKIAkJfQogCiAJfSBlbHNlIHsKQEAgLTczMiw3ICs3 MzAsNyBAQCBib29sIGRjX2xpbmtfZGV0ZWN0KHN0cnVjdCBkY19saW5rICpsaW5rLCBib29sIGJv b3QpCiAJfQogCiAJTElOS19JTkZPKCJsaW5rPSVkLCBkY19zaW5rX2luPSVwIGlzIG5vdyAlc1xu IiwKLQkJbGluay0+bGlua19pbmRleCwgJnNpbmstPnB1YmxpYywKKwkJbGluay0+bGlua19pbmRl eCwgc2luaywKIAkJKHNpbmtfY2Fwcy5zaWduYWwgPT0gU0lHTkFMX1RZUEVfTk9ORSA/CiAJCQki RGlzY29ubmVjdGVkIjoiQ29ubmVjdGVkIikpOwogCkBAIC0xMzQ3LDcgKzEzNDUsNyBAQCBlbnVt IGRjX3N0YXR1cyBkY19saW5rX3ZhbGlkYXRlX21vZGVfdGltaW5nKAogCQlzdHJ1Y3QgZGNfbGlu ayAqbGluaywKIAkJY29uc3Qgc3RydWN0IGRjX2NydGNfdGltaW5nICp0aW1pbmcpCiB7Ci0JdWlu dDMyX3QgbWF4X3BpeF9jbGsgPSBzdHJlYW0tPnNpbmstPnB1YmxpYy5kb25nbGVfbWF4X3BpeF9j bGs7CisJdWludDMyX3QgbWF4X3BpeF9jbGsgPSBzdHJlYW0tPnNpbmstPmRvbmdsZV9tYXhfcGl4 X2NsazsKIAogCS8qIEEgaGFjayB0byBhdm9pZCBmYWlsaW5nIGFueSBtb2RlcyBmb3IgRURJRCBv dmVycmlkZSBmZWF0dXJlIG9uCiAJICogdG9wb2xvZ3kgY2hhbmdlIHN1Y2ggYXMgbG93ZXIgcXVh bGl0eSBjYWJsZSBmb3IgRFAgb3IgZGlmZmVyZW50IGRvbmdsZQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3VyY2UuYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMKaW5kZXggZWM0NzE0ZWFiMmJl Li43MTcyM2ZiZGE3ZjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9jb3JlL2RjX3Jlc291cmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2NvcmUvZGNfcmVzb3VyY2UuYwpAQCAtMTUyOCw3ICsxNTI4LDcgQEAgZW51bSBkY19zdGF0dXMg cmVzb3VyY2VfbWFwX3Bvb2xfcmVzb3VyY2VzKAogCQkJcGlwZV9jdHgtPnN0cmVhbV9lbmMpOwog CiAJCS8qIFRPRE86IEFkZCBjaGVjayBpZiBBU0lDIHN1cHBvcnQgYW5kIEVESUQgYXVkaW8gKi8K LQkJaWYgKCFzdHJlYW0tPnNpbmstPnB1YmxpYy5jb252ZXJ0ZXJfZGlzYWJsZV9hdWRpbyAmJgor CQlpZiAoIXN0cmVhbS0+c2luay0+Y29udmVydGVyX2Rpc2FibGVfYXVkaW8gJiYKIAkJCWRjX2lz X2F1ZGlvX2NhcGFibGVfc2lnbmFsKHBpcGVfY3R4LT5zdHJlYW0tPnNpZ25hbCkgJiYKIAkJCXN0 cmVhbS0+cHVibGljLmF1ZGlvX2luZm8ubW9kZV9jb3VudCkgewogCQkJcGlwZV9jdHgtPmF1ZGlv ID0gZmluZF9maXJzdF9mcmVlX2F1ZGlvKApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2NvcmUvZGNfc2luay5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2NvcmUvZGNfc2luay5jCmluZGV4IDFmNzk4NWFkNWRiYS4uYTgzZjEyNDNhOWQxIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19zaW5rLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfc2luay5jCkBAIC0zMSwx NSArMzEsMTUgQEAKICAqIFByaXZhdGUgZnVuY3Rpb25zCiAgKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq LwogCi1zdGF0aWMgdm9pZCBkZXN0cnVjdChzdHJ1Y3QgY29yZV9zaW5rICpzaW5rKQorc3RhdGlj IHZvaWQgZGVzdHJ1Y3Qoc3RydWN0IGRjX3NpbmsgKnNpbmspCiB7Ci0JaWYgKHNpbmstPnB1Ymxp Yy5kY19jb250YWluZXJfaWQpIHsKLQkJZG1fZnJlZShzaW5rLT5wdWJsaWMuZGNfY29udGFpbmVy X2lkKTsKLQkJc2luay0+cHVibGljLmRjX2NvbnRhaW5lcl9pZCA9IE5VTEw7CisJaWYgKHNpbmst PmRjX2NvbnRhaW5lcl9pZCkgeworCQlkbV9mcmVlKHNpbmstPmRjX2NvbnRhaW5lcl9pZCk7CisJ CXNpbmstPmRjX2NvbnRhaW5lcl9pZCA9IE5VTEw7CiAJfQogfQogCi1zdGF0aWMgYm9vbCBjb25z dHJ1Y3Qoc3RydWN0IGNvcmVfc2luayAqc2luaywgY29uc3Qgc3RydWN0IGRjX3NpbmtfaW5pdF9k YXRhICppbml0X3BhcmFtcykKK3N0YXRpYyBib29sIGNvbnN0cnVjdChzdHJ1Y3QgZGNfc2luayAq c2luaywgY29uc3Qgc3RydWN0IGRjX3NpbmtfaW5pdF9kYXRhICppbml0X3BhcmFtcykKIHsKIAog CXN0cnVjdCBkY19saW5rICpsaW5rID0gaW5pdF9wYXJhbXMtPmxpbms7CkBAIC00NywxMiArNDcs MTIgQEAgc3RhdGljIGJvb2wgY29uc3RydWN0KHN0cnVjdCBjb3JlX3NpbmsgKnNpbmssIGNvbnN0 IHN0cnVjdCBkY19zaW5rX2luaXRfZGF0YSAqaW4KIAlpZiAoIWxpbmspCiAJCXJldHVybiBmYWxz ZTsKIAotCXNpbmstPnB1YmxpYy5zaW5rX3NpZ25hbCA9IGluaXRfcGFyYW1zLT5zaW5rX3NpZ25h bDsKKwlzaW5rLT5zaW5rX3NpZ25hbCA9IGluaXRfcGFyYW1zLT5zaW5rX3NpZ25hbDsKIAlzaW5r LT5saW5rID0gbGluazsKIAlzaW5rLT5jdHggPSBsaW5rLT5jdHg7Ci0Jc2luay0+cHVibGljLmRv bmdsZV9tYXhfcGl4X2NsayA9IGluaXRfcGFyYW1zLT5kb25nbGVfbWF4X3BpeF9jbGs7Ci0Jc2lu ay0+cHVibGljLmNvbnZlcnRlcl9kaXNhYmxlX2F1ZGlvID0gaW5pdF9wYXJhbXMtPmNvbnZlcnRl cl9kaXNhYmxlX2F1ZGlvOwotCXNpbmstPnB1YmxpYy5kY19jb250YWluZXJfaWQgPSBOVUxMOwor CXNpbmstPmRvbmdsZV9tYXhfcGl4X2NsayA9IGluaXRfcGFyYW1zLT5kb25nbGVfbWF4X3BpeF9j bGs7CisJc2luay0+Y29udmVydGVyX2Rpc2FibGVfYXVkaW8gPSBpbml0X3BhcmFtcy0+Y29udmVy dGVyX2Rpc2FibGVfYXVkaW87CisJc2luay0+ZGNfY29udGFpbmVyX2lkID0gTlVMTDsKIAogCXJl dHVybiB0cnVlOwogfQpAQCAtNjEsMTggKzYxLDE0IEBAIHN0YXRpYyBib29sIGNvbnN0cnVjdChz dHJ1Y3QgY29yZV9zaW5rICpzaW5rLCBjb25zdCBzdHJ1Y3QgZGNfc2lua19pbml0X2RhdGEgKmlu CiAgKiBQdWJsaWMgZnVuY3Rpb25zCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogCi12b2lkIGRj X3NpbmtfcmV0YWluKGNvbnN0IHN0cnVjdCBkY19zaW5rICpkY19zaW5rKQordm9pZCBkY19zaW5r X3JldGFpbihzdHJ1Y3QgZGNfc2luayAqc2luaykKIHsKLQlzdHJ1Y3QgY29yZV9zaW5rICpzaW5r ID0gRENfU0lOS19UT19DT1JFKGRjX3NpbmspOwotCiAJQVNTRVJUKHNpbmstPnJlZl9jb3VudCA+ IDApOwogCSsrc2luay0+cmVmX2NvdW50OwogfQogCi12b2lkIGRjX3NpbmtfcmVsZWFzZShjb25z dCBzdHJ1Y3QgZGNfc2luayAqZGNfc2luaykKK3ZvaWQgZGNfc2lua19yZWxlYXNlKHN0cnVjdCBk Y19zaW5rICpzaW5rKQogewotCXN0cnVjdCBjb3JlX3NpbmsgKnNpbmsgPSBEQ19TSU5LX1RPX0NP UkUoZGNfc2luayk7Ci0KIAlBU1NFUlQoc2luay0+cmVmX2NvdW50ID4gMCk7CiAJLS1zaW5rLT5y ZWZfY291bnQ7CiAKQEAgLTg0LDcgKzgwLDcgQEAgdm9pZCBkY19zaW5rX3JlbGVhc2UoY29uc3Qg c3RydWN0IGRjX3NpbmsgKmRjX3NpbmspCiAKIHN0cnVjdCBkY19zaW5rICpkY19zaW5rX2NyZWF0 ZShjb25zdCBzdHJ1Y3QgZGNfc2lua19pbml0X2RhdGEgKmluaXRfcGFyYW1zKQogewotCXN0cnVj dCBjb3JlX3NpbmsgKnNpbmsgPSBkbV9hbGxvYyhzaXplb2YoKnNpbmspKTsKKwlzdHJ1Y3QgZGNf c2luayAqc2luayA9IGRtX2FsbG9jKHNpemVvZigqc2luaykpOwogCiAJaWYgKE5VTEwgPT0gc2lu aykKIAkJZ290byBhbGxvY19mYWlsOwpAQCAtOTQsNyArOTAsNyBAQCBzdHJ1Y3QgZGNfc2luayAq ZGNfc2lua19jcmVhdGUoY29uc3Qgc3RydWN0IGRjX3NpbmtfaW5pdF9kYXRhICppbml0X3BhcmFt cykKIAogCSsrc2luay0+cmVmX2NvdW50OwogCi0JcmV0dXJuICZzaW5rLT5wdWJsaWM7CisJcmV0 dXJuIHNpbms7CiAKIGNvbnN0cnVjdF9mYWlsOgogCWRtX2ZyZWUoc2luayk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19zdHJlYW0uYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N0cmVhbS5jCmluZGV4IGEzMjk3MDlk ZTM2MC4uNWIzNTZkZGY1NjE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvY29yZS9kY19zdHJlYW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvY29yZS9kY19zdHJlYW0uYwpAQCAtNDYsMTEgKzQ2LDExIEBAIHN0cnVjdCBzdHJlYW0gewog ICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKi8KIAogc3RhdGljIGJvb2wgY29uc3RydWN0KHN0cnVjdCBj b3JlX3N0cmVhbSAqc3RyZWFtLAotCWNvbnN0IHN0cnVjdCBkY19zaW5rICpkY19zaW5rX2RhdGEp CisJc3RydWN0IGRjX3NpbmsgKmRjX3NpbmtfZGF0YSkKIHsKIAl1aW50MzJfdCBpID0gMDsKIAot CXN0cmVhbS0+c2luayA9IERDX1NJTktfVE9fQ09SRShkY19zaW5rX2RhdGEpOworCXN0cmVhbS0+ c2luayA9IGRjX3NpbmtfZGF0YTsKIAlzdHJlYW0tPmN0eCA9IHN0cmVhbS0+c2luay0+Y3R4Owog CXN0cmVhbS0+cHVibGljLnNpbmsgPSBkY19zaW5rX2RhdGE7CiAKQEAgLTk3LDcgKzk3LDcgQEAg c3RhdGljIGJvb2wgY29uc3RydWN0KHN0cnVjdCBjb3JlX3N0cmVhbSAqc3RyZWFtLAogCiBzdGF0 aWMgdm9pZCBkZXN0cnVjdChzdHJ1Y3QgY29yZV9zdHJlYW0gKnN0cmVhbSkKIHsKLQlkY19zaW5r X3JlbGVhc2UoJnN0cmVhbS0+c2luay0+cHVibGljKTsKKwlkY19zaW5rX3JlbGVhc2Uoc3RyZWFt LT5zaW5rKTsKIAlpZiAoc3RyZWFtLT5wdWJsaWMub3V0X3RyYW5zZmVyX2Z1bmMgIT0gTlVMTCkg ewogCQlkY190cmFuc2Zlcl9mdW5jX3JlbGVhc2UoCiAJCQkJc3RyZWFtLT5wdWJsaWMub3V0X3Ry YW5zZmVyX2Z1bmMpOwpAQCAtMTMwLDkgKzEzMCw4IEBAIHZvaWQgZGNfc3RyZWFtX3JlbGVhc2Uo Y29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqcHVibGljKQogfQogCiBzdHJ1Y3QgZGNfc3RyZWFtICpk Y19jcmVhdGVfc3RyZWFtX2Zvcl9zaW5rKAotCQljb25zdCBzdHJ1Y3QgZGNfc2luayAqZGNfc2lu aykKKwkJc3RydWN0IGRjX3NpbmsgKnNpbmspCiB7Ci0Jc3RydWN0IGNvcmVfc2luayAqc2luayA9 IERDX1NJTktfVE9fQ09SRShkY19zaW5rKTsKIAlzdHJ1Y3Qgc3RyZWFtICpzdHJlYW07CiAKIAlp ZiAoc2luayA9PSBOVUxMKQpAQCAtMTQzLDcgKzE0Miw3IEBAIHN0cnVjdCBkY19zdHJlYW0gKmRj X2NyZWF0ZV9zdHJlYW1fZm9yX3NpbmsoCiAJaWYgKE5VTEwgPT0gc3RyZWFtKQogCQlnb3RvIGFs bG9jX2ZhaWw7CiAKLQlpZiAoZmFsc2UgPT0gY29uc3RydWN0KCZzdHJlYW0tPnByb3RlY3RlZCwg ZGNfc2luaykpCisJaWYgKGZhbHNlID09IGNvbnN0cnVjdCgmc3RyZWFtLT5wcm90ZWN0ZWQsIHNp bmspKQogCQkJZ290byBjb25zdHJ1Y3RfZmFpbDsKIAogCXN0cmVhbS0+cmVmX2NvdW50Kys7CkBA IC0zNTAsOCArMzQ5LDggQEAgdm9pZCBkY19zdHJlYW1fbG9nKAogCWRtX2xvZ2dlcl93cml0ZShk bV9sb2dnZXIsCiAJCQlsb2dfdHlwZSwKIAkJCSJcdHNpbmsgbmFtZTogJXMsIHNlcmlhbDogJWRc biIsCi0JCQljb3JlX3N0cmVhbS0+c2luay0+cHVibGljLmVkaWRfY2Fwcy5kaXNwbGF5X25hbWUs Ci0JCQljb3JlX3N0cmVhbS0+c2luay0+cHVibGljLmVkaWRfY2Fwcy5zZXJpYWxfbnVtYmVyKTsK KwkJCWNvcmVfc3RyZWFtLT5zaW5rLT5lZGlkX2NhcHMuZGlzcGxheV9uYW1lLAorCQkJY29yZV9z dHJlYW0tPnNpbmstPmVkaWRfY2Fwcy5zZXJpYWxfbnVtYmVyKTsKIAlkbV9sb2dnZXJfd3JpdGUo ZG1fbG9nZ2VyLAogCQkJbG9nX3R5cGUsCiAJCQkiXHRsaW5rOiAlZFxuIiwKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjLmgKaW5kZXggZTE1ZThmYjFlZWZlLi43N2JkNTQ2NTlhOGIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oCkBAIC02MjksNyArNjI5LDcgQEAgYm9vbCBkY19l bmFibGVfc3RlcmVvKAogLyoqCiAgKiBDcmVhdGUgYSBuZXcgZGVmYXVsdCBzdHJlYW0gZm9yIHRo ZSByZXF1ZXN0ZWQgc2luawogICovCi1zdHJ1Y3QgZGNfc3RyZWFtICpkY19jcmVhdGVfc3RyZWFt X2Zvcl9zaW5rKGNvbnN0IHN0cnVjdCBkY19zaW5rICpkY19zaW5rKTsKK3N0cnVjdCBkY19zdHJl YW0gKmRjX2NyZWF0ZV9zdHJlYW1fZm9yX3Npbmsoc3RydWN0IGRjX3NpbmsgKmRjX3NpbmspOwog CiB2b2lkIGRjX3N0cmVhbV9yZXRhaW4oY29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqZGNfc3RyZWFt KTsKIHZvaWQgZGNfc3RyZWFtX3JlbGVhc2UoY29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqZGNfc3Ry ZWFtKTsKQEAgLTcxMiw5ICs3MTIsOSBAQCBzdHJ1Y3QgbGlua19tc3Rfc3RyZWFtX2FsbG9jYXRp b25fdGFibGUgewogICogVGhlIGN1cnJlbnRseSBhY3RpdmUgc2lnbmFsIHR5cGUgKEhETUksIERQ LVNTVCwgRFAtTVNUKSBpcyBhbHNvIHJlcG9ydGVkLgogICovCiBzdHJ1Y3QgZGNfbGluayB7Ci0J Y29uc3Qgc3RydWN0IGRjX3NpbmsgKnJlbW90ZV9zaW5rc1tNQVhfU0lOS1NfUEVSX0xJTktdOwor CXN0cnVjdCBkY19zaW5rICpyZW1vdGVfc2lua3NbTUFYX1NJTktTX1BFUl9MSU5LXTsKIAl1bnNp Z25lZCBpbnQgc2lua19jb3VudDsKLQljb25zdCBzdHJ1Y3QgZGNfc2luayAqbG9jYWxfc2luazsK KwlzdHJ1Y3QgZGNfc2luayAqbG9jYWxfc2luazsKIAl1bnNpZ25lZCBpbnQgbGlua19pbmRleDsK IAllbnVtIGRjX2Nvbm5lY3Rpb25fdHlwZSB0eXBlOwogCWVudW0gc2lnbmFsX3R5cGUgY29ubmVj dG9yX3NpZ25hbDsKQEAgLTgyNSw3ICs4MjUsNyBAQCBzdHJ1Y3QgZGNfc2luayAqZGNfbGlua19h ZGRfcmVtb3RlX3NpbmsoCiAKIHZvaWQgZGNfbGlua19yZW1vdmVfcmVtb3RlX3NpbmsoCiAJc3Ry dWN0IGRjX2xpbmsgKmxpbmssCi0JY29uc3Qgc3RydWN0IGRjX3NpbmsgKnNpbmspOworCXN0cnVj dCBkY19zaW5rICpzaW5rKTsKIAogLyogVXNlZCBieSBkaWFnbm9zdGljcyBmb3IgdmlydHVhbCBs aW5rIGF0IHRoZSBtb21lbnQgKi8KIHZvaWQgZGNfbGlua19zZXRfc2luayhzdHJ1Y3QgZGNfbGlu ayAqbGluaywgc3RydWN0IGRjX3NpbmsgKnNpbmspOwpAQCAtODc5LDEwICs4NzksMTcgQEAgc3Ry dWN0IGRjX3NpbmsgewogCXZvaWQgKnByaXY7CiAJc3RydWN0IHN0ZXJlb18zZF9mZWF0dXJlcyBm ZWF0dXJlc18zZFtUSU1JTkdfM0RfRk9STUFUX01BWF07CiAJYm9vbCBjb252ZXJ0ZXJfZGlzYWJs ZV9hdWRpbzsKKworCS8qIHByaXZhdGUgdG8gREMgY29yZSAqLworCXN0cnVjdCBkY19saW5rICps aW5rOworCXN0cnVjdCBkY19jb250ZXh0ICpjdHg7CisKKwkvKiBwcml2YXRlIHRvIGRjX3Npbmsu YyAqLworCWludCByZWZfY291bnQ7CiB9OwogCi12b2lkIGRjX3NpbmtfcmV0YWluKGNvbnN0IHN0 cnVjdCBkY19zaW5rICpzaW5rKTsKLXZvaWQgZGNfc2lua19yZWxlYXNlKGNvbnN0IHN0cnVjdCBk Y19zaW5rICpzaW5rKTsKK3ZvaWQgZGNfc2lua19yZXRhaW4oc3RydWN0IGRjX3NpbmsgKnNpbmsp Owordm9pZCBkY19zaW5rX3JlbGVhc2Uoc3RydWN0IGRjX3NpbmsgKnNpbmspOwogCiBjb25zdCBz dHJ1Y3QgYXVkaW8gKipkY19nZXRfYXVkaW9zKHN0cnVjdCBkYyAqZGMpOwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9od19zZXF1ZW5j ZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX2h3X3Nl cXVlbmNlci5jCmluZGV4IGZlODA4NGUyOTBhMy4uNTg3MDFmZGI3Yzk0IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9od19zZXF1ZW5jZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9od19z ZXF1ZW5jZXIuYwpAQCAtNjU3LDcgKzY1Nyw3IEBAIHN0YXRpYyBlbnVtIGRjX3N0YXR1cyBiaW9z X3BhcnNlcl9jcnRjX3NvdXJjZV9zZWxlY3QoCiAJICogZW5jb2RlciBibG9jawogCSAqIG5vdGU6 IHZpZGVvIGJpb3MgY2xlYXJzIGFsbCBGTVQgc2V0dGluZyBoZXJlLiAqLwogCXN0cnVjdCBicF9j cnRjX3NvdXJjZV9zZWxlY3QgY3J0Y19zb3VyY2Vfc2VsZWN0ID0gezB9OwotCWNvbnN0IHN0cnVj dCBjb3JlX3NpbmsgKnNpbmsgPSBwaXBlX2N0eC0+c3RyZWFtLT5zaW5rOworCWNvbnN0IHN0cnVj dCBkY19zaW5rICpzaW5rID0gcGlwZV9jdHgtPnN0cmVhbS0+c2luazsKIAogCWNydGNfc291cmNl X3NlbGVjdC5lbmdpbmVfaWQgPSBwaXBlX2N0eC0+c3RyZWFtX2VuYy0+aWQ7CiAJY3J0Y19zb3Vy Y2Vfc2VsZWN0LmNvbnRyb2xsZXJfaWQgPSBwaXBlX2N0eC0+cGlwZV9pZHggKyAxOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9jb3JlX3R5cGVzLmggYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2NvcmVfdHlwZXMuaAppbmRleCBlZWQz MWE4MjdhOTAuLjFkNzMzYzgzNzg1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2luYy9jb3JlX3R5cGVzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2luYy9jb3JlX3R5cGVzLmgKQEAgLTY4LDcgKzY4LDcgQEAgc3RydWN0IGNvcmVfc3Ry ZWFtIHsKIAogCS8qIGZpZWxkIGludGVybmFsIHRvIERDICovCiAJc3RydWN0IGRjX2NvbnRleHQg KmN0eDsKLQljb25zdCBzdHJ1Y3QgY29yZV9zaW5rICpzaW5rOworCXN0cnVjdCBkY19zaW5rICpz aW5rOwogCiAJLyogdXNlZCBieSBEQ1AgYW5kIEZNVCAqLwogCXN0cnVjdCBiaXRfZGVwdGhfcmVk dWN0aW9uX3BhcmFtcyBiaXRfZGVwdGhfcGFyYW1zOwpAQCAtODAsMjUgKzgwLDYgQEAgc3RydWN0 IGNvcmVfc3RyZWFtIHsKIAlzdHJ1Y3QgZGNfc3RyZWFtX3N0YXR1cyBzdGF0dXM7CiB9OwogCi0v KioqKioqKioqKioqIGNvcmVfc2luayAqKioqKioqKioqKioqKioqKi8KLQotI2RlZmluZSBEQ19T SU5LX1RPX0NPUkUoZGNfc2luaykgXAotCWNvbnRhaW5lcl9vZihkY19zaW5rLCBzdHJ1Y3QgY29y ZV9zaW5rLCBwdWJsaWMpCi0KLXN0cnVjdCBjb3JlX3NpbmsgewotCS8qKiBUaGUgcHVibGljLCBy ZWFkLW9ubHkgKGZvciBETSkgYXJlYSBvZiBzaW5rLiAqKi8KLQlzdHJ1Y3QgZGNfc2luayBwdWJs aWM7Ci0JLyoqIEVuZC1vZi1wdWJsaWMgYXJlYS4gKiovCi0KLQkvKiogVGhlICdwcm90ZWN0ZWQn IGFyZWEgLSByZWFkL3dyaXRlIGFjY2VzcywgZm9yIHVzZSBvbmx5IGluc2lkZSBEQyAqKi8KLQkv KiBub3QgdXNlZCBmb3Igbm93ICovCi0Jc3RydWN0IGRjX2xpbmsgKmxpbms7Ci0Jc3RydWN0IGRj X2NvbnRleHQgKmN0eDsKLQotCS8qIHByaXZhdGUgdG8gZGNfc2luay5jICovCi0JaW50IHJlZl9j b3VudDsKLX07Ci0KIC8qKioqKioqKioqKiogbGluayAqKioqKioqKioqKioqKioqKi8KIHN0cnVj dCBsaW5rX2luaXRfZGF0YSB7CiAJY29uc3Qgc3RydWN0IGNvcmVfZGMgKmRjOwotLSAKMi4xMS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4 IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK