From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 14/62] drm/i915: Rename request reference/unreference to get/put Date: Fri, 3 Jun 2016 17:36:39 +0100 Message-ID: <1464971847-15809-15-git-send-email-chris@chris-wilson.co.uk> References: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id D57396EE29 for ; Fri, 3 Jun 2016 16:37:49 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id n184so618379wmn.1 for ; Fri, 03 Jun 2016 09:37:49 -0700 (PDT) In-Reply-To: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk> 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 Tm93IHRoYXQgd2UgZGVyaXZlIHJlcXVlc3RzIGZyb20gc3RydWN0IGZlbmNlLCBzd2FwIG92ZXIg dG8gaXRzCm5vbWVuY2xhdHVyZSBmb3IgcmVmZXJlbmNlcy4gSXQncyBzaG9ydGVyIGFuZCBtb3Jl IGlkaW9tYXRpYyBhY3Jvc3MgdGhlCmtlcm5lbC4KCnMvaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVu Y2UvaTkxNV9nZW1fcmVxdWVzdF9nZXQvCnMvaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZS9p OTE1X2dlbV9yZXF1ZXN0X3B1dC8KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg ICAgICAgICAgfCAxNCArKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fcmVxdWVzdC5jICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1 ZXN0LmggIHwgIDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJw dHIuYyAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5j IHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAgICB8ICA1 ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgIHwgMTAgKysr KystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgICAgICB8ICA1ICsr LS0tCiA4IGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDk1NzgyY2Y4NWRjYy4uNWYyMzJmYjFhMmE0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTExODgsNyArMTE4OCw3IEBAIGk5MTVfZ2VtX29i amVjdF93YWl0X3JlbmRlcmluZ19fbm9uYmxvY2tpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiwKIAkJaWYgKHJlcSA9PSBOVUxMKQogCQkJcmV0dXJuIDA7CiAKLQkJcmVxdWVzdHNb bisrXSA9IGk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHJlcSk7CisJCXJlcXVlc3RzW24rK10g PSBpOTE1X2dlbV9yZXF1ZXN0X2dldChyZXEpOwogCX0gZWxzZSB7CiAJCWZvciAoaSA9IDA7IGkg PCBJOTE1X05VTV9FTkdJTkVTOyBpKyspIHsKIAkJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxOwpAQCAtMTE5Nyw3ICsxMTk3LDcgQEAgaTkxNV9nZW1fb2JqZWN0X3dhaXRfcmVuZGVy aW5nX19ub25ibG9ja2luZyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJaWYg KHJlcSA9PSBOVUxMKQogCQkJCWNvbnRpbnVlOwogCi0JCQlyZXF1ZXN0c1tuKytdID0gaTkxNV9n ZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxKTsKKwkJCXJlcXVlc3RzW24rK10gPSBpOTE1X2dlbV9y ZXF1ZXN0X2dldChyZXEpOwogCQl9CiAJfQogCkBAIC0xMjEwLDcgKzEyMTAsNyBAQCBpOTE1X2dl bV9vYmplY3Rfd2FpdF9yZW5kZXJpbmdfX25vbmJsb2NraW5nKHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmosCiAJZm9yIChpID0gMDsgaSA8IG47IGkrKykgewogCQlpZiAocmV0ID09IDAp CiAJCQlpOTE1X2dlbV9vYmplY3RfcmV0aXJlX3JlcXVlc3Qob2JqLCByZXF1ZXN0c1tpXSk7Ci0J CWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxdWVzdHNbaV0pOworCQlpOTE1X2dlbV9y ZXF1ZXN0X3B1dChyZXF1ZXN0c1tpXSk7CiAJfQogCiAJcmV0dXJuIHJldDsKQEAgLTI1MzIsNyAr MjUzMiw3IEBAIGk5MTVfZ2VtX3dhaXRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9p ZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCQlpZiAob2JqLT5sYXN0X3JlYWRfcmVx W2ldID09IE5VTEwpCiAJCQljb250aW51ZTsKIAotCQlyZXFbbisrXSA9IGk5MTVfZ2VtX3JlcXVl c3RfcmVmZXJlbmNlKG9iai0+bGFzdF9yZWFkX3JlcVtpXSk7CisJCXJlcVtuKytdID0gaTkxNV9n ZW1fcmVxdWVzdF9nZXQob2JqLT5sYXN0X3JlYWRfcmVxW2ldKTsKIAl9CiAKIAltdXRleF91bmxv Y2soJmRldi0+c3RydWN0X211dGV4KTsKQEAgLTI1NDIsNyArMjU0Miw3IEBAIGk5MTVfZ2VtX3dh aXRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9m aWxlICpmaWxlKQogCQkJcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVzdChyZXFbaV0sIHRydWUsCiAJ CQkJCQkgIGFyZ3MtPnRpbWVvdXRfbnMgPiAwID8gJmFyZ3MtPnRpbWVvdXRfbnMgOiBOVUxMLAog CQkJCQkJICB0b19ycHNfY2xpZW50KGZpbGUpKTsKLQkJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVy ZW5jZShyZXFbaV0pOworCQlpOTE1X2dlbV9yZXF1ZXN0X3B1dChyZXFbaV0pOwogCX0KIAlyZXR1 cm4gcmV0OwogCkBAIC0zNTQ4LDE0ICszNTQ4LDE0IEBAIGk5MTVfZ2VtX3JpbmdfdGhyb3R0bGUo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCQl0YXJnZXQg PSByZXF1ZXN0OwogCX0KIAlpZiAodGFyZ2V0KQotCQlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5j ZSh0YXJnZXQpOworCQlpOTE1X2dlbV9yZXF1ZXN0X2dldCh0YXJnZXQpOwogCXNwaW5fdW5sb2Nr KCZmaWxlX3ByaXYtPm1tLmxvY2spOwogCiAJaWYgKHRhcmdldCA9PSBOVUxMKQogCQlyZXR1cm4g MDsKIAogCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QodGFyZ2V0LCB0cnVlLCBOVUxMLCBOVUxM KTsKLQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHRhcmdldCk7CisJaTkxNV9nZW1fcmVx dWVzdF9wdXQodGFyZ2V0KTsKIAogCXJldHVybiByZXQ7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9yZXF1ZXN0LmMKaW5kZXggNTEyYjE1MTUzYWM2Li4yZWNhZjlmYTkzNmEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMKQEAgLTM2NSw3ICszNjUsNyBAQCBz dGF0aWMgdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X3JldGlyZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcXVlc3QpCiAJfQogCiAJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShyZXF1 ZXN0LT5jdHgpOwotCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxdWVzdCk7CisJaTkx NV9nZW1fcmVxdWVzdF9wdXQocmVxdWVzdCk7CiB9CiAKIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9y ZXRpcmVfdXB0byhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaAppbmRleCAyNDhhZWMyYzA5YjcuLmIxYmM5NmM5ZTMx ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaApAQCAtMTczLDEzICsx NzMsMTMgQEAgdG9fcmVxdWVzdChzdHJ1Y3QgZmVuY2UgKmZlbmNlKQogfQogCiBzdGF0aWMgaW5s aW5lIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqCi1pOTE1X2dlbV9yZXF1ZXN0X3JlZmVy ZW5jZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKK2k5MTVfZ2VtX3JlcXVlc3Rf Z2V0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCXJldHVybiB0b19yZXF1 ZXN0KGZlbmNlX2dldCgmcmVxLT5mZW5jZSkpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQKLWk5 MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEpCitpOTE1X2dlbV9yZXF1ZXN0X3B1dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cSkKIHsKIAlmZW5jZV9wdXQoJnJlcS0+ZmVuY2UpOwogfQpAQCAtMTg4LDEwICsxODgsMTAgQEAg c3RhdGljIGlubGluZSB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqKnBkc3QsCiAJCQkJCSAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqc3JjKQogewogCWlmIChzcmMpCi0JCWk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHNyYyk7 CisJCWk5MTVfZ2VtX3JlcXVlc3RfZ2V0KHNyYyk7CiAKIAlpZiAoKnBkc3QpCi0JCWk5MTVfZ2Vt X3JlcXVlc3RfdW5yZWZlcmVuY2UoKnBkc3QpOworCQlpOTE1X2dlbV9yZXF1ZXN0X3B1dCgqcGRz dCk7CiAKIAkqcGRzdCA9IHNyYzsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3VzZXJwdHIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJw dHIuYwppbmRleCAyMzE0Yzg4MzIzZTMuLmJhMTZlMDQ0ZmFjNiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdXNlcnB0ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3VzZXJwdHIuYwpAQCAtNzgsNyArNzgsNyBAQCBzdGF0aWMgdm9pZCB3YWl0 X3JlbmRlcmluZyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCQlpZiAocmVxID09 IE5VTEwpCiAJCQljb250aW51ZTsKIAotCQlyZXF1ZXN0c1tuKytdID0gaTkxNV9nZW1fcmVxdWVz dF9yZWZlcmVuY2UocmVxKTsKKwkJcmVxdWVzdHNbbisrXSA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0 KHJlcSk7CiAJfQogCiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CkBAIC04OSw3 ICs4OSw3IEBAIHN0YXRpYyB2b2lkIHdhaXRfcmVuZGVyaW5nKHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmopCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCiAJZm9yIChp ID0gMDsgaSA8IG47IGkrKykKLQkJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShyZXF1ZXN0 c1tpXSk7CisJCWk5MTVfZ2VtX3JlcXVlc3RfcHV0KHJlcXVlc3RzW2ldKTsKIH0KIAogc3RhdGlj IHZvaWQgY2FuY2VsX3VzZXJwdHIoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYnJlYWRjcnVtYnMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2JyZWFkY3J1bWJzLmMKaW5kZXggMDVmNjJmNzA2ODk3Li4xZDYwMTQ5 ODMzZTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2JyZWFkY3J1bWJz LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYnJlYWRjcnVtYnMuYwpAQCAtNDEz LDcgKzQxMyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYnJlYWRjcnVtYnNfc2lnbmFsZXIodm9pZCAq YXJnKQogCQkJcmJfZXJhc2UoJnJlcXVlc3QtPnNpZ25hbGluZy5ub2RlLCAmYi0+c2lnbmFscyk7 CiAJCQlzcGluX3VubG9jaygmYi0+bG9jayk7CiAKLQkJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZl cmVuY2UocmVxdWVzdCk7CisJCQlpOTE1X2dlbV9yZXF1ZXN0X3B1dChyZXF1ZXN0KTsKIAkJfSBl bHNlIHsKIAkJCWlmIChrdGhyZWFkX3Nob3VsZF9zdG9wKCkpCiAJCQkJYnJlYWs7CkBAIC00NDYs NyArNDQ2LDcgQEAgaW50IGludGVsX2VuZ2luZV9lbmFibGVfc2lnbmFsaW5nKHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAogCXJlcXVlc3QtPnNpZ25hbGluZy53YWl0LnRh c2sgPSBiLT5zaWduYWxlcjsKIAlyZXF1ZXN0LT5zaWduYWxpbmcud2FpdC5zZXFubyA9IHJlcXVl c3QtPmZlbmNlLnNlcW5vOwotCWk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHJlcXVlc3QpOwor CWk5MTVfZ2VtX3JlcXVlc3RfZ2V0KHJlcXVlc3QpOwogCiAJLyogRmlyc3QgYWRkIG91cnNlbHZl cyBpbnRvIHRoZSBsaXN0IG9mIHdhaXRlcnMsIGJ1dCByZWdpc3RlciBvdXIKIAkgKiBib3R0b20t aGFsZiBhcyB0aGUgc2lnbmFsbGVyIHRocmVhZC4gQXMgcGVyIHVzdWFsLCBvbmx5IHRoZSBvbGRl c3QKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAxNGU0MWZkZDgxMTIuLjli MjU3MTI2ZmEyMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTEwMDUs MTEgKzExMDA1LDEwIEBAIHN0YXRpYyB2b2lkIGludGVsX3VucGluX3dvcmtfZm4oc3RydWN0IHdv cmtfc3RydWN0ICpfX3dvcmspCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWlu dGVsX3VucGluX2ZiX29iaih3b3JrLT5vbGRfZmIsIHByaW1hcnktPnN0YXRlLT5yb3RhdGlvbik7 CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJndvcmstPnBlbmRpbmdfZmxpcF9vYmotPmJh c2UpOwotCi0JaWYgKHdvcmstPmZsaXBfcXVldWVkX3JlcSkKLQkJaTkxNV9nZW1fcmVxdWVzdF9h c3NpZ24oJndvcmstPmZsaXBfcXVldWVkX3JlcSwgTlVMTCk7CiAJbXV0ZXhfdW5sb2NrKCZkZXYt PnN0cnVjdF9tdXRleCk7CiAKKwlpOTE1X2dlbV9yZXF1ZXN0X3B1dCh3b3JrLT5mbGlwX3F1ZXVl ZF9yZXEpOworCiAJaW50ZWxfZnJvbnRidWZmZXJfZmxpcF9jb21wbGV0ZShkZXYsIHRvX2ludGVs X3BsYW5lKHByaW1hcnkpLT5mcm9udGJ1ZmZlcl9iaXQpOwogCWludGVsX2ZiY19wb3N0X3VwZGF0 ZShjcnRjKTsKIAlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2Uod29yay0+b2xkX2ZiKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggYzdhOWViZGIwODExLi5hMjUxNzcwMTZmYjMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC00MzgsNyArNDM4LDcgQEAgc3RhdGljIHZvaWQg ZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CiAJCQkgKiB3aWxsIHVwZGF0ZSB0YWlsIHBhc3QgZmlyc3QgcmVxdWVzdCdzIHdvcmtsb2FkICov CiAJCQljdXJzb3ItPmVsc3Bfc3VibWl0dGVkID0gcmVxMC0+ZWxzcF9zdWJtaXR0ZWQ7CiAJCQls aXN0X2RlbCgmcmVxMC0+ZXhlY2xpc3RfbGluayk7Ci0JCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVm ZXJlbmNlKHJlcTApOworCQkJaTkxNV9nZW1fcmVxdWVzdF9wdXQocmVxMCk7CiAJCQlyZXEwID0g Y3Vyc29yOwogCQl9IGVsc2UgewogCQkJcmVxMSA9IGN1cnNvcjsKQEAgLTQ4OSw3ICs0ODksNyBA QCBleGVjbGlzdHNfY2hlY2tfcmVtb3ZlX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lLCB1MzIgY3R4X2lkKQogCQlyZXR1cm4gMDsKIAogCWxpc3RfZGVsKCZoZWFkX3JlcS0+ ZXhlY2xpc3RfbGluayk7Ci0JaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShoZWFkX3JlcSk7 CisJaTkxNV9nZW1fcmVxdWVzdF9wdXQoaGVhZF9yZXEpOwogCiAJcmV0dXJuIDE7CiB9CkBAIC02 MTAsMTEgKzYxMCwxMSBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF9xdWV1ZShzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJCQlXQVJOKHRhaWxfcmVxLT5lbHNw X3N1Ym1pdHRlZCAhPSAwLAogCQkJCSJNb3JlIHRoYW4gMiBhbHJlYWR5LXN1Ym1pdHRlZCByZXFz IHF1ZXVlZFxuIik7CiAJCQlsaXN0X2RlbCgmdGFpbF9yZXEtPmV4ZWNsaXN0X2xpbmspOwotCQkJ aTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZSh0YWlsX3JlcSk7CisJCQlpOTE1X2dlbV9yZXF1 ZXN0X3B1dCh0YWlsX3JlcSk7CiAJCX0KIAl9CiAKLQlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5j ZShyZXF1ZXN0KTsKKwlpOTE1X2dlbV9yZXF1ZXN0X2dldChyZXF1ZXN0KTsKIAlsaXN0X2FkZF90 YWlsKCZyZXF1ZXN0LT5leGVjbGlzdF9saW5rLCAmZW5naW5lLT5leGVjbGlzdF9xdWV1ZSk7CiAJ cmVxdWVzdC0+Y3R4X2h3X2lkID0gcmVxdWVzdC0+Y3R4LT5od19pZDsKIAlpZiAobnVtX2VsZW1l bnRzID09IDApCkBAIC04ODgsNyArODg4LDcgQEAgdm9pZCBpbnRlbF9leGVjbGlzdHNfY2FuY2Vs X3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCWxpc3RfZm9yX2Vh Y2hfZW50cnlfc2FmZShyZXEsIHRtcCwgJmNhbmNlbF9saXN0LCBleGVjbGlzdF9saW5rKSB7CiAJ CWxpc3RfZGVsKCZyZXEtPmV4ZWNsaXN0X2xpbmspOwotCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVm ZXJlbmNlKHJlcSk7CisJCWk5MTVfZ2VtX3JlcXVlc3RfcHV0KHJlcSk7CiAJfQogfQogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYwppbmRleCA5MjNlYzY4ODRhNWUuLmVlMjQ3MDYzYzFiMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCkBAIC03Njk2LDcgKzc2OTYsNyBAQCBzdGF0aWMgdm9pZCBfX2lu dGVsX3Jwc19ib29zdF93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAlpZiAoIWk5MTVf Z2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcSkpCiAJCWdlbjZfcnBzX2Jvb3N0KHJlcS0+aTkxNSwg TlVMTCwgcmVxLT5lbWl0dGVkX2ppZmZpZXMpOwogCi0JaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVy ZW5jZShyZXEpOworCWk5MTVfZ2VtX3JlcXVlc3RfcHV0KHJlcSk7CiAJa2ZyZWUoYm9vc3QpOwog fQogCkBAIC03NzE0LDggKzc3MTQsNyBAQCB2b2lkIGludGVsX3F1ZXVlX3Jwc19ib29zdF9mb3Jf cmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAoYm9vc3QgPT0g TlVMTCkKIAkJcmV0dXJuOwogCi0JaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxKTsKLQli b29zdC0+cmVxID0gcmVxOworCWJvb3N0LT5yZXEgPSBpOTE1X2dlbV9yZXF1ZXN0X2dldChyZXEp OwogCiAJSU5JVF9XT1JLKCZib29zdC0+d29yaywgX19pbnRlbF9ycHNfYm9vc3Rfd29yayk7CiAJ cXVldWVfd29yayhyZXEtPmk5MTUtPndxLCAmYm9vc3QtPndvcmspOwotLSAKMi44LjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=