From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergej Proskurin Subject: [PATCH 12/18] arm/altp2m: Cosmetic fixes - function prototypes. Date: Mon, 4 Jul 2016 13:45:59 +0200 Message-ID: <20160704114605.10086-31-proskurin@sec.in.tum.de> References: <20160704114605.10086-1-proskurin@sec.in.tum.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bK2Kl-00084Q-46 for xen-devel@lists.xenproject.org; Mon, 04 Jul 2016 11:46:39 +0000 In-Reply-To: <20160704114605.10086-1-proskurin@sec.in.tum.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Sergej Proskurin , Julien Grall , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org VGhpcyBjb21taXQgY2hhbmdlcyB0aGUgcHJvdG90eXBlIG9mIHRoZSBmb2xsb3dpbmcgZnVuY3Rp b25zOgotIGFwcGx5X3AybV9jaGFuZ2VzCi0gYXBwbHlfb25lX2xldmVsCi0gcDJtX3NoYXR0ZXJf cGFnZQotIHAybV9jcmVhdGVfdGFibGUKLSBfX3AybV9sb29rdXAKLSBfX3AybV9nZXRfbWVtX2Fj Y2VzcwoKVGhlc2UgY2hhbmdlcyBhcmUgcmVxdWlyZWQgYXMgb3VyIGltcGxlbWVudGF0aW9uIHJl dXNlcyBtb3N0IG9mIHRoZQpleGlzdGluZyBBUk0gcDJtIGltcGxlbWVudGF0aW9uIHRvIHNldCBw YWdlIHRhYmxlIGF0dHJpYnV0ZXMgb2YgdGhlCmluZGl2aWR1YWwgYWx0cDJtIHZpZXdzLiBUaGVy ZWZvcmUsIGV4aXRpbmcgZnVuY3Rpb24gcHJvdG90eXBlcyBoYXZlCmJlZW4gZXh0ZW5kZWQgdG8g aG9sZCBhbm90aGVyIGFyZ3VtZW50IChvZiB0eXBlIHN0cnVjdCBwMm1fZG9tYWluICopLgpUaGlz IGFsbG93cyB0byBzcGVjaWZ5IHRoZSBwMm0vYWx0cDJtIGRvbWFpbiB0aGF0IHNob3VsZCBiZSBw cm9jZXNzZWQgYnkKdGhlIGluZGl2aWR1YWwgZnVuY3Rpb24gLS0gaW5zdGVhZCBvZiBhY2Nlc3Np bmcgdGhlIGhvc3QncyBkZWZhdWx0IHAybQpkb21haW4uCgpTaWduZWQtb2ZmLWJ5OiBTZXJnZWog UHJvc2t1cmluIDxwcm9za3VyaW5Ac2VjLmluLnR1bS5kZT4KLS0tCkNjOiBTdGVmYW5vIFN0YWJl bGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+CkNjOiBKdWxpZW4gR3JhbGwgPGp1bGllbi5n cmFsbEBhcm0uY29tPgotLS0KIHhlbi9hcmNoL2FybS9wMm0uYyB8IDgwICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDQzIGluc2VydGlvbnMoKyksIDM3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNo L2FybS9wMm0uYyBiL3hlbi9hcmNoL2FybS9wMm0uYwppbmRleCAwMTlmMTBlLi45YzhmZWZkIDEw MDY0NAotLS0gYS94ZW4vYXJjaC9hcm0vcDJtLmMKKysrIGIveGVuL2FyY2gvYXJtL3AybS5jCkBA IC0yMDAsOSArMjAwLDggQEAgdm9pZCBmbHVzaF90bGJfZG9tYWluKHN0cnVjdCBkb21haW4gKmQp CiAgKiBUaGVyZSBhcmUgbm8gcHJvY2Vzc29yIGZ1bmN0aW9ucyB0byBkbyBhIHN0YWdlIDIgb25s eSBsb29rdXAgdGhlcmVmb3JlIHdlCiAgKiBkbyBhIGEgc29mdHdhcmUgd2Fsay4KICAqLwotc3Rh dGljIHBhZGRyX3QgX19wMm1fbG9va3VwKHN0cnVjdCBkb21haW4gKmQsIHBhZGRyX3QgcGFkZHIs IHAybV90eXBlX3QgKnQpCitzdGF0aWMgcGFkZHJfdCBfX3AybV9sb29rdXAoc3RydWN0IHAybV9k b21haW4gKnAybSwgcGFkZHJfdCBwYWRkciwgcDJtX3R5cGVfdCAqdCkKIHsKLSAgICBzdHJ1Y3Qg cDJtX2RvbWFpbiAqcDJtID0gJmQtPmFyY2gucDJtOwogICAgIGNvbnN0IHVuc2lnbmVkIGludCBv ZmZzZXRzWzRdID0gewogICAgICAgICB6ZXJvZXRoX3RhYmxlX29mZnNldChwYWRkciksCiAgICAg ICAgIGZpcnN0X3RhYmxlX29mZnNldChwYWRkciksCkBAIC0yODIsMTAgKzI4MSwxMSBAQCBlcnI6 CiBwYWRkcl90IHAybV9sb29rdXAoc3RydWN0IGRvbWFpbiAqZCwgcGFkZHJfdCBwYWRkciwgcDJt X3R5cGVfdCAqdCkKIHsKICAgICBwYWRkcl90IHJldDsKLSAgICBzdHJ1Y3QgcDJtX2RvbWFpbiAq cDJtID0gJmQtPmFyY2gucDJtOworICAgIHN0cnVjdCB2Y3B1ICp2ID0gY3VycmVudDsKKyAgICBz dHJ1Y3QgcDJtX2RvbWFpbiAqcDJtID0gYWx0cDJtX2FjdGl2ZShkKSA/IHAybV9nZXRfYWx0cDJt KHYpIDogcDJtX2dldF9ob3N0cDJtKGQpOwogCiAgICAgc3Bpbl9sb2NrKCZwMm0tPmxvY2spOwot ICAgIHJldCA9IF9fcDJtX2xvb2t1cChkLCBwYWRkciwgdCk7CisgICAgcmV0ID0gX19wMm1fbG9v a3VwKHAybSwgcGFkZHIsIHQpOwogICAgIHNwaW5fdW5sb2NrKCZwMm0tPmxvY2spOwogCiAgICAg cmV0dXJuIHJldDsKQEAgLTQ0MSwxMCArNDQxLDEyIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwMm1f cmVtb3ZlX3B0ZShscGFlX3QgKnAsIGJvb2xfdCBmbHVzaF9jYWNoZSkKICAqCiAgKiBsZXZlbF9z aGlmdCBpcyB0aGUgbnVtYmVyIG9mIGJpdHMgYXQgdGhlIGxldmVsIHdlIHdhbnQgdG8gY3JlYXRl LgogICovCi1zdGF0aWMgaW50IHAybV9jcmVhdGVfdGFibGUoc3RydWN0IGRvbWFpbiAqZCwgbHBh ZV90ICplbnRyeSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbGV2ZWxfc2hpZnQs IGJvb2xfdCBmbHVzaF9jYWNoZSkKK3N0YXRpYyBpbnQgcDJtX2NyZWF0ZV90YWJsZShzdHJ1Y3Qg ZG9tYWluICpkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbHBhZV90ICplbnRyeSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBpbnQgbGV2ZWxfc2hpZnQsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYm9vbF90IGZsdXNoX2NhY2hlKQogewotICAgIHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0gPSAmZC0+YXJjaC5wMm07CiAgICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZTsKICAgICBs cGFlX3QgKnA7CiAgICAgbHBhZV90IHB0ZTsKQEAgLTUwMiwxMCArNTA0LDkgQEAgc3RhdGljIGlu dCBwMm1fY3JlYXRlX3RhYmxlKHN0cnVjdCBkb21haW4gKmQsIGxwYWVfdCAqZW50cnksCiAgICAg cmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgX19wMm1fZ2V0X21lbV9hY2Nlc3Moc3RydWN0IGRv bWFpbiAqZCwgZ2ZuX3QgZ2ZuLAorc3RhdGljIGludCBfX3AybV9nZXRfbWVtX2FjY2VzcyhzdHJ1 Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHhlbm1lbV9hY2Nlc3NfdCAqYWNjZXNzKQogewotICAgIHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0gPSBwMm1fZ2V0X2hvc3RwMm0oZCk7CiAgICAgdm9pZCAqaTsKICAgICB1bnNpZ25lZCBp bnQgaW5kZXg7CiAKQEAgLTU0OCw3ICs1NDksNyBAQCBzdGF0aWMgaW50IF9fcDJtX2dldF9tZW1f YWNjZXNzKHN0cnVjdCBkb21haW4gKmQsIGdmbl90IGdmbiwKICAgICAgICAgICogTm8gc2V0dGlu ZyB3YXMgZm91bmQgaW4gdGhlIFJhZGl4IHRyZWUuIENoZWNrIGlmIHRoZQogICAgICAgICAgKiBl bnRyeSBleGlzdHMgaW4gdGhlIHBhZ2UtdGFibGVzLgogICAgICAgICAgKi8KLSAgICAgICAgcGFk ZHJfdCBtYWRkciA9IF9fcDJtX2xvb2t1cChkLCBnZm5feChnZm4pIDw8IFBBR0VfU0hJRlQsIE5V TEwpOworICAgICAgICBwYWRkcl90IG1hZGRyID0gX19wMm1fbG9va3VwKHAybSwgZ2ZuX3goZ2Zu KSA8PCBQQUdFX1NISUZULCBOVUxMKTsKICAgICAgICAgaWYgKCBJTlZBTElEX1BBRERSID09IG1h ZGRyICkKICAgICAgICAgICAgIHJldHVybiAtRVNSQ0g7CiAKQEAgLTY3NywxNyArNjc4LDE3IEBA IHN0YXRpYyBjb25zdCBwYWRkcl90IGxldmVsX3NoaWZ0c1tdID0KICAgICB7IFpFUk9FVEhfU0hJ RlQsIEZJUlNUX1NISUZULCBTRUNPTkRfU0hJRlQsIFRISVJEX1NISUZUIH07CiAKIHN0YXRpYyBp bnQgcDJtX3NoYXR0ZXJfcGFnZShzdHJ1Y3QgZG9tYWluICpkLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbHBhZV90ICplbnRyeSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25l ZCBpbnQgbGV2ZWwsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbF90IGZsdXNoX2Nh Y2hlKQogewogICAgIGNvbnN0IHBhZGRyX3QgbGV2ZWxfc2hpZnQgPSBsZXZlbF9zaGlmdHNbbGV2 ZWxdOwotICAgIGludCByYyA9IHAybV9jcmVhdGVfdGFibGUoZCwgZW50cnksCisgICAgaW50IHJj ID0gcDJtX2NyZWF0ZV90YWJsZShkLCBwMm0sIGVudHJ5LAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbGV2ZWxfc2hpZnQgLSBQQUdFX1NISUZULCBmbHVzaF9jYWNoZSk7CiAKICAgICBp ZiAoICFyYyApCiAgICAgewotICAgICAgICBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtID0gJmQtPmFy Y2gucDJtOwogICAgICAgICBwMm0tPnN0YXRzLnNoYXR0ZXJlZFtsZXZlbF0rKzsKICAgICAgICAg cDJtLT5zdGF0cy5tYXBwaW5nc1tsZXZlbF0tLTsKICAgICAgICAgcDJtLT5zdGF0cy5tYXBwaW5n c1tsZXZlbCsxXSArPSBMUEFFX0VOVFJJRVM7CkBAIC03MDQsNiArNzA1LDcgQEAgc3RhdGljIGlu dCBwMm1fc2hhdHRlcl9wYWdlKHN0cnVjdCBkb21haW4gKmQsCiAgKiAtdmUgPT0gKC1FeHh4KSBl cnJvci4KICAqLwogc3RhdGljIGludCBhcHBseV9vbmVfbGV2ZWwoc3RydWN0IGRvbWFpbiAqZCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICBscGFlX3QgKmVudHJ5LAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgdW5zaWduZWQgaW50IGxldmVsLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg Ym9vbF90IGZsdXNoX2NhY2hlLApAQCAtNzIxLDcgKzcyMyw2IEBAIHN0YXRpYyBpbnQgYXBwbHlf b25lX2xldmVsKHN0cnVjdCBkb21haW4gKmQsCiAgICAgY29uc3QgcGFkZHJfdCBsZXZlbF9tYXNr ID0gbGV2ZWxfbWFza3NbbGV2ZWxdOwogICAgIGNvbnN0IHBhZGRyX3QgbGV2ZWxfc2hpZnQgPSBs ZXZlbF9zaGlmdHNbbGV2ZWxdOwogCi0gICAgc3RydWN0IHAybV9kb21haW4gKnAybSA9ICZkLT5h cmNoLnAybTsKICAgICBscGFlX3QgcHRlOwogICAgIGNvbnN0IGxwYWVfdCBvcmlnX3B0ZSA9ICpl bnRyeTsKICAgICBpbnQgcmM7CkBAIC03NzYsNyArNzc3LDcgQEAgc3RhdGljIGludCBhcHBseV9v bmVfbGV2ZWwoc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAgICogTDMpIG9yIG1lbV9hY2Nlc3Mg aXMgaW4gdXNlLiBDcmVhdGUgYSBwYWdlIHRhYmxlIGFuZAogICAgICAgICAgKiBjb250aW51ZSB0 byBkZXNjZW5kIHNvIHdlIHRyeSBzbWFsbGVyIGFsbG9jYXRpb25zLgogICAgICAgICAgKi8KLSAg ICAgICAgcmMgPSBwMm1fY3JlYXRlX3RhYmxlKGQsIGVudHJ5LCAwLCBmbHVzaF9jYWNoZSk7Cisg ICAgICAgIHJjID0gcDJtX2NyZWF0ZV90YWJsZShkLCBwMm0sIGVudHJ5LCAwLCBmbHVzaF9jYWNo ZSk7CiAgICAgICAgIGlmICggcmMgPCAwICkKICAgICAgICAgICAgIHJldHVybiByYzsKIApAQCAt ODM0LDcgKzgzNSw3IEBAIHN0YXRpYyBpbnQgYXBwbHlfb25lX2xldmVsKHN0cnVjdCBkb21haW4g KmQsCiAgICAgICAgICAgICAvKiBOb3QgcHJlc2VudCAtPiBjcmVhdGUgdGFibGUgZW50cnkgYW5k IGRlc2NlbmQgKi8KICAgICAgICAgICAgIGlmICggIXAybV92YWxpZChvcmlnX3B0ZSkgKQogICAg ICAgICAgICAgewotICAgICAgICAgICAgICAgIHJjID0gcDJtX2NyZWF0ZV90YWJsZShkLCBlbnRy eSwgMCwgZmx1c2hfY2FjaGUpOworICAgICAgICAgICAgICAgIHJjID0gcDJtX2NyZWF0ZV90YWJs ZShkLCBwMm0sIGVudHJ5LCAwLCBmbHVzaF9jYWNoZSk7CiAgICAgICAgICAgICAgICAgaWYgKCBy YyA8IDAgKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gcmM7CiAgICAgICAgICAgICAgICAg cmV0dXJuIFAyTV9PTkVfREVTQ0VORDsKQEAgLTg0NCw3ICs4NDUsNyBAQCBzdGF0aWMgaW50IGFw cGx5X29uZV9sZXZlbChzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgaWYgKCBwMm1fbWFw cGluZyhvcmlnX3B0ZSkgKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICpmbHVzaCA9 IHRydWU7Ci0gICAgICAgICAgICAgICAgcmMgPSBwMm1fc2hhdHRlcl9wYWdlKGQsIGVudHJ5LCBs ZXZlbCwgZmx1c2hfY2FjaGUpOworICAgICAgICAgICAgICAgIHJjID0gcDJtX3NoYXR0ZXJfcGFn ZShkLCBwMm0sIGVudHJ5LCBsZXZlbCwgZmx1c2hfY2FjaGUpOwogICAgICAgICAgICAgICAgIGlm ICggcmMgPCAwICkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJjOwogICAgICAgICAgICAg fSAvKiBlbHNlOiBhbiBleGlzdGluZyB0YWJsZSBtYXBwaW5nIC0+IGRlc2NlbmQgKi8KQEAgLTg4 MSw3ICs4ODIsNyBAQCBzdGF0aWMgaW50IGFwcGx5X29uZV9sZXZlbChzdHJ1Y3QgZG9tYWluICpk LAogICAgICAgICAgICAgICAgICAqIGFuZCBkZXNjZW5kLgogICAgICAgICAgICAgICAgICAqLwog ICAgICAgICAgICAgICAgICpmbHVzaCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgcmMgPSBwMm1f c2hhdHRlcl9wYWdlKGQsIGVudHJ5LCBsZXZlbCwgZmx1c2hfY2FjaGUpOworICAgICAgICAgICAg ICAgIHJjID0gcDJtX3NoYXR0ZXJfcGFnZShkLCBwMm0sIGVudHJ5LCBsZXZlbCwgZmx1c2hfY2Fj aGUpOwogICAgICAgICAgICAgICAgIGlmICggcmMgPCAwICkKICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIHJjOwogCkBAIC05NjYsNyArOTY3LDcgQEAgc3RhdGljIGludCBhcHBseV9vbmVfbGV2 ZWwoc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAgICAgIC8qIFNoYXR0ZXIgbGFyZ2UgcGFnZXMg YXMgd2UgZGVzY2VuZCAqLwogICAgICAgICAgICAgaWYgKCBwMm1fbWFwcGluZyhvcmlnX3B0ZSkg KQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHJjID0gcDJtX3NoYXR0ZXJfcGFnZShk LCBlbnRyeSwgbGV2ZWwsIGZsdXNoX2NhY2hlKTsKKyAgICAgICAgICAgICAgICByYyA9IHAybV9z aGF0dGVyX3BhZ2UoZCwgcDJtLCBlbnRyeSwgbGV2ZWwsIGZsdXNoX2NhY2hlKTsKICAgICAgICAg ICAgICAgICBpZiAoIHJjIDwgMCApCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiByYzsKICAg ICAgICAgICAgIH0gLyogZWxzZTogYW4gZXhpc3RpbmcgdGFibGUgbWFwcGluZyAtPiBkZXNjZW5k ICovCkBAIC0xMDExLDYgKzEwMTIsNyBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfcmVmZXJlbmNlX21h cHBpbmcoc3RydWN0IHBhZ2VfaW5mbyAqcGFnZSwKIH0KIAogc3RhdGljIGludCBhcHBseV9wMm1f Y2hhbmdlcyhzdHJ1Y3QgZG9tYWluICpkLAorICAgICAgICAgICAgICAgICAgICAgc3RydWN0IHAy bV9kb21haW4gKnAybSwKICAgICAgICAgICAgICAgICAgICAgIGVudW0gcDJtX29wZXJhdGlvbiBv cCwKICAgICAgICAgICAgICAgICAgICAgIHBhZGRyX3Qgc3RhcnRfZ3BhZGRyLAogICAgICAgICAg ICAgICAgICAgICAgcGFkZHJfdCBlbmRfZ3BhZGRyLApAQCAtMTAyMSw3ICsxMDIzLDYgQEAgc3Rh dGljIGludCBhcHBseV9wMm1fY2hhbmdlcyhzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAg ICAgICAgICAgcDJtX2FjY2Vzc190IGEpCiB7CiAgICAgaW50IHJjLCByZXQ7Ci0gICAgc3RydWN0 IHAybV9kb21haW4gKnAybSA9ICZkLT5hcmNoLnAybTsKICAgICBscGFlX3QgKm1hcHBpbmdzWzRd ID0geyBOVUxMLCBOVUxMLCBOVUxMLCBOVUxMIH07CiAgICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFn ZXNbNF0gPSB7IE5VTEwsIE5VTEwsIE5VTEwsIE5VTEwgfTsKICAgICBwYWRkcl90IGFkZHIsIG9y aWdfbWFkZHIgPSBtYWRkcjsKQEAgLTExNDgsNyArMTE0OSw3IEBAIHN0YXRpYyBpbnQgYXBwbHlf cDJtX2NoYW5nZXMoc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAgICAgIGxwYWVfdCAqZW50cnkg PSAmbWFwcGluZ3NbbGV2ZWxdW29mZnNldF07CiAgICAgICAgICAgICBscGFlX3Qgb2xkX2VudHJ5 ID0gKmVudHJ5OwogCi0gICAgICAgICAgICByZXQgPSBhcHBseV9vbmVfbGV2ZWwoZCwgZW50cnks CisgICAgICAgICAgICByZXQgPSBhcHBseV9vbmVfbGV2ZWwoZCwgcDJtLCBlbnRyeSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsZXZlbCwgZmx1c2hfcHQsIG9wLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0X2dwYWRkciwgZW5kX2dwYWRkciwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmYWRkciwgJm1hZGRyLCAmZmx1c2gsCkBA IC0xMjU3LDcgKzEyNTgsNyBAQCBvdXQ6CiAgICAgICAgICAqIGFkZHIga2VlcHMgdGhlIGFkZHJl c3Mgb2YgdGhlIGVuZCBvZiB0aGUgbGFzdCBzdWNjZXNzZnVsbHktaW5zZXJ0ZWQKICAgICAgICAg ICogbWFwcGluZy4KICAgICAgICAgICovCi0gICAgICAgIGFwcGx5X3AybV9jaGFuZ2VzKGQsIFJF TU9WRSwgc3RhcnRfZ3BhZGRyLCBhZGRyLCBvcmlnX21hZGRyLAorICAgICAgICBhcHBseV9wMm1f Y2hhbmdlcyhkLCBwMm0sIFJFTU9WRSwgc3RhcnRfZ3BhZGRyLCBhZGRyLCBvcmlnX21hZGRyLAog ICAgICAgICAgICAgICAgICAgICAgICAgICBtYXR0ciwgMCwgcDJtX2ludmFsaWQsIGQtPmFyY2gu cDJtLmRlZmF1bHRfYWNjZXNzKTsKICAgICB9CiAKQEAgLTEyNjgsNyArMTI2OSw4IEBAIGludCBw Mm1fcG9wdWxhdGVfcmFtKHN0cnVjdCBkb21haW4gKmQsCiAgICAgICAgICAgICAgICAgICAgICBw YWRkcl90IHN0YXJ0LAogICAgICAgICAgICAgICAgICAgICAgcGFkZHJfdCBlbmQpCiB7Ci0gICAg cmV0dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIEFMTE9DQVRFLCBzdGFydCwgZW5kLAorICAgIHJl dHVybiBhcHBseV9wMm1fY2hhbmdlcyhkLCBwMm1fZ2V0X2hvc3RwMm0oZCksIEFMTE9DQVRFLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGFydCwgZW5kLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAwLCBNQVRUUl9NRU0sIDAsIHAybV9yYW1fcncsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGQtPmFyY2gucDJtLmRlZmF1bHRfYWNjZXNzKTsKIH0KQEAgLTEyNzgs NyArMTI4MCw3IEBAIGludCBtYXBfcmVnaW9uc19yd19jYWNoZShzdHJ1Y3QgZG9tYWluICpkLAog ICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbnIsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBtZm4pCiB7Ci0gICAgcmV0dXJuIGFwcGx5X3AybV9j aGFuZ2VzKGQsIElOU0VSVCwKKyAgICByZXR1cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwgcDJtX2dl dF9ob3N0cDJtKGQpLCBJTlNFUlQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90 b19wYWRkcihzdGFydF9nZm4pLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9f cGFkZHIoc3RhcnRfZ2ZuICsgbnIpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5f dG9fcGFkZHIobWZuKSwKQEAgLTEyOTEsNyArMTI5Myw3IEBAIGludCB1bm1hcF9yZWdpb25zX3J3 X2NhY2hlKHN0cnVjdCBkb21haW4gKmQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNp Z25lZCBsb25nIG5yLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBt Zm4pCiB7Ci0gICAgcmV0dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIFJFTU9WRSwKKyAgICByZXR1 cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwgcDJtX2dldF9ob3N0cDJtKGQpLCBSRU1PVkUsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihzdGFydF9nZm4pLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIoc3RhcnRfZ2ZuICsgbnIpLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIobWZuKSwKQEAgLTEzMDQsNyAr MTMwNiw3IEBAIGludCBtYXBfbW1pb19yZWdpb25zKHN0cnVjdCBkb21haW4gKmQsCiAgICAgICAg ICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIG5yLAogICAgICAgICAgICAgICAgICAgICAgdW5z aWduZWQgbG9uZyBtZm4pCiB7Ci0gICAgcmV0dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIElOU0VS VCwKKyAgICByZXR1cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwgcDJtX2dldF9ob3N0cDJtKGQpLCBJ TlNFUlQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihzdGFydF9n Zm4pLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIoc3RhcnRfZ2Zu ICsgbnIpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIobWZuKSwK QEAgLTEzMTcsNyArMTMxOSw3IEBAIGludCB1bm1hcF9tbWlvX3JlZ2lvbnMoc3RydWN0IGRvbWFp biAqZCwKICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBuciwKICAgICAgICAg ICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBtZm4pCiB7Ci0gICAgcmV0dXJuIGFwcGx5X3Ay bV9jaGFuZ2VzKGQsIFJFTU9WRSwKKyAgICByZXR1cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwgcDJt X2dldF9ob3N0cDJtKGQpLCBSRU1PVkUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBm bl90b19wYWRkcihzdGFydF9nZm4pLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5f dG9fcGFkZHIoc3RhcnRfZ2ZuICsgbnIpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw Zm5fdG9fcGFkZHIobWZuKSwKQEAgLTEzNTIsNyArMTM1NCw3IEBAIGludCBndWVzdF9waHlzbWFw X2FkZF9lbnRyeShzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIGxvbmcgcGFnZV9vcmRlciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw Mm1fdHlwZV90IHQpCiB7Ci0gICAgcmV0dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIElOU0VSVCwK KyAgICByZXR1cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwgcDJtX2dldF9ob3N0cDJtKGQpLCBJTlNF UlQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihnZm5feChnZm4p KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKGdmbl94KGdmbikg KyAoMSA8PCBwYWdlX29yZGVyKSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90 b19wYWRkcihtZm5feChtZm4pKSwgTUFUVFJfTUVNLCAwLCB0LApAQCAtMTM2Myw3ICsxMzY1LDcg QEAgdm9pZCBndWVzdF9waHlzbWFwX3JlbW92ZV9wYWdlKHN0cnVjdCBkb21haW4gKmQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2ZuX3QgZ2ZuLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1mbl90IG1mbiwgdW5zaWduZWQgaW50IHBhZ2Vfb3JkZXIpCiB7Ci0gICAg YXBwbHlfcDJtX2NoYW5nZXMoZCwgUkVNT1ZFLAorICAgIGFwcGx5X3AybV9jaGFuZ2VzKGQsIHAy bV9nZXRfaG9zdHAybShkKSwgUkVNT1ZFLAogICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19w YWRkcihnZm5feChnZm4pKSwKICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIoZ2Zu X3goZ2ZuKSArICgxPDxwYWdlX29yZGVyKSksCiAgICAgICAgICAgICAgICAgICAgICAgcGZuX3Rv X3BhZGRyKG1mbl94KG1mbikpLCBNQVRUUl9NRU0sIDAsIHAybV9pbnZhbGlkLApAQCAtMTY5Niw5 ICsxNjk4LDkgQEAgaW50IHAybV9pbml0KHN0cnVjdCBkb21haW4gKmQpCiAKIGludCByZWxpbnF1 aXNoX3AybV9tYXBwaW5nKHN0cnVjdCBkb21haW4gKmQpCiB7Ci0gICAgc3RydWN0IHAybV9kb21h aW4gKnAybSA9ICZkLT5hcmNoLnAybTsKKyAgICBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtID0gcDJt X2dldF9ob3N0cDJtKGQpOwogCi0gICAgcmV0dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIFJFTElO UVVJU0gsCisgICAgcmV0dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIHAybSwgUkVMSU5RVUlTSCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihwMm0tPmxvd2VzdF9t YXBwZWRfZ2ZuKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihw Mm0tPm1heF9tYXBwZWRfZ2ZuKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90 b19wYWRkcihJTlZBTElEX01GTiksCkBAIC0xNzA4LDEyICsxNzEwLDEyIEBAIGludCByZWxpbnF1 aXNoX3AybV9tYXBwaW5nKHN0cnVjdCBkb21haW4gKmQpCiAKIGludCBwMm1fY2FjaGVfZmx1c2go c3RydWN0IGRvbWFpbiAqZCwgeGVuX3Bmbl90IHN0YXJ0X21mbiwgeGVuX3Bmbl90IGVuZF9tZm4p CiB7Ci0gICAgc3RydWN0IHAybV9kb21haW4gKnAybSA9ICZkLT5hcmNoLnAybTsKKyAgICBzdHJ1 Y3QgcDJtX2RvbWFpbiAqcDJtID0gcDJtX2dldF9ob3N0cDJtKGQpOwogCiAgICAgc3RhcnRfbWZu ID0gTUFYKHN0YXJ0X21mbiwgcDJtLT5sb3dlc3RfbWFwcGVkX2dmbik7CiAgICAgZW5kX21mbiA9 IE1JTihlbmRfbWZuLCBwMm0tPm1heF9tYXBwZWRfZ2ZuKTsKIAotICAgIHJldHVybiBhcHBseV9w Mm1fY2hhbmdlcyhkLCBDQUNIRUZMVVNILAorICAgIHJldHVybiBhcHBseV9wMm1fY2hhbmdlcyhk LCBwMm0sIENBQ0hFRkxVU0gsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19w YWRkcihzdGFydF9tZm4pLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFk ZHIoZW5kX21mbiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihJ TlZBTElEX01GTiksCkBAIC0xNzQzLDYgKzE3NDUsOSBAQCBwMm1fbWVtX2FjY2Vzc19jaGVja19h bmRfZ2V0X3BhZ2UodmFkZHJfdCBndmEsIHVuc2lnbmVkIGxvbmcgZmxhZykKICAgICB4ZW5tZW1f YWNjZXNzX3QgeG1hOwogICAgIHAybV90eXBlX3QgdDsKICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpw YWdlID0gTlVMTDsKKyAgICBzdHJ1Y3QgdmNwdSAqdiA9IGN1cnJlbnQ7CisgICAgc3RydWN0IGRv bWFpbiAqZCA9IHYtPmRvbWFpbjsKKyAgICBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtID0gYWx0cDJt X2FjdGl2ZShkKSA/IHAybV9nZXRfYWx0cDJtKHYpIDogcDJtX2dldF9ob3N0cDJtKGQpOwogCiAg ICAgcmMgPSBndmFfdG9faXBhKGd2YSwgJmlwYSwgZmxhZyk7CiAgICAgaWYgKCByYyA8IDAgKQpA QCAtMTc1Miw3ICsxNzU3LDcgQEAgcDJtX21lbV9hY2Nlc3NfY2hlY2tfYW5kX2dldF9wYWdlKHZh ZGRyX3QgZ3ZhLCB1bnNpZ25lZCBsb25nIGZsYWcpCiAgICAgICogV2UgZG8gdGhpcyBmaXJzdCBh cyB0aGlzIGlzIGZhc3RlciBpbiB0aGUgZGVmYXVsdCBjYXNlIHdoZW4gbm8KICAgICAgKiBwZXJt aXNzaW9uIGlzIHNldCBvbiB0aGUgcGFnZS4KICAgICAgKi8KLSAgICByYyA9IF9fcDJtX2dldF9t ZW1fYWNjZXNzKGN1cnJlbnQtPmRvbWFpbiwgX2dmbihwYWRkcl90b19wZm4oaXBhKSksICZ4bWEp OworICAgIHJjID0gX19wMm1fZ2V0X21lbV9hY2Nlc3MocDJtLCBfZ2ZuKHBhZGRyX3RvX3Bmbihp cGEpKSwgJnhtYSk7CiAgICAgaWYgKCByYyA8IDAgKQogICAgICAgICBnb3RvIGVycjsKIApAQCAt MTgwMSw3ICsxODA2LDcgQEAgcDJtX21lbV9hY2Nlc3NfY2hlY2tfYW5kX2dldF9wYWdlKHZhZGRy X3QgZ3ZhLCB1bnNpZ25lZCBsb25nIGZsYWcpCiAgICAgICogV2UgaGFkIGEgbWVtX2FjY2VzcyBw ZXJtaXNzaW9uIGxpbWl0aW5nIHRoZSBhY2Nlc3MsIGJ1dCB0aGUgcGFnZSB0eXBlCiAgICAgICog Y291bGQgYWxzbyBiZSBsaW1pdGluZywgc28gd2UgbmVlZCB0byBjaGVjayB0aGF0IGFzIHdlbGwu CiAgICAgICovCi0gICAgbWFkZHIgPSBfX3AybV9sb29rdXAoY3VycmVudC0+ZG9tYWluLCBpcGEs ICZ0KTsKKyAgICBtYWRkciA9IF9fcDJtX2xvb2t1cChwMm0sIGlwYSwgJnQpOwogICAgIGlmICgg bWFkZHIgPT0gSU5WQUxJRF9QQUREUiApCiAgICAgICAgIGdvdG8gZXJyOwogCkBAIC0yMTI1LDcg KzIxMzAsNyBAQCBsb25nIHAybV9zZXRfbWVtX2FjY2VzcyhzdHJ1Y3QgZG9tYWluICpkLCBnZm5f dCBnZm4sIHVpbnQzMl90IG5yLAogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKLSAgICByYyA9 IGFwcGx5X3AybV9jaGFuZ2VzKGQsIE1FTUFDQ0VTUywKKyAgICByYyA9IGFwcGx5X3AybV9jaGFu Z2VzKGQsIHAybSwgTUVNQUNDRVNTLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZuX3Rv X3BhZGRyKGdmbl94KGdmbikgKyBzdGFydCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBw Zm5fdG9fcGFkZHIoZ2ZuX3goZ2ZuKSArIG5yKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg IDAsIE1BVFRSX01FTSwgbWFzaywgMCwgYSk7CkBAIC0yMTQxLDEwICsyMTQ2LDExIEBAIGludCBw Mm1fZ2V0X21lbV9hY2Nlc3Moc3RydWN0IGRvbWFpbiAqZCwgZ2ZuX3QgZ2ZuLAogICAgICAgICAg ICAgICAgICAgICAgICB4ZW5tZW1fYWNjZXNzX3QgKmFjY2VzcykKIHsKICAgICBpbnQgcmV0Owot ICAgIHN0cnVjdCBwMm1fZG9tYWluICpwMm0gPSBwMm1fZ2V0X2hvc3RwMm0oZCk7CisgICAgc3Ry dWN0IHZjcHUgKnYgPSBjdXJyZW50OworICAgIHN0cnVjdCBwMm1fZG9tYWluICpwMm0gPSBhbHRw Mm1fYWN0aXZlKGQpID8gcDJtX2dldF9hbHRwMm0odikgOiBwMm1fZ2V0X2hvc3RwMm0oZCk7CiAK ICAgICBzcGluX2xvY2soJnAybS0+bG9jayk7Ci0gICAgcmV0ID0gX19wMm1fZ2V0X21lbV9hY2Nl c3MoZCwgZ2ZuLCBhY2Nlc3MpOworICAgIHJldCA9IF9fcDJtX2dldF9tZW1fYWNjZXNzKHAybSwg Z2ZuLCBhY2Nlc3MpOwogICAgIHNwaW5fdW5sb2NrKCZwMm0tPmxvY2spOwogCiAgICAgcmV0dXJu IHJldDsKLS0gCjIuOC4zCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpo dHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK