From: Maarten Lankhorst Subject: [PATCH 08/19] drm/i915: Convert flip_work to a list. Date: Tue, 19 Apr 2016 09:52:28 +0200 Message-ID: <1461052359-24154-9-git-send-email-maarten.lankhorst@linux.intel.com> References: <1461052359-24154-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 61AFC6E6CA for ; Tue, 19 Apr 2016 07:52:49 +0000 (UTC) In-Reply-To: <1461052359-24154-1-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyB3aWxsIGJlIHJlcXVpcmVkIHRvIGFsbG93IG1vcmUgdGhhbiAxIHVwZGF0ZSBpbiB0aGUg ZnV0dXJlLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn ZnMuYyAgfCAgOTAgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8IDEwNSArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgICA0ICstCiA0IGZpbGVzIGNo YW5nZWQsIDExNCBpbnNlcnRpb25zKCspLCA4NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jCmluZGV4IGFhYmQ3YTEzY2VjNy4uNTEzYzdkYTI0YzNkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtNTg5LDYgKzU4OSw1MyBAQCBzdGF0aWMgaW50 IGk5MTVfZ2VtX2d0dF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAlyZXR1 cm4gMDsKIH0KIAorc3RhdGljIHZvaWQgaTkxNV9kdW1wX3BhZ2VmbGlwKHN0cnVjdCBzZXFfZmls ZSAqbSwKKwkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkg ICAgICAgc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICAgICAgc3RydWN0IGludGVsX2Zs aXBfd29yayAqd29yaykKK3sKKwljb25zdCBjaGFyIHBpcGUgPSBwaXBlX25hbWUoY3J0Yy0+cGlw ZSk7CisJY29uc3QgY2hhciBwbGFuZSA9IHBsYW5lX25hbWUoY3J0Yy0+cGxhbmUpOworCXUzMiBw ZW5kaW5nOworCXUzMiBhZGRyOworCisJcGVuZGluZyA9IGF0b21pY19yZWFkKCZ3b3JrLT5wZW5k aW5nKTsKKwlpZiAocGVuZGluZyA9PSBJTlRFTF9GTElQX0lOQUNUSVZFKSB7CisJCXNlcV9wcmlu dGYobSwgIkZsaXAgaW9jdGwgcHJlcGFyaW5nIG9uIHBpcGUgJWMgKHBsYW5lICVjKVxuIiwKKwkJ CSAgIHBpcGUsIHBsYW5lKTsKKwl9IGVsc2UgeworCQlzZXFfcHJpbnRmKG0sICJGbGlwIHBlbmRp bmcgKHdhaXRpbmcgZm9yIHZzeW5jKSBvbiBwaXBlICVjIChwbGFuZSAlYylcbiIsCisJCQkgICBw aXBlLCBwbGFuZSk7CisJfQorCWlmICh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpIHsKKwkJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfZW5naW5lKHdv cmstPmZsaXBfcXVldWVkX3JlcSk7CisKKwkJc2VxX3ByaW50ZihtLCAiRmxpcCBxdWV1ZWQgb24g JXMgYXQgc2Vxbm8gJXgsIG5leHQgc2Vxbm8gJXggW2N1cnJlbnQgYnJlYWRjcnVtYiAleF0sIGNv bXBsZXRlZD8gJWRcbiIsCisJCQkgICBlbmdpbmUtPm5hbWUsCisJCQkgICBpOTE1X2dlbV9yZXF1 ZXN0X2dldF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpLAorCQkJICAgZGV2X3ByaXYtPm5l eHRfc2Vxbm8sCisJCQkgICBlbmdpbmUtPmdldF9zZXFubyhlbmdpbmUpLAorCQkJICAgaTkxNV9n ZW1fcmVxdWVzdF9jb21wbGV0ZWQod29yay0+ZmxpcF9xdWV1ZWRfcmVxLCB0cnVlKSk7CisJfSBl bHNlCisJCXNlcV9wcmludGYobSwgIkZsaXAgbm90IGFzc29jaWF0ZWQgd2l0aCBhbnkgcmluZ1xu Iik7CisJc2VxX3ByaW50ZihtLCAiRmxpcCBxdWV1ZWQgb24gZnJhbWUgJWQsICh3YXMgcmVhZHkg b24gZnJhbWUgJWQpLCBub3cgJWRcbiIsCisJCSAgIHdvcmstPmZsaXBfcXVldWVkX3ZibGFuaywK KwkJICAgd29yay0+ZmxpcF9yZWFkeV92YmxhbmssCisJCSAgIGludGVsX2NydGNfZ2V0X3ZibGFu a19jb3VudGVyKGNydGMpKTsKKwlzZXFfcHJpbnRmKG0sICIlZCBwcmVwYXJlc1xuIiwgYXRvbWlj X3JlYWQoJndvcmstPnBlbmRpbmcpKTsKKworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2Vu ID49IDQpCisJCWFkZHIgPSBJOTE1X0hJX0RJU1BCQVNFKEk5MTVfUkVBRChEU1BTVVJGKGNydGMt PnBsYW5lKSkpOworCWVsc2UKKwkJYWRkciA9IEk5MTVfUkVBRChEU1BBRERSKGNydGMtPnBsYW5l KSk7CisJc2VxX3ByaW50ZihtLCAiQ3VycmVudCBzY2Fub3V0IGFkZHJlc3MgMHglMDh4XG4iLCBh ZGRyKTsKKworCWlmICh3b3JrLT5wZW5kaW5nX2ZsaXBfb2JqKSB7CisJCXNlcV9wcmludGYobSwg Ik5ldyBmcmFtZWJ1ZmZlciBhZGRyZXNzIDB4JTA4bHhcbiIsIChsb25nKXdvcmstPmd0dF9vZmZz ZXQpOworCQlzZXFfcHJpbnRmKG0sICJNTUlPIHVwZGF0ZSBjb21wbGV0ZWQ/ICVkXG4iLCAgYWRk ciA9PSB3b3JrLT5ndHRfb2Zmc2V0KTsKKwl9Cit9CisKIHN0YXRpYyBpbnQgaTkxNV9nZW1fcGFn ZWZsaXBfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiB7CiAJc3RydWN0IGRy bV9pbmZvX25vZGUgKm5vZGUgPSBtLT5wcml2YXRlOwpAQCAtNjA3LDQ4ICs2NTQsMTMgQEAgc3Rh dGljIGludCBpOTE1X2dlbV9wYWdlZmxpcF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAq ZGF0YSkKIAkJc3RydWN0IGludGVsX2ZsaXBfd29yayAqd29yazsKIAogCQlzcGluX2xvY2tfaXJx KCZkZXYtPmV2ZW50X2xvY2spOwotCQl3b3JrID0gY3J0Yy0+ZmxpcF93b3JrOwotCQlpZiAod29y ayA9PSBOVUxMKSB7CisJCWlmIChsaXN0X2VtcHR5KCZjcnRjLT5mbGlwX3dvcmspKSB7CiAJCQlz ZXFfcHJpbnRmKG0sICJObyBmbGlwIGR1ZSBvbiBwaXBlICVjIChwbGFuZSAlYylcbiIsCiAJCQkJ ICAgcGlwZSwgcGxhbmUpOwogCQl9IGVsc2UgewotCQkJdTMyIHBlbmRpbmc7Ci0JCQl1MzIgYWRk cjsKLQotCQkJcGVuZGluZyA9IGF0b21pY19yZWFkKCZ3b3JrLT5wZW5kaW5nKTsKLQkJCWlmIChw ZW5kaW5nID09IElOVEVMX0ZMSVBfSU5BQ1RJVkUpIHsKLQkJCQlzZXFfcHJpbnRmKG0sICJGbGlw IGlvY3RsIHByZXBhcmluZyBvbiBwaXBlICVjIChwbGFuZSAlYylcbiIsCi0JCQkJCSAgIHBpcGUs IHBsYW5lKTsKLQkJCX0gZWxzZSB7Ci0JCQkJc2VxX3ByaW50ZihtLCAiRmxpcCBwZW5kaW5nICh3 YWl0aW5nIGZvciB2c3luYykgb24gcGlwZSAlYyAocGxhbmUgJWMpXG4iLAotCQkJCQkgICBwaXBl LCBwbGFuZSk7Ci0JCQl9Ci0JCQlpZiAod29yay0+ZmxpcF9xdWV1ZWRfcmVxKSB7Ci0JCQkJc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfZW5naW5l KHdvcmstPmZsaXBfcXVldWVkX3JlcSk7Ci0KLQkJCQlzZXFfcHJpbnRmKG0sICJGbGlwIHF1ZXVl ZCBvbiAlcyBhdCBzZXFubyAleCwgbmV4dCBzZXFubyAleCBbY3VycmVudCBicmVhZGNydW1iICV4 XSwgY29tcGxldGVkPyAlZFxuIiwKLQkJCQkJICAgZW5naW5lLT5uYW1lLAotCQkJCQkgICBpOTE1 X2dlbV9yZXF1ZXN0X2dldF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpLAotCQkJCQkgICBk ZXZfcHJpdi0+bmV4dF9zZXFubywKLQkJCQkJICAgZW5naW5lLT5nZXRfc2Vxbm8oZW5naW5lKSwK LQkJCQkJICAgaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQod29yay0+ZmxpcF9xdWV1ZWRfcmVx LCB0cnVlKSk7Ci0JCQl9IGVsc2UKLQkJCQlzZXFfcHJpbnRmKG0sICJGbGlwIG5vdCBhc3NvY2lh dGVkIHdpdGggYW55IHJpbmdcbiIpOwotCQkJc2VxX3ByaW50ZihtLCAiRmxpcCBxdWV1ZWQgb24g ZnJhbWUgJWQsICh3YXMgcmVhZHkgb24gZnJhbWUgJWQpLCBub3cgJWRcbiIsCi0JCQkJICAgd29y ay0+ZmxpcF9xdWV1ZWRfdmJsYW5rLAotCQkJCSAgIHdvcmstPmZsaXBfcmVhZHlfdmJsYW5rLAot CQkJCSAgIGludGVsX2NydGNfZ2V0X3ZibGFua19jb3VudGVyKGNydGMpKTsKLQkJCXNlcV9wcmlu dGYobSwgIiVkIHByZXBhcmVzXG4iLCBhdG9taWNfcmVhZCgmd29yay0+cGVuZGluZykpOwotCi0J CQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkKLQkJCQlhZGRyID0gSTkxNV9ISV9ESVNQ QkFTRShJOTE1X1JFQUQoRFNQU1VSRihjcnRjLT5wbGFuZSkpKTsKLQkJCWVsc2UKLQkJCQlhZGRy ID0gSTkxNV9SRUFEKERTUEFERFIoY3J0Yy0+cGxhbmUpKTsKLQkJCXNlcV9wcmludGYobSwgIkN1 cnJlbnQgc2Nhbm91dCBhZGRyZXNzIDB4JTA4eFxuIiwgYWRkcik7Ci0KLQkJCWlmICh3b3JrLT5w ZW5kaW5nX2ZsaXBfb2JqKSB7Ci0JCQkJc2VxX3ByaW50ZihtLCAiTmV3IGZyYW1lYnVmZmVyIGFk ZHJlc3MgMHglMDhseFxuIiwgKGxvbmcpd29yay0+Z3R0X29mZnNldCk7Ci0JCQkJc2VxX3ByaW50 ZihtLCAiTU1JTyB1cGRhdGUgY29tcGxldGVkPyAlZFxuIiwgIGFkZHIgPT0gd29yay0+Z3R0X29m ZnNldCk7CisJCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHdvcmssICZjcnRjLT5mbGlwX3dvcmssIGhl YWQpOyB7CisJCQkJaTkxNV9kdW1wX3BhZ2VmbGlwKG0sIGRldl9wcml2LCBjcnRjLCB3b3JrKTsK KwkJCQlzZXFfcHV0cyhtLCAiXG4iKTsKIAkJCX0KIAkJfQogCQlzcGluX3VubG9ja19pcnEoJmRl di0+ZXZlbnRfbG9jayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4NTEwMmFkNzU5NjIu LmZiMTlmZWUyNDU4NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC02MTEsNyArNjExLDcg QEAgc3RydWN0IGRybV9pOTE1X2Rpc3BsYXlfZnVuY3MgewogCQkJICBzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwKIAkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCSAg c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCi0JCQkgIHVpbnQzMl90IGZsYWdzKTsK KwkJCSAgdWludDY0X3QgZ3R0X29mZnNldCk7CiAJdm9pZCAoKmhwZF9pcnFfc2V0dXApKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpOwogCS8qIGNsb2NrIHVwZGF0ZXMgZm9yIG1vZGUgc2V0ICovCiAJ LyogY3Vyc29yIHVwZGF0ZXMgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl eCBkMTE4MTA4OTUxMmEuLmEyYjRiZTA2ZWI4NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtMzMwMCwxNyArMzMwMCwxMiBAQCBzdGF0aWMgYm9vbCBpbnRlbF9jcnRjX2hh c19wZW5kaW5nX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKGNydGMpOwogCXVuc2lnbmVkIHJlc2V0X2NvdW50ZXI7Ci0JYm9vbCBwZW5kaW5n OwogCiAJcmVzZXRfY291bnRlciA9IGk5MTVfcmVzZXRfY291bnRlcigmdG9faTkxNShkZXYpLT5n cHVfZXJyb3IpOwogCWlmIChpbnRlbF9jcnRjLT5yZXNldF9jb3VudGVyICE9IHJlc2V0X2NvdW50 ZXIpCiAJCXJldHVybiBmYWxzZTsKIAotCXNwaW5fbG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7 Ci0JcGVuZGluZyA9IHRvX2ludGVsX2NydGMoY3J0YyktPmZsaXBfd29yayAhPSBOVUxMOwotCXNw aW5fdW5sb2NrX2lycSgmZGV2LT5ldmVudF9sb2NrKTsKLQotCXJldHVybiBwZW5kaW5nOworCXJl dHVybiAhbGlzdF9lbXB0eV9jYXJlZnVsKCZ0b19pbnRlbF9jcnRjKGNydGMpLT5mbGlwX3dvcmsp OwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfcGlwZV9jb25maWcoc3RydWN0IGludGVs X2NydGMgKmNydGMsCkBAIC0zODg2LDcgKzM4ODEsNyBAQCBib29sIGludGVsX2hhc19wZW5kaW5n X2ZiX3VucGluKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWlmIChhdG9taWNfcmVhZCgmY3J0 Yy0+dW5waW5fd29ya19jb3VudCkgPT0gMCkKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChjcnRjLT5m bGlwX3dvcmspCisJCWlmICghbGlzdF9lbXB0eV9jYXJlZnVsKCZjcnRjLT5mbGlwX3dvcmspKQog CQkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgY3J0Yy0+cGlwZSk7CiAKIAkJcmV0dXJuIHRy dWU7CkBAIC0zODk1LDEyICszODkwLDExIEBAIGJvb2wgaW50ZWxfaGFzX3BlbmRpbmdfZmJfdW5w aW4oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyB2 b2lkIHBhZ2VfZmxpcF9jb21wbGV0ZWQoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpCitz dGF0aWMgdm9pZCBwYWdlX2ZsaXBfY29tcGxldGVkKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j cnRjLCBzdHJ1Y3QgaW50ZWxfZmxpcF93b3JrICp3b3JrKQogewogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfY3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVj dCBpbnRlbF9mbGlwX3dvcmsgKndvcmsgPSBpbnRlbF9jcnRjLT5mbGlwX3dvcms7CiAKLQlpbnRl bF9jcnRjLT5mbGlwX3dvcmsgPSBOVUxMOworCWxpc3RfZGVsX2luaXQoJndvcmstPmhlYWQpOwog CiAJaWYgKHdvcmstPmV2ZW50KQogCQlkcm1fY3J0Y19zZW5kX3ZibGFua19ldmVudCgmaW50ZWxf Y3J0Yy0+YmFzZSwgd29yay0+ZXZlbnQpOwpAQCAtMzkzNSwxMCArMzkyOSwxMSBAQCBzdGF0aWMg aW50IGludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpCiAJCXN0cnVjdCBpbnRlbF9mbGlwX3dvcmsgKndvcms7CiAKIAkJc3Bpbl9sb2NrX2lycSgm ZGV2LT5ldmVudF9sb2NrKTsKLQkJd29yayA9IGludGVsX2NydGMtPmZsaXBfd29yazsKKwkJd29y ayA9IGxpc3RfZmlyc3RfZW50cnlfb3JfbnVsbCgmaW50ZWxfY3J0Yy0+ZmxpcF93b3JrLAorCQkJ CQkJc3RydWN0IGludGVsX2ZsaXBfd29yaywgaGVhZCk7CiAJCWlmICh3b3JrICYmICFpc19tbWlv X3dvcmsod29yaykpIHsKIAkJCVdBUk5fT05DRSgxLCAiUmVtb3Zpbmcgc3R1Y2sgcGFnZSBmbGlw XG4iKTsKLQkJCXBhZ2VfZmxpcF9jb21wbGV0ZWQoaW50ZWxfY3J0Yyk7CisJCQlwYWdlX2ZsaXBf Y29tcGxldGVkKGludGVsX2NydGMsIHdvcmspOwogCQl9CiAJCXNwaW5fdW5sb2NrX2lycSgmZGV2 LT5ldmVudF9sb2NrKTsKIAl9CkBAIC02MzM1LDcgKzYzMzAsNyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9jcnRjX2Rpc2FibGVfbm9hdG9taWMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQlyZXR1cm47 CiAKIAlpZiAodG9faW50ZWxfcGxhbmVfc3RhdGUoY3J0Yy0+cHJpbWFyeS0+c3RhdGUpLT52aXNp YmxlKSB7Ci0JCVdBUk5fT04oaW50ZWxfY3J0Yy0+ZmxpcF93b3JrKTsKKwkJV0FSTl9PTihsaXN0 X2VtcHR5KCZpbnRlbF9jcnRjLT5mbGlwX3dvcmspKTsKIAogCQlpbnRlbF9wcmVfZGlzYWJsZV9w cmltYXJ5X25vYXRvbWljKGNydGMpOwogCkBAIC0xMDkyNCwxNyArMTA5MTksMjQgQEAgc3RhdGlj IHZvaWQgaW50ZWxfY3J0Y19kZXN0cm95KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgaW50ZWxfZmxpcF93b3JrICp3b3Jr OworCXN0cnVjdCBsaXN0X2hlYWQgaGVhZDsKKworCUlOSVRfTElTVF9IRUFEKCZoZWFkKTsKIAog CXNwaW5fbG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7Ci0Jd29yayA9IGludGVsX2NydGMtPmZs aXBfd29yazsKLQlpbnRlbF9jcnRjLT5mbGlwX3dvcmsgPSBOVUxMOwotCXNwaW5fdW5sb2NrX2ly cSgmZGV2LT5ldmVudF9sb2NrKTsKKwl3aGlsZSAoIWxpc3RfZW1wdHkoJmludGVsX2NydGMtPmZs aXBfd29yaykpIHsKKwkJd29yayA9IGxpc3RfZmlyc3RfZW50cnkoJmludGVsX2NydGMtPmZsaXBf d29yaywKKwkJCQkJc3RydWN0IGludGVsX2ZsaXBfd29yaywgaGVhZCk7CisJCWxpc3RfZGVsX2lu aXQoJndvcmstPmhlYWQpOworCQlzcGluX3VubG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7CiAK LQlpZiAod29yaykgewogCQljYW5jZWxfd29ya19zeW5jKCZ3b3JrLT5tbWlvX3dvcmspOwogCQlj YW5jZWxfd29ya19zeW5jKCZ3b3JrLT51bnBpbl93b3JrKTsKIAkJa2ZyZWUod29yayk7CisKKwkJ c3Bpbl9sb2NrX2lycSgmZGV2LT5ldmVudF9sb2NrKTsKIAl9CisJc3Bpbl91bmxvY2tfaXJxKCZk ZXYtPmV2ZW50X2xvY2spOwogCiAJZHJtX2NydGNfY2xlYW51cChjcnRjKTsKIApAQCAtMTA5NzYs NyArMTA5NzgsOCBAQCBzdGF0aWMgYm9vbCBnNHhfZmxpcF9jb3VudF9hZnRlcl9lcSh1MzIgYSwg dTMyIGIpCiAJcmV0dXJuICEoKGEgLSBiKSAmIDB4ODAwMDAwMDApOwogfQogCi1zdGF0aWMgYm9v bCBwYWdlX2ZsaXBfZmluaXNoZWQoc3RydWN0IGludGVsX2NydGMgKmNydGMpCitzdGF0aWMgYm9v bCBwYWdlX2ZsaXBfZmluaXNoZWQoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICAgICAg c3RydWN0IGludGVsX2ZsaXBfd29yayAqd29yaykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTExMDIxLDkgKzExMDI0LDkgQEAgc3RhdGljIGJvb2wgcGFn ZV9mbGlwX2ZpbmlzaGVkKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCSAqIGFueXdheSwgd2Ug ZG9uJ3QgcmVhbGx5IGNhcmUuCiAJICovCiAJcmV0dXJuIChJOTE1X1JFQUQoRFNQU1VSRkxJVkUo Y3J0Yy0+cGxhbmUpKSAmIH4weGZmZikgPT0KLQkJY3J0Yy0+ZmxpcF93b3JrLT5ndHRfb2Zmc2V0 ICYmCisJCXdvcmstPmd0dF9vZmZzZXQgJiYKIAkJZzR4X2ZsaXBfY291bnRfYWZ0ZXJfZXEoSTkx NV9SRUFEKFBJUEVfRkxJUENPVU5UX0c0WChjcnRjLT5waXBlKSksCi0JCQkJICAgIGNydGMtPmZs aXBfd29yay0+ZmxpcF9jb3VudCk7CisJCQkJCXdvcmstPmZsaXBfY291bnQpOwogfQogCiBzdGF0 aWMgdm9pZCBkb19pbnRlbF9maW5pc2hfcGFnZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CkBAIC0xMTA0MiwxMiArMTEwNDUsMTQgQEAgc3RhdGljIHZvaWQgZG9faW50ZWxfZmluaXNoX3Bh Z2VfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAqIGxvc3QgcGFnZWZsaXBzKSBzbyBu ZWVkcyB0aGUgZnVsbCBpcnFzYXZlIHNwaW5sb2Nrcy4KIAkgKi8KIAlzcGluX2xvY2tfaXJxc2F2 ZSgmZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7Ci0Jd29yayA9IGludGVsX2NydGMtPmZsaXBfd29y azsKKwl3b3JrID0gbGlzdF9maXJzdF9lbnRyeV9vcl9udWxsKCZpbnRlbF9jcnRjLT5mbGlwX3dv cmssCisJCQkJCXN0cnVjdCBpbnRlbF9mbGlwX3dvcmssCisJCQkJCWhlYWQpOwogCiAJaWYgKHdv cmsgIT0gTlVMTCAmJgogCSAgICBhdG9taWNfcmVhZCgmd29yay0+cGVuZGluZykgPT0gSU5URUxf RkxJUF9QRU5ESU5HICYmCi0JICAgIHBhZ2VfZmxpcF9maW5pc2hlZChpbnRlbF9jcnRjKSkKLQkJ cGFnZV9mbGlwX2NvbXBsZXRlZChpbnRlbF9jcnRjKTsKKwkgICAgcGFnZV9mbGlwX2ZpbmlzaGVk KGludGVsX2NydGMsIHdvcmspKQorCQlwYWdlX2ZsaXBfY29tcGxldGVkKGludGVsX2NydGMsIHdv cmspOwogCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7 CiB9CkBAIC0xMTA4Myw3ICsxMTA4OCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuMl9xdWV1ZV9m bGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIg KmZiLAogCQkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJCSBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKLQkJCQkgdWludDMyX3QgZmxhZ3MpCisJCQkJIHVp bnQ2NF90IGd0dF9vZmZzZXQpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0g cmVxLT5lbmdpbmU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGMpOwpAQCAtMTExMDYsNyArMTExMTEsNyBAQCBzdGF0aWMgaW50IGludGVsX2dlbjJf cXVldWVfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWludGVsX3JpbmdfZW1pdChlbmdp bmUsIE1JX0RJU1BMQVlfRkxJUCB8CiAJCQlNSV9ESVNQTEFZX0ZMSVBfUExBTkUoaW50ZWxfY3J0 Yy0+cGxhbmUpKTsKIAlpbnRlbF9yaW5nX2VtaXQoZW5naW5lLCBmYi0+cGl0Y2hlc1swXSk7Ci0J aW50ZWxfcmluZ19lbWl0KGVuZ2luZSwgaW50ZWxfY3J0Yy0+ZmxpcF93b3JrLT5ndHRfb2Zmc2V0 KTsKKwlpbnRlbF9yaW5nX2VtaXQoZW5naW5lLCBndHRfb2Zmc2V0KTsKIAlpbnRlbF9yaW5nX2Vt aXQoZW5naW5lLCAwKTsgLyogYXV4IGRpc3BsYXkgYmFzZSBhZGRyZXNzLCB1bnVzZWQgKi8KIAog CXJldHVybiAwOwpAQCAtMTExMTcsNyArMTExMjIsNyBAQCBzdGF0aWMgaW50IGludGVsX2dlbjNf cXVldWVfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSBzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwKIAkJCQkgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQkg c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCi0JCQkJIHVpbnQzMl90IGZsYWdzKQor CQkJCSB1aW50NjRfdCBndHRfb2Zmc2V0KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSA9IHJlcS0+ZW5naW5lOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKQEAgLTExMTM3LDcgKzExMTQyLDcgQEAgc3RhdGljIGludCBpbnRl bF9nZW4zX3F1ZXVlX2ZsaXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpbnRlbF9yaW5nX2Vt aXQoZW5naW5lLCBNSV9ESVNQTEFZX0ZMSVBfSTkxNSB8CiAJCQlNSV9ESVNQTEFZX0ZMSVBfUExB TkUoaW50ZWxfY3J0Yy0+cGxhbmUpKTsKIAlpbnRlbF9yaW5nX2VtaXQoZW5naW5lLCBmYi0+cGl0 Y2hlc1swXSk7Ci0JaW50ZWxfcmluZ19lbWl0KGVuZ2luZSwgaW50ZWxfY3J0Yy0+ZmxpcF93b3Jr LT5ndHRfb2Zmc2V0KTsKKwlpbnRlbF9yaW5nX2VtaXQoZW5naW5lLCBndHRfb2Zmc2V0KTsKIAlp bnRlbF9yaW5nX2VtaXQoZW5naW5lLCBNSV9OT09QKTsKIAogCXJldHVybiAwOwpAQCAtMTExNDgs NyArMTExNTMsNyBAQCBzdGF0aWMgaW50IGludGVsX2dlbjRfcXVldWVfZmxpcChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQkJCSBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAkJCQkgc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQkgc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEsCi0JCQkJIHVpbnQzMl90IGZsYWdzKQorCQkJCSB1aW50NjRfdCBndHRfb2Zm c2V0KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJlcS0+ZW5naW5lOwog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBA IC0xMTE2Nyw4ICsxMTE3Miw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuNF9xdWV1ZV9mbGlwKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50ZWxfcmluZ19lbWl0KGVuZ2luZSwgTUlfRElTUExB WV9GTElQIHwKIAkJCU1JX0RJU1BMQVlfRkxJUF9QTEFORShpbnRlbF9jcnRjLT5wbGFuZSkpOwog CWludGVsX3JpbmdfZW1pdChlbmdpbmUsIGZiLT5waXRjaGVzWzBdKTsKLQlpbnRlbF9yaW5nX2Vt aXQoZW5naW5lLCBpbnRlbF9jcnRjLT5mbGlwX3dvcmstPmd0dF9vZmZzZXQgfAotCQkJb2JqLT50 aWxpbmdfbW9kZSk7CisJaW50ZWxfcmluZ19lbWl0KGVuZ2luZSwgZ3R0X29mZnNldCB8IG9iai0+ dGlsaW5nX21vZGUpOwogCiAJLyogWFhYIEVuYWJsaW5nIHRoZSBwYW5lbC1maXR0ZXIgYWNyb3Nz IHBhZ2UtZmxpcCBpcyBzbyBmYXIKIAkgKiB1bnRlc3RlZCBvbiBub24tbmF0aXZlIG1vZGVzLCBz byBpZ25vcmUgaXQgZm9yIG5vdy4KQEAgLTExMTg2LDcgKzExMTkwLDcgQEAgc3RhdGljIGludCBp bnRlbF9nZW42X3F1ZXVlX2ZsaXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgc3RydWN0 IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJCQkJIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv YmosCiAJCQkJIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAotCQkJCSB1aW50MzJf dCBmbGFncykKKwkJCQkgdWludDY0X3QgZ3R0X29mZnNldCkKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUgPSByZXEtPmVuZ2luZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtMTEyMDEsNyArMTEyMDUsNyBAQCBzdGF0 aWMgaW50IGludGVsX2dlbjZfcXVldWVfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlu dGVsX3JpbmdfZW1pdChlbmdpbmUsIE1JX0RJU1BMQVlfRkxJUCB8CiAJCQlNSV9ESVNQTEFZX0ZM SVBfUExBTkUoaW50ZWxfY3J0Yy0+cGxhbmUpKTsKIAlpbnRlbF9yaW5nX2VtaXQoZW5naW5lLCBm Yi0+cGl0Y2hlc1swXSB8IG9iai0+dGlsaW5nX21vZGUpOwotCWludGVsX3JpbmdfZW1pdChlbmdp bmUsIGludGVsX2NydGMtPmZsaXBfd29yay0+Z3R0X29mZnNldCk7CisJaW50ZWxfcmluZ19lbWl0 KGVuZ2luZSwgZ3R0X29mZnNldCk7CiAKIAkvKiBDb250cmFyeSB0byB0aGUgc3VnZ2VzdGlvbnMg aW4gdGhlIGRvY3VtZW50YXRpb24sCiAJICogIkVuYWJsZSBQYW5lbCBGaXR0ZXIiIGRvZXMgbm90 IHNlZW0gdG8gYmUgcmVxdWlyZWQgd2hlbiBwYWdlCkBAIC0xMTIyMSw3ICsxMTIyNSw3IEBAIHN0 YXRpYyBpbnQgaW50ZWxfZ2VuN19xdWV1ZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CQkJIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogCQkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqLAogCQkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKLQkJ CQkgdWludDMyX3QgZmxhZ3MpCisJCQkJIHVpbnQ2NF90IGd0dF9vZmZzZXQpCiB7CiAJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxLT5lbmdpbmU7CiAJc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwpAQCAtMTEzMDQsNyArMTEzMDgs NyBAQCBzdGF0aWMgaW50IGludGVsX2dlbjdfcXVldWVfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCiAJaW50ZWxfcmluZ19lbWl0KGVuZ2luZSwgTUlfRElTUExBWV9GTElQX0k5MTUgfCBw bGFuZV9iaXQpOwogCWludGVsX3JpbmdfZW1pdChlbmdpbmUsIChmYi0+cGl0Y2hlc1swXSB8IG9i ai0+dGlsaW5nX21vZGUpKTsKLQlpbnRlbF9yaW5nX2VtaXQoZW5naW5lLCBpbnRlbF9jcnRjLT5m bGlwX3dvcmstPmd0dF9vZmZzZXQpOworCWludGVsX3JpbmdfZW1pdChlbmdpbmUsIGd0dF9vZmZz ZXQpOwogCWludGVsX3JpbmdfZW1pdChlbmdpbmUsIChNSV9OT09QKSk7CiAKIAlyZXR1cm4gMDsK QEAgLTExMzcxLDE3ICsxMTM3NSwxNyBAQCBzdGF0aWMgaW50IGludGVsX2RlZmF1bHRfcXVldWVf ZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiwKIAkJCQkgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQkg ICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCi0JCQkJICAgIHVpbnQzMl90IGZs YWdzKQorCQkJCSAgICB1aW50NjRfdCBndHRfb2Zmc2V0KQogewogCXJldHVybiAtRU5PREVWOwog fQogCiBzdGF0aWMgYm9vbCBfX2ludGVsX3BhZ2VmbGlwX3N0YWxsX2NoZWNrKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCi0JCQkJCSBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCisJCQkJCSBzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCisJCQkJCSBzdHJ1Y3QgaW50ZWxfZmxpcF93b3JrICp3b3JrKQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJ c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwotCXN0 cnVjdCBpbnRlbF9mbGlwX3dvcmsgKndvcmsgPSBpbnRlbF9jcnRjLT5mbGlwX3dvcms7CiAJdTMy IGFkZHIsIHZibGFuazsKIAl1MzIgcGVuZGluZzsKIApAQCAtMTE0MzcsMTIgKzExNDQxLDE0IEBA IHZvaWQgaW50ZWxfY2hlY2tfcGFnZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBw aXBlKQogCQlyZXR1cm47CiAKIAlzcGluX2xvY2soJmRldi0+ZXZlbnRfbG9jayk7Ci0Jd29yayA9 IGludGVsX2NydGMtPmZsaXBfd29yazsKLQlpZiAod29yayAhPSBOVUxMICYmIF9faW50ZWxfcGFn ZWZsaXBfc3RhbGxfY2hlY2soZGV2LCBjcnRjKSkgeworCXdvcmsgPSBsaXN0X2ZpcnN0X2VudHJ5 X29yX251bGwoJmludGVsX2NydGMtPmZsaXBfd29yaywKKwkJCQkJc3RydWN0IGludGVsX2ZsaXBf d29yaywgaGVhZCk7CisKKwlpZiAod29yayAhPSBOVUxMICYmIF9faW50ZWxfcGFnZWZsaXBfc3Rh bGxfY2hlY2soZGV2LCBjcnRjLCB3b3JrKSkgewogCQlXQVJOX09OQ0UoIWlzX21taW9fd29yayh3 b3JrKSwKIAkJCSAgIktpY2tpbmcgc3R1Y2sgcGFnZSBmbGlwOiBxdWV1ZWQgYXQgJWQsIG5vdyAl ZFxuIiwKIAkJCSB3b3JrLT5mbGlwX3F1ZXVlZF92YmxhbmssIGludGVsX2NydGNfZ2V0X3ZibGFu a19jb3VudGVyKGludGVsX2NydGMpKTsKLQkJcGFnZV9mbGlwX2NvbXBsZXRlZChpbnRlbF9jcnRj KTsKKwkJcGFnZV9mbGlwX2NvbXBsZXRlZChpbnRlbF9jcnRjLCB3b3JrKTsKIAkJd29yayA9IE5V TEw7CiAJfQogCWlmICh3b3JrICE9IE5VTEwgJiYgIWlzX21taW9fd29yayh3b3JrKSAmJgpAQCAt MTE1MDgsMTMgKzExNTE0LDE4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCiAJLyogV2UgYm9ycm93IHRoZSBldmVudCBzcGluIGxvY2sg Zm9yIHByb3RlY3RpbmcgZmxpcF93b3JrICovCiAJc3Bpbl9sb2NrX2lycSgmZGV2LT5ldmVudF9s b2NrKTsKLQlpZiAoaW50ZWxfY3J0Yy0+ZmxpcF93b3JrKSB7CisJaWYgKCFsaXN0X2VtcHR5KCZp bnRlbF9jcnRjLT5mbGlwX3dvcmspKSB7CisJCXN0cnVjdCBpbnRlbF9mbGlwX3dvcmsgKm9sZF93 b3JrOworCisJCW9sZF93b3JrID0gbGlzdF9maXJzdF9lbnRyeSgmaW50ZWxfY3J0Yy0+ZmxpcF93 b3JrLAorCQkJCQkgICAgc3RydWN0IGludGVsX2ZsaXBfd29yaywgaGVhZCk7CisKIAkJLyogQmVm b3JlIGRlY2xhcmluZyB0aGUgZmxpcCBxdWV1ZSB3ZWRnZWQsIGNoZWNrIGlmCiAJCSAqIHRoZSBo YXJkd2FyZSBjb21wbGV0ZWQgdGhlIG9wZXJhdGlvbiBiZWhpbmQgb3VyIGJhY2tzLgogCQkgKi8K LQkJaWYgKF9faW50ZWxfcGFnZWZsaXBfc3RhbGxfY2hlY2soZGV2LCBjcnRjKSkgeworCQlpZiAo X19pbnRlbF9wYWdlZmxpcF9zdGFsbF9jaGVjayhkZXYsIGNydGMsIG9sZF93b3JrKSkgewogCQkJ RFJNX0RFQlVHX0RSSVZFUigiZmxpcCBxdWV1ZTogcHJldmlvdXMgZmxpcCBjb21wbGV0ZWQsIGNv bnRpbnVpbmdcbiIpOwotCQkJcGFnZV9mbGlwX2NvbXBsZXRlZChpbnRlbF9jcnRjKTsKKwkJCXBh Z2VfZmxpcF9jb21wbGV0ZWQoaW50ZWxfY3J0Yywgb2xkX3dvcmspOwogCQl9IGVsc2UgewogCQkJ RFJNX0RFQlVHX0RSSVZFUigiZmxpcCBxdWV1ZTogY3J0YyBhbHJlYWR5IGJ1c3lcbiIpOwogCQkJ c3Bpbl91bmxvY2tfaXJxKCZkZXYtPmV2ZW50X2xvY2spOwpAQCAtMTE1MjQsNyArMTE1MzUsNyBA QCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAkJCXJldHVybiAtRUJVU1k7CiAJCX0KIAl9Ci0JaW50ZWxfY3J0Yy0+ZmxpcF93b3JrID0gd29y azsKKwlsaXN0X2FkZF90YWlsKCZ3b3JrLT5oZWFkLCAmaW50ZWxfY3J0Yy0+ZmxpcF93b3JrKTsK IAlzcGluX3VubG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7CiAKIAlpZiAoYXRvbWljX3JlYWQo JmludGVsX2NydGMtPnVucGluX3dvcmtfY291bnQpID49IDIpCkBAIC0xMTYwNiw3ICsxMTYxNyw3 IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRj LAogCX0gZWxzZSB7CiAJCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZ3b3JrLT5mbGlwX3F1ZXVl ZF9yZXEsIHJlcXVlc3QpOwogCQlyZXQgPSBkZXZfcHJpdi0+ZGlzcGxheS5xdWV1ZV9mbGlwKGRl diwgY3J0YywgZmIsIG9iaiwgcmVxdWVzdCwKLQkJCQkJCSAgIHBhZ2VfZmxpcF9mbGFncyk7CisJ CQkJCQkgICB3b3JrLT5ndHRfb2Zmc2V0KTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gY2xlYW51cF91 bnBpbjsKIApAQCAtMTE2NDEsNyArMTE2NTIsNyBAQCBjbGVhbnVwOgogCWRybV9mcmFtZWJ1ZmZl cl91bnJlZmVyZW5jZSh3b3JrLT5vbGRfZmIpOwogCiAJc3Bpbl9sb2NrX2lycSgmZGV2LT5ldmVu dF9sb2NrKTsKLQlpbnRlbF9jcnRjLT5mbGlwX3dvcmsgPSBOVUxMOworCWxpc3RfZGVsKCZ3b3Jr LT5oZWFkKTsKIAlzcGluX3VubG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7CiAKIAlkcm1fY3J0 Y192YmxhbmtfcHV0KGNydGMpOwpAQCAtMTQyNTMsNiArMTQyNjQsOCBAQCBzdGF0aWMgdm9pZCBp bnRlbF9jcnRjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUpCiAJaW50ZWxf Y3J0Yy0+YmFzZS5zdGF0ZSA9ICZjcnRjX3N0YXRlLT5iYXNlOwogCWNydGNfc3RhdGUtPmJhc2Uu Y3J0YyA9ICZpbnRlbF9jcnRjLT5iYXNlOwogCisJSU5JVF9MSVNUX0hFQUQoJmludGVsX2NydGMt PmZsaXBfd29yayk7CisKIAkvKiBpbml0aWFsaXplIHNoYXJlZCBzY2FsZXJzICovCiAJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuID49IDkpIHsKIAkJaWYgKHBpcGUgPT0gUElQRV9DKQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAppbmRleCBiYzMxMDUxM2FkYjguLjBhMjQ3MmQ2OWFmOCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTYxMSw3ICs2MTEsNyBAQCBzdHJ1Y3QgaW50ZWxfY3J0 YyB7CiAJdW5zaWduZWQgbG9uZyBlbmFibGVkX3Bvd2VyX2RvbWFpbnM7CiAJYm9vbCBsb3dmcmVx X2F2YWlsOwogCXN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5OwotCXN0cnVjdCBpbnRlbF9m bGlwX3dvcmsgKmZsaXBfd29yazsKKwlzdHJ1Y3QgbGlzdF9oZWFkIGZsaXBfd29yazsKIAogCWF0 b21pY190IHVucGluX3dvcmtfY291bnQ7CiAKQEAgLTkzNSw2ICs5MzUsOCBAQCBpbnRlbF9nZXRf Y3J0Y19mb3JfcGxhbmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBsYW5lKQogfQogCiBz dHJ1Y3QgaW50ZWxfZmxpcF93b3JrIHsKKwlzdHJ1Y3QgbGlzdF9oZWFkIGhlYWQ7CisKIAlzdHJ1 Y3Qgd29ya19zdHJ1Y3QgdW5waW5fd29yazsKIAlzdHJ1Y3Qgd29ya19zdHJ1Y3QgbW1pb193b3Jr OwogCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==