From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 88BC46E1B3 for ; Mon, 14 Oct 2019 12:09:33 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id i76so10021944pgc.0 for ; Mon, 14 Oct 2019 05:09:33 -0700 (PDT) From: Juha-Pekka Heikkila Date: Mon, 14 Oct 2019 15:09:05 +0300 Message-Id: <1571054945-5439-2-git-send-email-juhapekka.heikkila@gmail.com> In-Reply-To: <1571054945-5439-1-git-send-email-juhapekka.heikkila@gmail.com> References: <1571054945-5439-1-git-send-email-juhapekka.heikkila@gmail.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] RFC: gem: fix compiler warnings List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: tvrtko.ursulin@intel.com List-ID: Rml4ICJ3YXJuaW5nOiBkZWNsYXJhdGlvbiBvZiDigJhlX1/igJkgc2hhZG93cyBhIHByZXZpb3Vz IGxvY2FsIgpjb21wbGFpbnRzIGZyb20gZ2NjLiBUaGVyZSBhcmUgY2hhbmdlcyBpbiBib3RoIGxp Yi8gYW5kIHRlc3RzLwppbiB0aGlzIHBhdGNoIGFzIGNoYW5naW5nIG9ubHkgb25lIHdpbGwgY3Jl YXRlIGJ1aWxkIGJyZWFrYWdlIHBvaW50LgoKU2lnbmVkLW9mZi1ieTogSnVoYS1QZWtrYSBIZWlr a2lsYSA8anVoYXBla2thLmhlaWtraWxhQGdtYWlsLmNvbT4KLS0tCiBsaWIvaWd0X2d0LmggICAg ICAgICAgICAgICAgICAgfCAxNiArKysrKysrKy0tLS0tLS0tCiB0ZXN0cy9pOTE1L2dlbV9laW8u YyAgICAgICAgICAgfCAgNiArKystLS0KIHRlc3RzL2k5MTUvZ2VtX2V4ZWNfbGF0ZW5jeS5jICB8 ICA0ICsrLS0KIHRlc3RzL2k5MTUvZ2VtX2V4ZWNfbm9wLmMgICAgICB8ICA4ICsrKystLS0tCiB0 ZXN0cy9pOTE1L2dlbV9leGVjX3NjaGVkdWxlLmMgfCAgNCArKy0tCiB0ZXN0cy9pOTE1L2dlbV9z eW5jLmMgICAgICAgICAgfCAxNiArKysrKysrKy0tLS0tLS0tCiA2IGZpbGVzIGNoYW5nZWQsIDI3 IGluc2VydGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfZ3Qu aCBiL2xpYi9pZ3RfZ3QuaAppbmRleCA3M2I1MDAyLi5kY2FmOTY5IDEwMDY0NAotLS0gYS9saWIv aWd0X2d0LmgKKysrIGIvbGliL2lndF9ndC5oCkBAIC03NSwxNiArNzUsMTYgQEAgZXh0ZXJuIGNv bnN0IHN0cnVjdCBpbnRlbF9leGVjdXRpb25fZW5naW5lIHsKICNkZWZpbmUgZm9yX2lmKGV4cHJf XykgaWYgKCEoZXhwcl9fKSkge30gZWxzZQogCiAjZGVmaW5lIGZvcl9lYWNoX2VuZ2luZShmZF9f LCBmbGFnc19fKSBcCi0JZm9yIChjb25zdCBzdHJ1Y3QgaW50ZWxfZXhlY3V0aW9uX2VuZ2luZSAq ZV9fID0gaW50ZWxfZXhlY3V0aW9uX2VuZ2luZXM7XAotCSAgICAgZV9fLT5uYW1lOyBcCi0JICAg ICBlX18rKykgXAotCQlmb3JfaWYgKGdlbV9oYXNfcmluZyhmZF9fLCBmbGFnc19fID0gZV9fLT5l eGVjX2lkIHwgZV9fLT5mbGFncykpCisJZm9yIChjb25zdCBzdHJ1Y3QgaW50ZWxfZXhlY3V0aW9u X2VuZ2luZSAqZV9fICMjIGZsYWdzX18gPSBpbnRlbF9leGVjdXRpb25fZW5naW5lcztcCisJICAg ICBlX18gIyMgZmxhZ3NfXy0+bmFtZTsgXAorCSAgICAgZV9fICMjIGZsYWdzX18rKykgXAorCQlm b3JfaWYgKGdlbV9oYXNfcmluZyhmZF9fLCBmbGFnc19fID0gZV9fICMjIGZsYWdzX18tPmV4ZWNf aWQgfCBlX18gIyMgZmxhZ3NfXy0+ZmxhZ3MpKQogCiAjZGVmaW5lIGZvcl9lYWNoX3BoeXNpY2Fs X2VuZ2luZShmZF9fLCBmbGFnc19fKSBcCi0JZm9yIChjb25zdCBzdHJ1Y3QgaW50ZWxfZXhlY3V0 aW9uX2VuZ2luZSAqZV9fID0gaW50ZWxfZXhlY3V0aW9uX2VuZ2luZXM7XAotCSAgICAgZV9fLT5u YW1lOyBcCi0JICAgICBlX18rKykgXAotCQlmb3JfaWYgKGdlbV9yaW5nX2hhc19waHlzaWNhbF9l bmdpbmUoZmRfXywgZmxhZ3NfXyA9IGVfXy0+ZXhlY19pZCB8IGVfXy0+ZmxhZ3MpKQorCWZvciAo Y29uc3Qgc3RydWN0IGludGVsX2V4ZWN1dGlvbl9lbmdpbmUgKmVfXyAjIyBmbGFnc19fID0gaW50 ZWxfZXhlY3V0aW9uX2VuZ2luZXM7XAorCSAgICAgZV9fICMjIGZsYWdzX18tPm5hbWU7IFwKKwkg ICAgIGVfXyAjIyBmbGFnc19fKyspIFwKKwkJZm9yX2lmIChnZW1fcmluZ19oYXNfcGh5c2ljYWxf ZW5naW5lKGZkX18sIGZsYWdzX18gPSBlX18gIyMgZmxhZ3NfXy0+ZXhlY19pZCB8IGVfXyAjIyBm bGFnc19fLT5mbGFncykpCiAKIGJvb2wgZ2VtX3JpbmdfaXNfcGh5c2ljYWxfZW5naW5lKGludCBm ZCwgdW5zaWduZWQgaW50IHJpbmcpOwogYm9vbCBnZW1fcmluZ19oYXNfcGh5c2ljYWxfZW5naW5l KGludCBmZCwgdW5zaWduZWQgaW50IHJpbmcpOwpkaWZmIC0tZ2l0IGEvdGVzdHMvaTkxNS9nZW1f ZWlvLmMgYi90ZXN0cy9pOTE1L2dlbV9laW8uYwppbmRleCA4OTJmMzY1Li4xZjk1YmI5IDEwMDY0 NAotLS0gYS90ZXN0cy9pOTE1L2dlbV9laW8uYworKysgYi90ZXN0cy9pOTE1L2dlbV9laW8uYwpA QCAtNDU0LDcgKzQ1NCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfaW5mbGlnaHQoaW50IGZkLCB1bnNp Z25lZCBpbnQgd2FpdCkKIAkJZ2VtX3dyaXRlKGZkLCBvYmpbMV0uaGFuZGxlLCAwLCAmYmJlLCBz aXplb2YoYmJlKSk7CiAKIAkJZ2VtX3F1aWVzY2VudF9ncHUoZmQpOwotCQlpZ3RfZGVidWcoIlN0 YXJ0aW5nICVzIG9uIGVuZ2luZSAnJXMnXG4iLCBfX2Z1bmNfXywgZV9fLT5uYW1lKTsKKwkJaWd0 X2RlYnVnKCJTdGFydGluZyAlcyBvbiBlbmdpbmUgJyVzJ1xuIiwgX19mdW5jX18sIGVfX2VuZ2lu ZS0+bmFtZSk7CiAJCWlndF9yZXF1aXJlKGk5MTVfcmVzZXRfY29udHJvbChmYWxzZSkpOwogCiAJ CWhhbmcgPSBzcGluX3N5bmMoZmQsIDAsIGVuZ2luZSk7CkBAIC01ODYsNyArNTg2LDcgQEAgc3Rh dGljIHZvaWQgdGVzdF9pbmZsaWdodF9jb250ZXh0cyhpbnQgZmQsIHVuc2lnbmVkIGludCB3YWl0 KQogCiAJCWdlbV9xdWllc2NlbnRfZ3B1KGZkKTsKIAotCQlpZ3RfZGVidWcoIlN0YXJ0aW5nICVz IG9uIGVuZ2luZSAnJXMnXG4iLCBfX2Z1bmNfXywgZV9fLT5uYW1lKTsKKwkJaWd0X2RlYnVnKCJT dGFydGluZyAlcyBvbiBlbmdpbmUgJyVzJ1xuIiwgX19mdW5jX18sIGVfX2VuZ2luZS0+bmFtZSk7 CiAJCWlndF9yZXF1aXJlKGk5MTVfcmVzZXRfY29udHJvbChmYWxzZSkpOwogCiAJCW1lbXNldChv YmosIDAsIHNpemVvZihvYmopKTsKQEAgLTgyNSw3ICs4MjUsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0 X3Jlc2V0X3N0cmVzcyhpbnQgZmQsIHVuc2lnbmVkIGludCBmbGFncykKIAl1bnNpZ25lZCBpbnQg ZW5naW5lOwogCiAJZm9yX2VhY2hfZW5naW5lKGZkLCBlbmdpbmUpCi0JCXJlc2V0X3N0cmVzcyhm ZCwgY3R4MCwgZV9fLT5uYW1lLCBlbmdpbmUsIGZsYWdzKTsKKwkJcmVzZXRfc3RyZXNzKGZkLCBj dHgwLCBlX19lbmdpbmUtPm5hbWUsIGVuZ2luZSwgZmxhZ3MpOwogCiAJZ2VtX2NvbnRleHRfZGVz dHJveShmZCwgY3R4MCk7CiB9CmRpZmYgLS1naXQgYS90ZXN0cy9pOTE1L2dlbV9leGVjX2xhdGVu Y3kuYyBiL3Rlc3RzL2k5MTUvZ2VtX2V4ZWNfbGF0ZW5jeS5jCmluZGV4IDlkZGIzNDguLjBhMTQx M2UgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2k5MTUvZ2VtX2V4ZWNfbGF0ZW5jeS5jCisrKyBiL3Rlc3Rz L2k5MTUvZ2VtX2V4ZWNfbGF0ZW5jeS5jCkBAIC0zOTQsNyArMzk0LDcgQEAgc3RhdGljIHZvaWQg bGF0ZW5jeV9mcm9tX3JpbmcoaW50IGZkLAogCQlpZ3Rfc3Bpbl9mcmVlKGZkLCBzcGluKTsKIAog CQlpZ3RfaW5mbygiJXMtJXMgZGVsYXk6ICUuMmZuc1xuIiwKLQkJCSBuYW1lLCBlX18tPm5hbWUs CisJCQkgbmFtZSwgZV9fb3RoZXItPm5hbWUsCiAJCQkgKHJlc3VsdHNbMipyZXBlYXRzLTFdIC0g cmVzdWx0c1swXSkgLyAoZG91YmxlKXJlcGVhdHMgKiByY3NfY2xvY2spOwogCX0KIApAQCAtNDgw LDcgKzQ4MCw3IEBAIHJ0aG9nX2xhdGVuY3lfb25fcmluZyhpbnQgZmQsIHVuc2lnbmVkIGludCBl bmdpbmUsIGNvbnN0IGNoYXIgKm5hbWUsIHVuc2lnbmVkIGluCiAJCQkJY29udGludWU7CiAKIAkJ CWVuZ2luZXNbbmVuZ2luZV0gPSBlbmdpbmU7Ci0JCQluYW1lc1tuZW5naW5lXSA9IGVfXy0+bmFt ZTsKKwkJCW5hbWVzW25lbmdpbmVdID0gZV9fZW5naW5lLT5uYW1lOwogCQkJbmVuZ2luZSsrOwog CQl9CiAJCWlndF9yZXF1aXJlKG5lbmdpbmUgPiAxKTsKZGlmZiAtLWdpdCBhL3Rlc3RzL2k5MTUv Z2VtX2V4ZWNfbm9wLmMgYi90ZXN0cy9pOTE1L2dlbV9leGVjX25vcC5jCmluZGV4IDg5MjI2ODUu LjY2YzYyMTYgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2k5MTUvZ2VtX2V4ZWNfbm9wLmMKKysrIGIvdGVz dHMvaTkxNS9nZW1fZXhlY19ub3AuYwpAQCAtNDQwLDEyICs0NDAsMTIgQEAgc3RhdGljIHZvaWQg cGFyYWxsZWwoaW50IGZkLCB1aW50MzJfdCBoYW5kbGUsIGludCB0aW1lb3V0KQogCW5lbmdpbmUg PSAwOwogCWZvcl9lYWNoX3BoeXNpY2FsX2VuZ2luZShmZCwgZW5naW5lKSB7CiAJCWVuZ2luZXNb bmVuZ2luZV0gPSBlbmdpbmU7Ci0JCW5hbWVzW25lbmdpbmVdID0gZV9fLT5uYW1lOworCQluYW1l c1tuZW5naW5lXSA9IGVfX2VuZ2luZS0+bmFtZTsKIAkJbmVuZ2luZSsrOwogCiAJCXRpbWUgPSBu b3Bfb25fcmluZyhmZCwgaGFuZGxlLCBlbmdpbmUsIDEsICZjb3VudCkgLyBjb3VudDsKIAkJc3Vt ICs9IHRpbWU7Ci0JCWlndF9kZWJ1ZygiJXM6ICUuM2Z1c1xuIiwgZV9fLT5uYW1lLCAxZTYqdGlt ZSk7CisJCWlndF9kZWJ1ZygiJXM6ICUuM2Z1c1xuIiwgZV9fZW5naW5lLT5uYW1lLCAxZTYqdGlt ZSk7CiAJfQogCWlndF9yZXF1aXJlKG5lbmdpbmUpOwogCWlndF9pbmZvKCJhdmVyYWdlIChpbmRp dmlkdWFsbHkpOiAlLjNmdXNcbiIsIHN1bS9uZW5naW5lKjFlNik7CkBAIC01MDMsNyArNTAzLDcg QEAgc3RhdGljIHZvaWQgc2VyaWVzKGludCBmZCwgdWludDMyX3QgaGFuZGxlLCBpbnQgdGltZW91 dCkKIAlmb3JfZWFjaF9waHlzaWNhbF9lbmdpbmUoZmQsIGVuZ2luZSkgewogCQl0aW1lID0gbm9w X29uX3JpbmcoZmQsIGhhbmRsZSwgZW5naW5lLCAxLCAmY291bnQpIC8gY291bnQ7CiAJCWlmICh0 aW1lID4gbWF4KSB7Ci0JCQluYW1lID0gZV9fLT5uYW1lOworCQkJbmFtZSA9IGVfX2VuZ2luZS0+ bmFtZTsKIAkJCW1heCA9IHRpbWU7CiAJCX0KIAkJaWYgKHRpbWUgPCBtaW4pCkBAIC02MDAsNyAr NjAwLDcgQEAgc3RhdGljIHZvaWQgc2VxdWVudGlhbChpbnQgZmQsIHVpbnQzMl90IGhhbmRsZSwg dW5zaWduZWQgZmxhZ3MsIGludCB0aW1lb3V0KQogCiAJCXRpbWUgPSBub3Bfb25fcmluZyhmZCwg aGFuZGxlLCBuLCAxLCAmY291bnQpIC8gY291bnQ7CiAJCXN1bSArPSB0aW1lOwotCQlpZ3RfZGVi dWcoIiVzOiAlLjNmdXNcbiIsIGVfXy0+bmFtZSwgMWU2KnRpbWUpOworCQlpZ3RfZGVidWcoIiVz OiAlLjNmdXNcbiIsIGVfX24tPm5hbWUsIDFlNip0aW1lKTsKIAogCQllbmdpbmVzW25lbmdpbmUr K10gPSBuOwogCX0KZGlmZiAtLWdpdCBhL3Rlc3RzL2k5MTUvZ2VtX2V4ZWNfc2NoZWR1bGUuYyBi L3Rlc3RzL2k5MTUvZ2VtX2V4ZWNfc2NoZWR1bGUuYwppbmRleCBkZGNiMWYyLi5hMDNkOGRkIDEw MDY0NAotLS0gYS90ZXN0cy9pOTE1L2dlbV9leGVjX3NjaGVkdWxlLmMKKysrIGIvdGVzdHMvaTkx NS9nZW1fZXhlY19zY2hlZHVsZS5jCkBAIC05NTYsNyArOTU2LDcgQEAgc3RhdGljIHZvaWQgcHJl ZW1wdF9vdGhlcihpbnQgZmQsIHVuc2lnbmVkIHJpbmcsIHVuc2lnbmVkIGludCBmbGFncykKIAln ZW1fY29udGV4dF9zZXRfcHJpb3JpdHkoZmQsIGN0eFtISV0sIE1BWF9QUklPKTsKIAogCWZvcl9l YWNoX3BoeXNpY2FsX2VuZ2luZShmZCwgcHJpbWFyeSkgewotCQlpZ3RfZGVidWcoIlByaW1hcnkg ZW5naW5lOiAlc1xuIiwgZV9fLT5uYW1lKTsKKwkJaWd0X2RlYnVnKCJQcmltYXJ5IGVuZ2luZTog JXNcbiIsIGVfX3ByaW1hcnktPm5hbWUpOwogCQlfX3ByZWVtcHRfb3RoZXIoZmQsIGN0eCwgcmlu ZywgcHJpbWFyeSwgZmxhZ3MpOwogCiAJfQpAQCAtMTY1NSw3ICsxNjU1LDcgQEAgc3RhdGljIHZv aWQgbWVhc3VyZV9zZW1hcGhvcmVfcG93ZXIoaW50IGk5MTUpCiAJCXRvdGFsID0gZ3B1X3Bvd2Vy X1coJnBvd2VyLCAmc19zZW1hWzBdLCAmc19zZW1hWzFdKTsKIAogCQlpZ3RfaW5mbygiJXM6ICUu MWZtVyArICUuMWZtVyAodG90YWwgJTEuZm1XKVxuIiwKLQkJCSBlX18tPm5hbWUsCisJCQkgZV9f c2lnbmFsZXItPm5hbWUsCiAJCQkgMWUzICogYmFzZWxpbmUsCiAJCQkgMWUzICogKHRvdGFsIC0g YmFzZWxpbmUpLAogCQkJIDFlMyAqIHRvdGFsKTsKZGlmZiAtLWdpdCBhL3Rlc3RzL2k5MTUvZ2Vt X3N5bmMuYyBiL3Rlc3RzL2k5MTUvZ2VtX3N5bmMuYwppbmRleCA4YzVhYWExLi4xOTIyMjU2IDEw MDY0NAotLS0gYS90ZXN0cy9pOTE1L2dlbV9zeW5jLmMKKysrIGIvdGVzdHMvaTkxNS9nZW1fc3lu Yy5jCkBAIC04Nyw3ICs4Nyw3IEBAIHN5bmNfcmluZyhpbnQgZmQsIHVuc2lnbmVkIHJpbmcsIGlu dCBudW1fY2hpbGRyZW4sIGludCB0aW1lb3V0KQogCiAJaWYgKHJpbmcgPT0gQUxMX0VOR0lORVMp IHsKIAkJZm9yX2VhY2hfcGh5c2ljYWxfZW5naW5lKGZkLCByaW5nKSB7Ci0JCQluYW1lc1tudW1f ZW5naW5lc10gPSBlX18tPm5hbWU7CisJCQluYW1lc1tudW1fZW5naW5lc10gPSBlX19yaW5nLT5u YW1lOwogCQkJZW5naW5lc1tudW1fZW5naW5lcysrXSA9IHJpbmc7CiAJCQlpZiAobnVtX2VuZ2lu ZXMgPT0gQVJSQVlfU0laRShlbmdpbmVzKSkKIAkJCQlicmVhazsKQEAgLTE4OSw3ICsxODksNyBA QCB3YWtldXBfcmluZyhpbnQgZmQsIHVuc2lnbmVkIHJpbmcsIGludCB0aW1lb3V0LCBpbnQgd2xl bikKIAkJCWlmICghZ2VtX2Nhbl9zdG9yZV9kd29yZChmZCwgcmluZykpCiAJCQkJY29udGludWU7 CiAKLQkJCW5hbWVzW251bV9lbmdpbmVzXSA9IGVfXy0+bmFtZTsKKwkJCW5hbWVzW251bV9lbmdp bmVzXSA9IGVfX3JpbmctPm5hbWU7CiAJCQllbmdpbmVzW251bV9lbmdpbmVzKytdID0gcmluZzsK IAkJCWlmIChudW1fZW5naW5lcyA9PSBBUlJBWV9TSVpFKGVuZ2luZXMpKQogCQkJCWJyZWFrOwpA QCAtMzAxLDcgKzMwMSw3IEBAIHN0YXRpYyB2b2lkIGFjdGl2ZV9yaW5nKGludCBmZCwgdW5zaWdu ZWQgcmluZywgaW50IHRpbWVvdXQpCiAJCQlpZiAoIWdlbV9jYW5fc3RvcmVfZHdvcmQoZmQsIHJp bmcpKQogCQkJCWNvbnRpbnVlOwogCi0JCQluYW1lc1tudW1fZW5naW5lc10gPSBlX18tPm5hbWU7 CisJCQluYW1lc1tudW1fZW5naW5lc10gPSBlX19yaW5nLT5uYW1lOwogCQkJZW5naW5lc1tudW1f ZW5naW5lcysrXSA9IHJpbmc7CiAJCQlpZiAobnVtX2VuZ2luZXMgPT0gQVJSQVlfU0laRShlbmdp bmVzKSkKIAkJCQlicmVhazsKQEAgLTM2OCw3ICszNjgsNyBAQCBhY3RpdmVfd2FrZXVwX3Jpbmco aW50IGZkLCB1bnNpZ25lZCByaW5nLCBpbnQgdGltZW91dCwgaW50IHdsZW4pCiAJCQlpZiAoIWdl bV9jYW5fc3RvcmVfZHdvcmQoZmQsIHJpbmcpKQogCQkJCWNvbnRpbnVlOwogCi0JCQluYW1lc1tu dW1fZW5naW5lc10gPSBlX18tPm5hbWU7CisJCQluYW1lc1tudW1fZW5naW5lc10gPSBlX19yaW5n LT5uYW1lOwogCQkJZW5naW5lc1tudW1fZW5naW5lcysrXSA9IHJpbmc7CiAJCQlpZiAobnVtX2Vu Z2luZXMgPT0gQVJSQVlfU0laRShlbmdpbmVzKSkKIAkJCQlicmVhazsKQEAgLTUwMyw3ICs1MDMs NyBAQCBzdG9yZV9yaW5nKGludCBmZCwgdW5zaWduZWQgcmluZywgaW50IG51bV9jaGlsZHJlbiwg aW50IHRpbWVvdXQpCiAJCQlpZiAoIWdlbV9jYW5fc3RvcmVfZHdvcmQoZmQsIHJpbmcpKQogCQkJ CWNvbnRpbnVlOwogCi0JCQluYW1lc1tudW1fZW5naW5lc10gPSBlX18tPm5hbWU7CisJCQluYW1l c1tudW1fZW5naW5lc10gPSBlX19yaW5nLT5uYW1lOwogCQkJZW5naW5lc1tudW1fZW5naW5lcysr XSA9IHJpbmc7CiAJCQlpZiAobnVtX2VuZ2luZXMgPT0gQVJSQVlfU0laRShlbmdpbmVzKSkKIAkJ CQlicmVhazsKQEAgLTYyMCw3ICs2MjAsNyBAQCBzd2l0Y2hfcmluZyhpbnQgZmQsIHVuc2lnbmVk IHJpbmcsIGludCBudW1fY2hpbGRyZW4sIGludCB0aW1lb3V0KQogCQkJaWYgKCFnZW1fY2FuX3N0 b3JlX2R3b3JkKGZkLCByaW5nKSkKIAkJCQljb250aW51ZTsKIAotCQkJbmFtZXNbbnVtX2VuZ2lu ZXNdID0gZV9fLT5uYW1lOworCQkJbmFtZXNbbnVtX2VuZ2luZXNdID0gZV9fcmluZy0+bmFtZTsK IAkJCWVuZ2luZXNbbnVtX2VuZ2luZXMrK10gPSByaW5nOwogCQkJaWYgKG51bV9lbmdpbmVzID09 IEFSUkFZX1NJWkUoZW5naW5lcykpCiAJCQkJYnJlYWs7CkBAIC05NTMsNyArOTUzLDcgQEAgc3Rv cmVfbWFueShpbnQgZmQsIHVuc2lnbmVkIHJpbmcsIGludCB0aW1lb3V0KQogCQkJCQkgICAgIHRp bWVvdXQsCiAJCQkJCSAgICAgJnNoYXJlZFtuXSk7CiAKLQkJCW5hbWVzW24rK10gPSBlX18tPm5h bWU7CisJCQluYW1lc1tuKytdID0gZV9fcmluZy0+bmFtZTsKIAkJfQogCQlpZ3Rfd2FpdGNoaWxk cmVuKCk7CiAJfSBlbHNlIHsKQEAgLTExNDAsNyArMTE0MCw3IEBAIHByZWVtcHQoaW50IGZkLCB1 bnNpZ25lZCByaW5nLCBpbnQgbnVtX2NoaWxkcmVuLCBpbnQgdGltZW91dCkKIAogCWlmIChyaW5n ID09IEFMTF9FTkdJTkVTKSB7CiAJCWZvcl9lYWNoX3BoeXNpY2FsX2VuZ2luZShmZCwgcmluZykg ewotCQkJbmFtZXNbbnVtX2VuZ2luZXNdID0gZV9fLT5uYW1lOworCQkJbmFtZXNbbnVtX2VuZ2lu ZXNdID0gZV9fcmluZy0+bmFtZTsKIAkJCWVuZ2luZXNbbnVtX2VuZ2luZXMrK10gPSByaW5nOwog CQkJaWYgKG51bV9lbmdpbmVzID09IEFSUkFZX1NJWkUoZW5naW5lcykpCiAJCQkJYnJlYWs7Ci0t IAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K aWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2