From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [RFC 12/29] staging/android: remove struct sync_pt Date: Fri, 15 Jan 2016 12:55:22 -0200 Message-ID: <1452869739-3304-13-git-send-email-gustavo@padovan.org> References: <1452869739-3304-1-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-yk0-f177.google.com (mail-yk0-f177.google.com [209.85.160.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id 28BC37A0E6 for ; Fri, 15 Jan 2016 06:56:30 -0800 (PST) Received: by mail-yk0-f177.google.com with SMTP id v14so451535185ykd.3 for ; Fri, 15 Jan 2016 06:56:30 -0800 (PST) In-Reply-To: <1452869739-3304-1-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, daniels@collabora.com, Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Maarten Lankhorst , Gustavo Padovan , John Harrison List-Id: dri-devel@lists.freedesktop.org RnJvbTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgoK c3RydWN0IHN5bmNfcHQgd2FzIGp1c3Qgd3JhcHBpbmcgYXJvdW5kIHN0cnVjdCBmZW5jZSBhbmQg Y3JlYXRpbmcgYW4KZXh0cmEgYWJzdHJhY3Rpb24gbGF5ZXIuIFRoZSBvbmx5IHR3byBtZW1iZXJz IG9mIHN0cnVjdCBzeW5jX3B0LCBjaGlsZF9saXN0CmFuZCBhY3RpdmVfbGlzdCwgd2VyZSBtb3Zl ZCB0byBzdHJ1Y3QgZmVuY2UgaW4gYW4gZWFybGllciBjb21taXQuIEFmdGVyCnJlbW92aW5nIHRo b3NlIHR3byBtZW1iZXJzIHN0cnVjdCBzeW5jX3B0IGlzIG5vdGhpbmcgbW9yZSB0aGFuIHN0cnVj dApmZW5jZSwgc28gcmVtb3ZlIGl0IGFsbCBhbmQgdXNlIHN0cnVjdCBmZW5jZSBkaXJlY3RseS4K ClNpZ25lZC1vZmYtYnk6IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9y YS5jby51az4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zd19zeW5jLmMgICAgfCAgNyAr KystLS0KIGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N3X3N5bmMuaCAgICB8ICA4ICsrKy0tLS0K IGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYyAgICAgICB8IDMzICsrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmggICAgICAgfCAy MSArKysrLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmNfZGVidWcu YyB8IDQxICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9zdGFn aW5nL2FuZHJvaWQvdHJhY2Uvc3luYy5oIHwgMTQgKysrKysrLS0tLS0tCiA2IGZpbGVzIGNoYW5n ZWQsIDUzIGluc2VydGlvbnMoKyksIDcxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvc3RhZ2luZy9hbmRyb2lkL3N3X3N5bmMuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N3 X3N5bmMuYwppbmRleCA5OGY5YTI5Li45ZDZhNWJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdp bmcvYW5kcm9pZC9zd19zeW5jLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3dfc3lu Yy5jCkBAIC0yNSw3ICsyNSw3IEBACiAKICNpbmNsdWRlICJzd19zeW5jLmgiCiAKLXN0cnVjdCBz eW5jX3B0ICpzd19zeW5jX3B0X2NyZWF0ZShzdHJ1Y3Qgc3dfc3luY190aW1lbGluZSAqb2JqLCB1 MzIgdmFsdWUpCitzdHJ1Y3QgZmVuY2UgKnN3X3N5bmNfcHRfY3JlYXRlKHN0cnVjdCBzd19zeW5j X3RpbWVsaW5lICpvYmosIHUzMiB2YWx1ZSkKIHsKIAlzdHJ1Y3Qgc3dfc3luY19wdCAqcHQ7CiAK QEAgLTM0LDcgKzM0LDcgQEAgc3RydWN0IHN5bmNfcHQgKnN3X3N5bmNfcHRfY3JlYXRlKHN0cnVj dCBzd19zeW5jX3RpbWVsaW5lICpvYmosIHUzMiB2YWx1ZSkKIAogCXB0LT52YWx1ZSA9IHZhbHVl OwogCi0JcmV0dXJuIChzdHJ1Y3Qgc3luY19wdCAqKXB0OworCXJldHVybiAoc3RydWN0IGZlbmNl ICopcHQ7CiB9CiBFWFBPUlRfU1lNQk9MKHN3X3N5bmNfcHRfY3JlYXRlKTsKIApAQCAtNTAsOCAr NTAsNyBAQCBzdGF0aWMgaW50IHN3X3N5bmNfZmVuY2VfaGFzX3NpZ25hbGVkKHN0cnVjdCBmZW5j ZSAqZmVuY2UpCiBzdGF0aWMgaW50IHN3X3N5bmNfZmlsbF9kcml2ZXJfZGF0YShzdHJ1Y3QgZmVu Y2UgKmZlbmNlLAogCQkJCSAgICB2b2lkICpkYXRhLCBpbnQgc2l6ZSkKIHsKLQlzdHJ1Y3Qgc3lu Y19wdCAqc3luY19wdCA9IChzdHJ1Y3Qgc3luY19wdCAqKWZlbmNlOwotCXN0cnVjdCBzd19zeW5j X3B0ICpwdCA9IChzdHJ1Y3Qgc3dfc3luY19wdCAqKXN5bmNfcHQ7CisJc3RydWN0IHN3X3N5bmNf cHQgKnB0ID0gKHN0cnVjdCBzd19zeW5jX3B0ICopZmVuY2U7CiAKIAlpZiAoc2l6ZSA8IHNpemVv ZihwdC0+dmFsdWUpKQogCQlyZXR1cm4gLUVOT01FTTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3Rh Z2luZy9hbmRyb2lkL3N3X3N5bmMuaCBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N3X3N5bmMu aAppbmRleCBjYjYyMjk4Li44NWVmNzgwIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvYW5k cm9pZC9zd19zeW5jLmgKKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3dfc3luYy5oCkBA IC0yOSw3ICsyOSw3IEBAIHN0cnVjdCBzd19zeW5jX3RpbWVsaW5lIHsKIH07CiAKIHN0cnVjdCBz d19zeW5jX3B0IHsKLQlzdHJ1Y3Qgc3luY19wdAkJcHQ7CisJc3RydWN0IGZlbmNlCQlwdDsKIAog CXUzMgkJCXZhbHVlOwogfTsKQEAgLTM4LDcgKzM4LDcgQEAgc3RydWN0IHN3X3N5bmNfcHQgewog c3RydWN0IHN3X3N5bmNfdGltZWxpbmUgKnN3X3N5bmNfdGltZWxpbmVfY3JlYXRlKGNvbnN0IGNo YXIgKm5hbWUpOwogdm9pZCBzd19zeW5jX3RpbWVsaW5lX2luYyhzdHJ1Y3Qgc3dfc3luY190aW1l bGluZSAqb2JqLCB1MzIgaW5jKTsKIAotc3RydWN0IHN5bmNfcHQgKnN3X3N5bmNfcHRfY3JlYXRl KHN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICpvYmosIHUzMiB2YWx1ZSk7CitzdHJ1Y3QgZmVuY2Ug KnN3X3N5bmNfcHRfY3JlYXRlKHN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICpvYmosIHUzMiB2YWx1 ZSk7CiAjZWxzZQogc3RhdGljIGlubGluZSBzdHJ1Y3Qgc3dfc3luY190aW1lbGluZSAqc3dfc3lu Y190aW1lbGluZV9jcmVhdGUoY29uc3QgY2hhciAqbmFtZSkKIHsKQEAgLTQ5LDggKzQ5LDggQEAg c3RhdGljIGlubGluZSB2b2lkIHN3X3N5bmNfdGltZWxpbmVfaW5jKHN0cnVjdCBzd19zeW5jX3Rp bWVsaW5lICpvYmosIHUzMiBpbmMpCiB7CiB9CiAKLXN0YXRpYyBpbmxpbmUgc3RydWN0IHN5bmNf cHQgKnN3X3N5bmNfcHRfY3JlYXRlKHN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICpvYmosCi0JCQkJ CQl1MzIgdmFsdWUpCitzdGF0aWMgaW5saW5lIHN0cnVjdCBmZW5jZSAqc3dfc3luY19wdF9jcmVh dGUoc3RydWN0IHN3X3N5bmNfdGltZWxpbmUgKm9iaiwKKwkJCQkJICAgICAgdTMyIHZhbHVlKQog ewogCXJldHVybiBOVUxMOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQv c3luYy5jIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jCmluZGV4IGIwN2JjMjQuLjQx N2NmOWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYworKysgYi9k cml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmMKQEAgLTM5LDcgKzM5LDcgQEAgc3RydWN0IGZl bmNlICpzeW5jX3B0X2NyZWF0ZShzdHJ1Y3QgZmVuY2VfdGltZWxpbmUgKm9iaiwgaW50IHNpemUp CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAlzdHJ1Y3QgZmVuY2UgKmZlbmNlOwogCi0JaWYgKHNp emUgPCBzaXplb2Yoc3RydWN0IHN5bmNfcHQpKQorCWlmIChzaXplIDwgc2l6ZW9mKCpmZW5jZSkp CiAJCXJldHVybiBOVUxMOwogCiAJZmVuY2UgPSBremFsbG9jKHNpemUsIEdGUF9LRVJORUwpOwpA QCAtNTcsMTIgKzU3LDYgQEAgc3RydWN0IGZlbmNlICpzeW5jX3B0X2NyZWF0ZShzdHJ1Y3QgZmVu Y2VfdGltZWxpbmUgKm9iaiwgaW50IHNpemUpCiB9CiBFWFBPUlRfU1lNQk9MKHN5bmNfcHRfY3Jl YXRlKTsKIAotdm9pZCBzeW5jX3B0X2ZyZWUoc3RydWN0IHN5bmNfcHQgKnB0KQotewotCWZlbmNl X3B1dCgmcHQtPmJhc2UpOwotfQotRVhQT1JUX1NZTUJPTChzeW5jX3B0X2ZyZWUpOwotCiBzdGF0 aWMgc3RydWN0IHN5bmNfZmVuY2UgKnN5bmNfZmVuY2VfYWxsb2MoaW50IHNpemUsIGNvbnN0IGNo YXIgKm5hbWUpCiB7CiAJc3RydWN0IHN5bmNfZmVuY2UgKnN5bmNfZmVuY2U7CkBAIC0xMDEsNyAr OTUsNyBAQCBzdGF0aWMgdm9pZCBmZW5jZV9jaGVja19jYl9mdW5jKHN0cnVjdCBmZW5jZSAqZiwg c3RydWN0IGZlbmNlX2NiICpjYikKIH0KIAogLyogVE9ETzogaW1wbGVtZW50IGEgY3JlYXRlIHdo aWNoIHRha2VzIG1vcmUgdGhhdCBvbmUgc3luY19wdCAqLwotc3RydWN0IHN5bmNfZmVuY2UgKnN5 bmNfZmVuY2VfY3JlYXRlX2RtYShjb25zdCBjaGFyICpuYW1lLCBzdHJ1Y3QgZmVuY2UgKnB0KQor c3RydWN0IHN5bmNfZmVuY2UgKnN5bmNfZmVuY2VfY3JlYXRlX2RtYShjb25zdCBjaGFyICpuYW1l LCBzdHJ1Y3QgZmVuY2UgKmZlbmNlKQogewogCXN0cnVjdCBzeW5jX2ZlbmNlICpzeW5jX2ZlbmNl OwogCkBAIC0xMTMsOSArMTA3LDEwIEBAIHN0cnVjdCBzeW5jX2ZlbmNlICpzeW5jX2ZlbmNlX2Ny ZWF0ZV9kbWEoY29uc3QgY2hhciAqbmFtZSwgc3RydWN0IGZlbmNlICpwdCkKIAlzeW5jX2ZlbmNl LT5udW1fZmVuY2VzID0gMTsKIAlhdG9taWNfc2V0KCZzeW5jX2ZlbmNlLT5zdGF0dXMsIDEpOwog Ci0Jc3luY19mZW5jZS0+Y2JzWzBdLmZlbmNlID0gcHQ7CisJc3luY19mZW5jZS0+Y2JzWzBdLmZl bmNlID0gZmVuY2U7CiAJc3luY19mZW5jZS0+Y2JzWzBdLnN5bmNfZmVuY2UgPSBzeW5jX2ZlbmNl OwotCWlmIChmZW5jZV9hZGRfY2FsbGJhY2socHQsICZzeW5jX2ZlbmNlLT5jYnNbMF0uY2IsIGZl bmNlX2NoZWNrX2NiX2Z1bmMpKQorCWlmIChmZW5jZV9hZGRfY2FsbGJhY2soZmVuY2UsICZzeW5j X2ZlbmNlLT5jYnNbMF0uY2IsCisJCQkgICAgICAgZmVuY2VfY2hlY2tfY2JfZnVuYykpCiAJCWF0 b21pY19kZWMoJnN5bmNfZmVuY2UtPnN0YXR1cyk7CiAKIAlzeW5jX2ZlbmNlX2RlYnVnX2FkZChz eW5jX2ZlbmNlKTsKQEAgLTEyNCw5ICsxMTksOSBAQCBzdHJ1Y3Qgc3luY19mZW5jZSAqc3luY19m ZW5jZV9jcmVhdGVfZG1hKGNvbnN0IGNoYXIgKm5hbWUsIHN0cnVjdCBmZW5jZSAqcHQpCiB9CiBF WFBPUlRfU1lNQk9MKHN5bmNfZmVuY2VfY3JlYXRlX2RtYSk7CiAKLXN0cnVjdCBzeW5jX2ZlbmNl ICpzeW5jX2ZlbmNlX2NyZWF0ZShjb25zdCBjaGFyICpuYW1lLCBzdHJ1Y3Qgc3luY19wdCAqcHQp CitzdHJ1Y3Qgc3luY19mZW5jZSAqc3luY19mZW5jZV9jcmVhdGUoY29uc3QgY2hhciAqbmFtZSwg c3RydWN0IGZlbmNlICpmZW5jZSkKIHsKLQlyZXR1cm4gc3luY19mZW5jZV9jcmVhdGVfZG1hKG5h bWUsICZwdC0+YmFzZSk7CisJcmV0dXJuIHN5bmNfZmVuY2VfY3JlYXRlX2RtYShuYW1lLCBmZW5j ZSk7CiB9CiBFWFBPUlRfU1lNQk9MKHN5bmNfZmVuY2VfY3JlYXRlKTsKIApAQCAtMTYxLDE0ICsx NTYsMTQgQEAgdm9pZCBzeW5jX2ZlbmNlX2luc3RhbGwoc3RydWN0IHN5bmNfZmVuY2UgKnN5bmNf ZmVuY2UsIGludCBmZCkKIEVYUE9SVF9TWU1CT0woc3luY19mZW5jZV9pbnN0YWxsKTsKIAogc3Rh dGljIHZvaWQgc3luY19mZW5jZV9hZGRfcHQoc3RydWN0IHN5bmNfZmVuY2UgKnN5bmNfZmVuY2Us Ci0JCQkgICAgICBpbnQgKmksIHN0cnVjdCBmZW5jZSAqcHQpCisJCQkgICAgICBpbnQgKmksIHN0 cnVjdCBmZW5jZSAqZmVuY2UpCiB7Ci0Jc3luY19mZW5jZS0+Y2JzWyppXS5mZW5jZSA9IHB0Owor CXN5bmNfZmVuY2UtPmNic1sqaV0uZmVuY2UgPSBmZW5jZTsKIAlzeW5jX2ZlbmNlLT5jYnNbKmld LnN5bmNfZmVuY2UgPSBzeW5jX2ZlbmNlOwogCi0JaWYgKCFmZW5jZV9hZGRfY2FsbGJhY2socHQs ICZzeW5jX2ZlbmNlLT5jYnNbKmldLmNiLAorCWlmICghZmVuY2VfYWRkX2NhbGxiYWNrKGZlbmNl LCAmc3luY19mZW5jZS0+Y2JzWyppXS5jYiwKIAkJCQlmZW5jZV9jaGVja19jYl9mdW5jKSkgewot CQlmZW5jZV9nZXQocHQpOworCQlmZW5jZV9nZXQoZmVuY2UpOwogCQkoKmkpKys7CiAJfQogfQpA QCAtMzAwLDcgKzI5NSw3IEBAIGludCBzeW5jX2ZlbmNlX3dhaXQoc3RydWN0IHN5bmNfZmVuY2Ug KnN5bmNfZmVuY2UsIGxvbmcgdGltZW91dCkKIAogCXRyYWNlX3N5bmNfd2FpdChzeW5jX2ZlbmNl LCAxKTsKIAlmb3IgKGkgPSAwOyBpIDwgc3luY19mZW5jZS0+bnVtX2ZlbmNlczsgKytpKQotCQl0 cmFjZV9zeW5jX3B0KHN5bmNfZmVuY2UtPmNic1tpXS5mZW5jZSk7CisJCXRyYWNlX2ZlbmNlKHN5 bmNfZmVuY2UtPmNic1tpXS5mZW5jZSk7CiAJcmV0ID0gd2FpdF9ldmVudF9pbnRlcnJ1cHRpYmxl X3RpbWVvdXQoc3luY19mZW5jZS0+d3EsCiAJCQkJCSAgICAgICBhdG9taWNfcmVhZCgmc3luY19m ZW5jZS0+c3RhdHVzKSA8PSAwLAogCQkJCQkgICAgICAgdGltZW91dCk7CkBAIC01ODksOSArNTg0 LDkgQEAgc3RhdGljIGxvbmcgc3luY19mZW5jZV9pb2N0bF9mZW5jZV9pbmZvKHN0cnVjdCBzeW5j X2ZlbmNlICpzeW5jX2ZlbmNlLAogCWxlbiA9IHNpemVvZihzdHJ1Y3Qgc3luY19mZW5jZV9pbmZv X2RhdGEpOwogCiAJZm9yIChpID0gMDsgaSA8IHN5bmNfZmVuY2UtPm51bV9mZW5jZXM7ICsraSkg ewotCQlzdHJ1Y3QgZmVuY2UgKnB0ID0gc3luY19mZW5jZS0+Y2JzW2ldLmZlbmNlOworCQlzdHJ1 Y3QgZmVuY2UgKmZlbmNlID0gc3luY19mZW5jZS0+Y2JzW2ldLmZlbmNlOwogCi0JCXJldCA9IHN5 bmNfZmlsbF9wdF9pbmZvKHB0LCAodTggKilkYXRhICsgbGVuLCBzaXplIC0gbGVuKTsKKwkJcmV0 ID0gc3luY19maWxsX3B0X2luZm8oZmVuY2UsICh1OCAqKWRhdGEgKyBsZW4sIHNpemUgLSBsZW4p OwogCiAJCWlmIChyZXQgPCAwKQogCQkJZ290byBvdXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0 YWdpbmcvYW5kcm9pZC9zeW5jLmggYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmgKaW5k ZXggNTM2NThjYy4uZTAxMTExMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQv c3luYy5oCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuaApAQCAtMjUsMTAgKzI1 LDYgQEAKIAogc3RydWN0IHN5bmNfZmVuY2U7CiAKLXN0cnVjdCBzeW5jX3B0IHsKLQlzdHJ1Y3Qg ZmVuY2UgYmFzZTsKLX07Ci0KIHN0cnVjdCBzeW5jX2ZlbmNlX2NiIHsKIAlzdHJ1Y3QgZmVuY2Vf Y2IgY2I7CiAJc3RydWN0IGZlbmNlICpmZW5jZTsKQEAgLTg5LDIzICs4NSwxNCBAQCBzdGF0aWMg aW5saW5lIHZvaWQgc3luY19mZW5jZV93YWl0ZXJfaW5pdChzdHJ1Y3Qgc3luY19mZW5jZV93YWl0 ZXIgKndhaXRlciwKIHN0cnVjdCBmZW5jZSAqc3luY19wdF9jcmVhdGUoc3RydWN0IGZlbmNlX3Rp bWVsaW5lICpwYXJlbnQsIGludCBzaXplKTsKIAogLyoqCi0gKiBzeW5jX3B0X2ZyZWUoKSAtIGZy ZWVzIGEgc3luYyBwdAotICogQHB0OgkJc3luY19wdCB0byBmcmVlCi0gKgotICogVGhpcyBzaG91 bGQgb25seSBiZSBjYWxsZWQgb24gc3luY19wdHMgd2hpY2ggaGF2ZSBiZWVuIGNyZWF0ZWQgYnV0 Ci0gKiBub3QgYWRkZWQgdG8gYSBmZW5jZS4KLSAqLwotdm9pZCBzeW5jX3B0X2ZyZWUoc3RydWN0 IHN5bmNfcHQgKnB0KTsKLQotLyoqCiAgKiBzeW5jX2ZlbmNlX2NyZWF0ZSgpIC0gY3JlYXRlcyBh IHN5bmMgZmVuY2UKICAqIEBuYW1lOgluYW1lIG9mIGZlbmNlIHRvIGNyZWF0ZQotICogQHB0OgkJ c3luY19wdCB0byBhZGQgdG8gdGhlIGZlbmNlCisgKiBAZmVuY2U6CWZlbmNlIHRvIGFkZCB0byB0 aGUgc3luY19mZW5jZQogICoKLSAqIENyZWF0ZXMgYSBmZW5jZSBjb250YWluZyBAcHQuICBPbmNl IHRoaXMgaXMgY2FsbGVkLCB0aGUgZmVuY2UgdGFrZXMKLSAqIG93bmVyc2hpcCBvZiBAcHQuCisg KiBDcmVhdGVzIGEgZmVuY2UgY29udGFpbmcgQGZlbmNlLiAgT25jZSB0aGlzIGlzIGNhbGxlZCwg dGhlIGZlbmNlIHRha2VzCisgKiBvd25lcnNoaXAgb2YgQGZlbmNlLgogICovCi1zdHJ1Y3Qgc3lu Y19mZW5jZSAqc3luY19mZW5jZV9jcmVhdGUoY29uc3QgY2hhciAqbmFtZSwgc3RydWN0IHN5bmNf cHQgKnB0KTsKK3N0cnVjdCBzeW5jX2ZlbmNlICpzeW5jX2ZlbmNlX2NyZWF0ZShjb25zdCBjaGFy ICpuYW1lLCBzdHJ1Y3QgZmVuY2UgKmZlbmNlKTsKIAogLyoqCiAgKiBzeW5jX2ZlbmNlX2NyZWF0 ZV9kbWEoKSAtIGNyZWF0ZXMgYSBzeW5jIGZlbmNlIGZyb20gZG1hLWZlbmNlCmRpZmYgLS1naXQg YS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jX2RlYnVnLmMgYi9kcml2ZXJzL3N0YWdpbmcv YW5kcm9pZC9zeW5jX2RlYnVnLmMKaW5kZXggZjVmZDhjMy4uYjg2MDJkMiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luY19kZWJ1Zy5jCisrKyBiL2RyaXZlcnMvc3RhZ2lu Zy9hbmRyb2lkL3N5bmNfZGVidWcuYwpAQCAtODUsMzkgKzg1LDQwIEBAIHN0YXRpYyBjb25zdCBj aGFyICpzeW5jX3N0YXR1c19zdHIoaW50IHN0YXR1cykKIAlyZXR1cm4gImVycm9yIjsKIH0KIAot c3RhdGljIHZvaWQgc3luY19wcmludF9wdChzdHJ1Y3Qgc2VxX2ZpbGUgKnMsIHN0cnVjdCBmZW5j ZSAqcHQsIGJvb2wgZmVuY2UpCitzdGF0aWMgdm9pZCBzeW5jX3ByaW50X2ZlbmNlKHN0cnVjdCBz ZXFfZmlsZSAqcywgc3RydWN0IGZlbmNlICpmZW5jZSwgYm9vbCBzaG93KQogewogCWludCBzdGF0 dXMgPSAxOworCXN0cnVjdCBmZW5jZV90aW1lbGluZSAqcGFyZW50ID0gZmVuY2VfcGFyZW50KGZl bmNlKTsKIAotCWlmIChmZW5jZV9pc19zaWduYWxlZF9sb2NrZWQocHQpKQotCQlzdGF0dXMgPSBw dC0+c3RhdHVzOworCWlmIChmZW5jZV9pc19zaWduYWxlZF9sb2NrZWQoZmVuY2UpKQorCQlzdGF0 dXMgPSBmZW5jZS0+c3RhdHVzOwogCi0Jc2VxX3ByaW50ZihzLCAiICAlcyVzcHQgJXMiLAotCQkg ICBmZW5jZSAmJiBwdC0+b3BzLT5nZXRfdGltZWxpbmVfbmFtZSA/Ci0JCSAgIHB0LT5vcHMtPmdl dF90aW1lbGluZV9uYW1lKHB0KSA6ICIiLAotCQkgICBmZW5jZSA/ICJfIiA6ICIiLAorCXNlcV9w cmludGYocywgIiAgJXMlc2ZlbmNlICVzIiwKKwkJICAgc2hvdyA/IHBhcmVudC0+bmFtZSA6ICIi LAorCQkgICBzaG93ID8gIl8iIDogIiIsCiAJCSAgIHN5bmNfc3RhdHVzX3N0cihzdGF0dXMpKTsK IAogCWlmIChzdGF0dXMgPD0gMCkgewogCQlzdHJ1Y3QgdGltZXNwZWM2NCB0czY0ID0KLQkJCWt0 aW1lX3RvX3RpbWVzcGVjNjQocHQtPnRpbWVzdGFtcCk7CisJCQlrdGltZV90b190aW1lc3BlYzY0 KGZlbmNlLT50aW1lc3RhbXApOwogCiAJCXNlcV9wcmludGYocywgIkAlbGxkLiUwOWxkIiwgKHM2 NCl0czY0LnR2X3NlYywgdHM2NC50dl9uc2VjKTsKIAl9CiAKLQlpZiAoKCFmZW5jZSB8fCBwdC0+ b3BzLT50aW1lbGluZV92YWx1ZV9zdHIpICYmCi0JICAgIHB0LT5vcHMtPmZlbmNlX3ZhbHVlX3N0 cikgeworCWlmICgoIWZlbmNlIHx8IGZlbmNlLT5vcHMtPnRpbWVsaW5lX3ZhbHVlX3N0cikgJiYK KwkJZmVuY2UtPm9wcy0+ZmVuY2VfdmFsdWVfc3RyKSB7CiAJCWNoYXIgdmFsdWVbNjRdOwogCQli b29sIHN1Y2Nlc3M7CiAKLQkJcHQtPm9wcy0+ZmVuY2VfdmFsdWVfc3RyKHB0LCB2YWx1ZSwgc2l6 ZW9mKHZhbHVlKSk7CisJCWZlbmNlLT5vcHMtPmZlbmNlX3ZhbHVlX3N0cihmZW5jZSwgdmFsdWUs IHNpemVvZih2YWx1ZSkpOwogCQlzdWNjZXNzID0gc3RybGVuKHZhbHVlKTsKIAogCQlpZiAoc3Vj Y2VzcykKIAkJCXNlcV9wcmludGYocywgIjogJXMiLCB2YWx1ZSk7CiAKIAkJaWYgKHN1Y2Nlc3Mg JiYgZmVuY2UpIHsKLQkJCXB0LT5vcHMtPnRpbWVsaW5lX3ZhbHVlX3N0cihwdCwgdmFsdWUsIHNp emVvZih2YWx1ZSkpOworCQkJZmVuY2UtPm9wcy0+dGltZWxpbmVfdmFsdWVfc3RyKGZlbmNlLCB2 YWx1ZSwKKwkJCQkJCSAgICAgICBzaXplb2YodmFsdWUpKTsKIAogCQkJaWYgKHN0cmxlbih2YWx1 ZSkpCiAJCQkJc2VxX3ByaW50ZihzLCAiIC8gJXMiLCB2YWx1ZSk7CkBAIC0xNDUsOSArMTQ2LDkg QEAgc3RhdGljIHZvaWQgc3luY19wcmludF9vYmooc3RydWN0IHNlcV9maWxlICpzLCBzdHJ1Y3Qg ZmVuY2VfdGltZWxpbmUgKm9iaikKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZvYmotPmxvY2ssIGZs YWdzKTsKIAlsaXN0X2Zvcl9lYWNoKHBvcywgJm9iai0+Y2hpbGRfbGlzdF9oZWFkKSB7Ci0JCXN0 cnVjdCBzeW5jX3B0ICpwdCA9IChzdHJ1Y3Qgc3luY19wdCAqKQorCQlzdHJ1Y3QgZmVuY2UgKmZl bmNlID0KIAkJCWNvbnRhaW5lcl9vZihwb3MsIHN0cnVjdCBmZW5jZSwgY2hpbGRfbGlzdCk7Ci0J CXN5bmNfcHJpbnRfcHQocywgJnB0LT5iYXNlLCBmYWxzZSk7CisJCXN5bmNfcHJpbnRfZmVuY2Uo cywgZmVuY2UsIGZhbHNlKTsKIAl9CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmb2JqLT5sb2Nr LCBmbGFncyk7CiB9CkBAIC0xNjMsNyArMTY0LDcgQEAgc3RhdGljIHZvaWQgc3luY19wcmludF9z eW5jX2ZlbmNlKHN0cnVjdCBzZXFfZmlsZSAqcywKIAkJICAgc3luY19zdGF0dXNfc3RyKGF0b21p Y19yZWFkKCZzeW5jX2ZlbmNlLT5zdGF0dXMpKSk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgc3luY19m ZW5jZS0+bnVtX2ZlbmNlczsgKytpKSB7Ci0JCXN5bmNfcHJpbnRfcHQocywgc3luY19mZW5jZS0+ Y2JzW2ldLmZlbmNlLCB0cnVlKTsKKwkJc3luY19wcmludF9mZW5jZShzLCBzeW5jX2ZlbmNlLT5j YnNbaV0uZmVuY2UsIHRydWUpOwogCX0KIAogCXNwaW5fbG9ja19pcnFzYXZlKCZzeW5jX2ZlbmNl LT53cS5sb2NrLCBmbGFncyk7CkBAIC0yNjAsNyArMjYxLDcgQEAgc3RhdGljIGxvbmcgc3dfc3lu Y19pb2N0bF9jcmVhdGVfZmVuY2Uoc3RydWN0IHN3X3N5bmNfdGltZWxpbmUgKm9iaiwKIHsKIAlp bnQgZmQgPSBnZXRfdW51c2VkX2ZkX2ZsYWdzKE9fQ0xPRVhFQyk7CiAJaW50IGVycjsKLQlzdHJ1 Y3Qgc3luY19wdCAqcHQ7CisJc3RydWN0IGZlbmNlICpmZW5jZTsKIAlzdHJ1Y3Qgc3luY19mZW5j ZSAqc3luY19mZW5jZTsKIAlzdHJ1Y3Qgc3dfc3luY19jcmVhdGVfZmVuY2VfZGF0YSBkYXRhOwog CkBAIC0yNzIsMTYgKzI3MywxNiBAQCBzdGF0aWMgbG9uZyBzd19zeW5jX2lvY3RsX2NyZWF0ZV9m ZW5jZShzdHJ1Y3Qgc3dfc3luY190aW1lbGluZSAqb2JqLAogCQlnb3RvIGVycjsKIAl9CiAKLQlw dCA9IHN3X3N5bmNfcHRfY3JlYXRlKG9iaiwgZGF0YS52YWx1ZSk7Ci0JaWYgKCFwdCkgeworCWZl bmNlID0gc3dfc3luY19wdF9jcmVhdGUob2JqLCBkYXRhLnZhbHVlKTsKKwlpZiAoIWZlbmNlKSB7 CiAJCWVyciA9IC1FTk9NRU07CiAJCWdvdG8gZXJyOwogCX0KIAogCWRhdGEubmFtZVtzaXplb2Yo ZGF0YS5uYW1lKSAtIDFdID0gJ1wwJzsKLQlzeW5jX2ZlbmNlID0gc3luY19mZW5jZV9jcmVhdGUo ZGF0YS5uYW1lLCBwdCk7CisJc3luY19mZW5jZSA9IHN5bmNfZmVuY2VfY3JlYXRlKGRhdGEubmFt ZSwgZmVuY2UpOwogCWlmICghc3luY19mZW5jZSkgewotCQlzeW5jX3B0X2ZyZWUocHQpOworCQlm ZW5jZV9wdXQoZmVuY2UpOwogCQllcnIgPSAtRU5PTUVNOwogCQlnb3RvIGVycjsKIAl9CmRpZmYg LS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC90cmFjZS9zeW5jLmggYi9kcml2ZXJzL3N0 YWdpbmcvYW5kcm9pZC90cmFjZS9zeW5jLmgKaW5kZXggNTljMzM3Zi4uNGY2ODUxNSAxMDA2NDQK LS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvdHJhY2Uvc3luYy5oCisrKyBiL2RyaXZlcnMv c3RhZ2luZy9hbmRyb2lkL3RyYWNlL3N5bmMuaApAQCAtMjksMjAgKzI5LDIwIEBAIFRSQUNFX0VW RU5UKHN5bmNfd2FpdCwKIAkJCV9fZ2V0X3N0cihuYW1lKSwgX19lbnRyeS0+c3RhdHVzKQogKTsK IAotVFJBQ0VfRVZFTlQoc3luY19wdCwKLQlUUF9QUk9UTyhzdHJ1Y3QgZmVuY2UgKnB0KSwKK1RS QUNFX0VWRU5UKGZlbmNlLAorCVRQX1BST1RPKHN0cnVjdCBmZW5jZSAqZmVuY2UpLAogCi0JVFBf QVJHUyhwdCksCisJVFBfQVJHUyhmZW5jZSksCiAKIAlUUF9TVFJVQ1RfX2VudHJ5KAotCQlfX3N0 cmluZyh0aW1lbGluZSwgcHQtPm9wcy0+Z2V0X3RpbWVsaW5lX25hbWUocHQpKQorCQlfX3N0cmlu Zyh0aW1lbGluZSwgZmVuY2UtPm9wcy0+Z2V0X3RpbWVsaW5lX25hbWUoZmVuY2UpKQogCQlfX2Fy cmF5KGNoYXIsIHZhbHVlLCAzMikKIAkpLAogCiAJVFBfZmFzdF9hc3NpZ24oCi0JCV9fYXNzaWdu X3N0cih0aW1lbGluZSwgcHQtPm9wcy0+Z2V0X3RpbWVsaW5lX25hbWUocHQpKTsKLQkJaWYgKHB0 LT5vcHMtPmZlbmNlX3ZhbHVlX3N0cikgewotCQkJcHQtPm9wcy0+ZmVuY2VfdmFsdWVfc3RyKHB0 LCBfX2VudHJ5LT52YWx1ZSwKKwkJX19hc3NpZ25fc3RyKHRpbWVsaW5lLCBmZW5jZS0+b3BzLT5n ZXRfdGltZWxpbmVfbmFtZShmZW5jZSkpOworCQlpZiAoZmVuY2UtPm9wcy0+ZmVuY2VfdmFsdWVf c3RyKSB7CisJCQlmZW5jZS0+b3BzLT5mZW5jZV92YWx1ZV9zdHIoZmVuY2UsIF9fZW50cnktPnZh bHVlLAogCQkJCQkJCXNpemVvZihfX2VudHJ5LT52YWx1ZSkpOwogCQl9IGVsc2UgewogCQkJX19l bnRyeS0+dmFsdWVbMF0gPSAnXDAnOwotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg==