Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wd2uT-003qZv-0p for pgsql-hackers@arkaria.postgresql.org; Fri, 26 Jun 2026 09:31:42 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.96) (envelope-from ) id 1wd2uS-00AAzF-0K for pgsql-hackers@arkaria.postgresql.org; Fri, 26 Jun 2026 09:31:40 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wd2uR-00AAz4-0l for pgsql-hackers@lists.postgresql.org; Fri, 26 Jun 2026 09:31:39 +0000 Received: from mail.postgrespro.ru ([93.174.132.70]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1wd2uL-00000000Je7-2e1u for pgsql-hackers@lists.postgresql.org; Fri, 26 Jun 2026 09:31:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=postgrespro.ru; s=mx2023; t=1782466289; bh=wX2SN/Niza8LWbMFT4/Z4xTCEnXnpRK8Zs5AzfZCnuA=; h=Message-ID:Date:User-Agent:Subject:To:Cc:References:From: In-Reply-To:From; b=kQbAlp4H1YMWpgz59pu/zfxx7PvsF7XzReM3ENTsdIKV74yBn4trIypG3fzeAQWNA wVIvt+WDuY7+Hl5x50PrL3rFvAyPi596jofiwtoSQqjXasv9bu3UMh1BFtb50a331M sUsixsyyUeU3d+g1fugvlNFR0qte0S1fKNjdybCm8LhRTtMMCu/N8oRTbXkQyhuOpc xm4LIhGp8IWOVaNClYS2HsluoQGjuKs9Sw5eBJ3TTMhBj9idRGJodSIWROJxJLG9r1 JC7hd4832Vly7RDcxC7a+clwU41MEdUR5CApeIwIzT/iO147JRGIluVDoq4UKvOzHl odQ5o3m8/QPWQ== Received: from [192.168.23.100] (unknown [46.31.25.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: v.davydov@postgrespro.ru) by mail.postgrespro.ru (Postfix/465) with ESMTPSA id 85AF560EB1; Fri, 26 Jun 2026 12:31:29 +0300 (MSK) Content-Type: multipart/mixed; boundary="------------oR8maRe4mv0VVgV4qptiRJWR" Message-ID: <7b1e8353-3d0a-48a1-bac6-2ac6ca91fbde@postgrespro.ru> Date: Fri, 26 Jun 2026 12:31:27 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Deadlock detector fails to activate on a hot standby replica To: Xuneng Zhou , Fujii Masao Cc: pgsql-hackers@lists.postgresql.org References: <44c24dcf-5710-410f-b1b6-d10b315f3d51@postgrespro.ru> <12324a50-95d3-4de4-bd89-b295924b35bb@postgrespro.ru> <279402b1-7f16-43fa-9dbf-df96a93245dd@postgrespro.ru> <16cdffd4-f06c-4957-9132-1849a719f3d4@postgrespro.ru> <790719db-f518-4300-8ce7-8f168cd0af84@postgrespro.ru> Content-Language: en-US From: Vitaly Davydov In-Reply-To: X-KSMG-AntiPhishing: NotDetected X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 3.0.0.9059, bases: 2026/06/26 08:35:00 #28296902 X-KSMG-AntiVirus-Status: NotDetected, skipped X-KSMG-LinksScanning: not scanned, disabled by settings X-KSMG-Message-Action: skipped X-KSMG-Rule-ID: 1 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------oR8maRe4mv0VVgV4qptiRJWR Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Fujii-san, Xuneng Zhou, > 1) It looks that this patch is doing some refactoring around > LockBufferForCleanup. The part being touched seems flaky itself on > HEAD, should we fix the issue in the buffer side first? [1] Thank you for mentioning it. It seems, there is a conflict with the another patch due to the introduction of RegisterPinCountWaiter function, that can not be resolved automatically. I'm ok to wait for the conflicting fix to be released. It seems, our patch should be reconsidered after the conflicting patch release. > 2) buf_state &= ~BM_PIN_COUNT_WAITER in stable versions seems not > necessary to me as LockBufferForCleanup will handle the clearing for > us. It seems it was my mistake when I resolved conflicts when cherry-picking the changes from other branches. I removed this line in my recent v 6.1 attached patches. Thank you for catching it. With best regards, Vitaly --------------oR8maRe4mv0VVgV4qptiRJWR Content-Type: text/x-patch; charset=UTF-8; name="v6.1-REL_14_STABLE-0001-Fix-deadlock-detector-activation-.patch" Content-Disposition: attachment; filename*0="v6.1-REL_14_STABLE-0001-Fix-deadlock-detector-activation-.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA1Njk1M2ViNTg0NjNkODg3NTNhZDRjOTA3YTFhYTYyODA2MjBhNDRhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBWaXRhbHkgRGF2eWRvdiA8di5kYXZ5ZG92QHBvc3Rn cmVzcHJvLnJ1PgpEYXRlOiBXZWQsIDEwIEp1biAyMDI2IDEyOjEyOjU0ICswOTAwClN1Ympl Y3Q6IFtQQVRDSCB2Ni4xLVJFTF8xNF9TVEFCTEVdIEZpeCBkZWFkbG9jayBkZXRlY3RvciBh Y3RpdmF0aW9uIGluIGEKIHJlY292ZXJ5IGNvbmZsaWN0CgpXaGVuIHRoZSBzdGFydHVwIHBy b2Nlc3MgaW4gYSBkZWFkbG9jayB3aXRoIGEgYmFja2VuZCwgaXQgc2VuZHMgdGhlCnNpZ25h bCB0byB0aGUgYmFja2VuZCB0byB0cmlnZ2VyIHRoZSBkZWFkbG9jayBkZXRlY3RvciB3aGVu CnRoZSBkZWFkbG9jayB0aW1lb3V0IGlzIGVsYXBzZWQgKGRlYWRsb2NrX3RpbWVvdXQgZ3Vj KS4gRHVlIHRvIHNvbWUKb3B0aW1pemF0aW9uIGluIHRpbWVvdXQuYywgd2hlbiBzcG9udGFu ZW91cyBTSUdBTFJNIHNpZ25hbHMgYXJlCnBvc3NpYmxlLCB3aGljaCBkb2Vzbid0IHJlbGF0 ZSB0byBhbnkgZW5hYmxlZCB0aW1lb3V0LCB0aGUgZnVuY3Rpb24KUmVzb2x2ZVJlY292ZXJ5 Q29uZmxpY3RXaXRoQnVmZmVyUGluIGNhbiBuZXZlciBzZW5kIHRoZSBzaWduYWwgdG8gdGhl CmNvbmZsaWN0aW5nIGJhY2tlbmQsIGJlY2FzZSB0aGUgZGVhZGxvY2sgdGltZW91dCB3aWxs IG5ldmVyIGJlCnRyaWdnZXJlZC4KClRoZSBwYXRjaCBmaXhlcyBSZXNvbHZlUmVjb3ZlcnlD b25mbGljdFdpdGhCdWZmZXJQaW4gYnkgaWdub3JpbmcKc3BvbnRhbmVvdXMgU0lHQUxSTSBz aWduYWxzLCB0aGF0IGFyZSBwb3NzaWJsZSBpbiB0aGUgY3VycmVudAppbXBsZW1lbnRhdGlv biBvZiB0aW1lb3V0LmMgZnVuY3Rpb25hbGl0eS4KLS0tCiBzcmMvYmFja2VuZC9zdG9yYWdl L2J1ZmZlci9idWZtZ3IuYyB8IDgwICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBz cmMvYmFja2VuZC9zdG9yYWdlL2lwYy9zdGFuZGJ5LmMgICB8IDcxICsrKysrKysrKysrKysr Ky0tLS0tLS0tLS0KIHNyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmggICAgICAgIHwgIDEg KwogMyBmaWxlcyBjaGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9idWZmZXIvYnVmbWdyLmMgYi9z cmMvYmFja2VuZC9zdG9yYWdlL2J1ZmZlci9idWZtZ3IuYwppbmRleCBmNTYzNzQyYWQ0NC4u MDM3NzRlOGI1N2YgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1 Zm1nci5jCisrKyBiL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1Zm1nci5jCkBAIC0x ODM5LDYgKzE4MzksMzIgQEAgUGluQnVmZmVyX0xvY2tlZChCdWZmZXJEZXNjICpidWYpCiAJ UmVzb3VyY2VPd25lclJlbWVtYmVyQnVmZmVyKEN1cnJlbnRSZXNvdXJjZU93bmVyLCBiKTsK IH0KIAorLyoKKyAqIFJlZ2lzdGVyIHRoZSBjdXJyZW50IHByb2Nlc3MgYXMgdGhlIHBpbmNv dW50IHdhaXRlciBmb3IgYSBzaGFyZWQgYnVmZmVyLgorICoKKyAqIFRoZSBjYWxsZXIgbXVz dCBob2xkIHRoZSBidWZmZXIgaGVhZGVyIGxvY2ssIHBhc3MgdGhlIGN1cnJlbnQgYnVmZmVy IHN0YXRlCisgKiByZXR1cm5lZCBieSBMb2NrQnVmSGRyKCksIGFuZCBlbnN1cmUgdGhhdCBu byBvdGhlciBiYWNrZW5kIGlzIGFscmVhZHkKKyAqIHJlZ2lzdGVyZWQgYXMgdGhlIHdhaXRl ci4KKyAqLworc3RhdGljIHZvaWQKK1JlZ2lzdGVyUGluQ291bnRXYWl0ZXIoQnVmZmVyRGVz YyAqYnVmSGRyLCB1aW50NjQgYnVmX3N0YXRlKQoreworCUFzc2VydCgoYnVmX3N0YXRlICYg Qk1fUElOX0NPVU5UX1dBSVRFUikgPT0gMCB8fAorCQkgICBidWZIZHItPndhaXRfYmFja2Vu ZF9waWQgPT0gTXlQcm9jUGlkKTsKKworCWlmICgoYnVmX3N0YXRlICYgQk1fUElOX0NPVU5U X1dBSVRFUikgIT0gMCAmJgorCQlidWZIZHItPndhaXRfYmFja2VuZF9waWQgIT0gTXlQcm9j UGlkKQorCXsKKwkJVW5sb2NrQnVmSGRyKGJ1ZkhkciwgYnVmX3N0YXRlKTsKKwkJZWxvZyhF UlJPUiwgIm11bHRpcGxlIHByb2Nlc3NlcyBhdHRlbXB0aW5nIHRvIHdhaXQgZm9yIHBpbmNv dW50IDEiKTsKKwl9CisKKwlidWZIZHItPndhaXRfYmFja2VuZF9waWQgPSBNeVByb2NQaWQ7 CisJUGluQ291bnRXYWl0QnVmID0gYnVmSGRyOworCWJ1Zl9zdGF0ZSB8PSBCTV9QSU5fQ09V TlRfV0FJVEVSOworCVVubG9ja0J1ZkhkcihidWZIZHIsIGJ1Zl9zdGF0ZSk7Cit9CisKIC8q CiAgKiBVbnBpbkJ1ZmZlciAtLSBtYWtlIGJ1ZmZlciBhdmFpbGFibGUgZm9yIHJlcGxhY2Vt ZW50LgogICoKQEAgLTMxMTksNiArMzE0NSw1NSBAQCBCdWZmZXJHZXRMU05BdG9taWMoQnVm ZmVyIGJ1ZmZlcikKIAlyZXR1cm4gbHNuOwogfQogCisvKgorICogQnVmZmVySXNSZWFkeUZv ckNsZWFudXAKKyAqCQlSZWNoZWNrIHdoZXRoZXIgdGhlIHN0YXJ0dXAgcHJvY2VzcyBjYW4g cmV0cnkgY2xlYW51cCBsb2NrIGFjcXVpc2l0aW9uLgorICoKKyAqIFRoaXMgaXMgb25seSBm b3IgdGhlIGhvdC1zdGFuZGJ5IHBhdGggaW4gTG9ja0J1ZmZlckZvckNsZWFudXAoKSwgdmlh CisgKiBSZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4oKSwgYWZ0ZXIgUHJv Y1dhaXRGb3JTaWduYWwoKSByZXR1cm5zLgorICogVGhlIGNhbGxlciBtdXN0IGFscmVhZHkg YmUgcmVnaXN0ZXJlZCBhcyB0aGUgc2hhcmVkIGJ1ZmZlcidzCisgKiBCTV9QSU5fQ09VTlRf V0FJVEVSLgorICoKKyAqIFJldHVybnMgdHJ1ZSB3aGVuIHRoZSBjYWxsZXIgaXRzZWxmIGlz IHRoZSBvbmx5IHJlbWFpbmluZyBwaW4gaG9sZGVyLCBzbyBpdAorICogY2FuIHJldHJ5IHRh a2luZyB0aGUgY2xlYW51cCBsb2NrLiBSZXR1cm5zIGZhbHNlIGlmIG90aGVyIGJhY2tlbmRz IHN0aWxsCisgKiBwaW4gdGhlIHNoYXJlZCBidWZmZXIuIEluIHRoYXQgY2FzZSwgdGhpcyBm dW5jdGlvbiBndWFyYW50ZWVzIHRoYXQgdGhlCisgKiBjdXJyZW50IGJhY2tlbmQgcmVtYWlu cyByZWdpc3RlcmVkIGFzIHRoZSBwaW5jb3VudCB3YWl0ZXIgdG8gYmUgd29rZW4gd2hlbgor ICogdGhlIGJ1ZmZlciByZWZjb3VudCBkcm9wcyB0byAxLgorICovCitib29sCitCdWZmZXJJ c1JlYWR5Rm9yQ2xlYW51cChCdWZmZXIgYnVmZmVyKQoreworCUJ1ZmZlckRlc2MgKmJ1Zkhk cjsKKwl1aW50NjQJCWJ1Zl9zdGF0ZTsKKwl1aW50MzIJCWJ1Zl9yZWZjb3VudDsKKworCUFz c2VydChCdWZmZXJJc1ZhbGlkKGJ1ZmZlcikpOworCUFzc2VydCghQnVmZmVySXNMb2NhbChi dWZmZXIpKTsKKworCWJ1ZkhkciA9IEdldEJ1ZmZlckRlc2NyaXB0b3IoYnVmZmVyIC0gMSk7 CisJQXNzZXJ0KFBpbkNvdW50V2FpdEJ1ZiA9PSBidWZIZHIpOworCisJYnVmX3N0YXRlID0g TG9ja0J1ZkhkcihidWZIZHIpOworCWJ1Zl9yZWZjb3VudCA9IEJVRl9TVEFURV9HRVRfUkVG Q09VTlQoYnVmX3N0YXRlKTsKKwlBc3NlcnQoYnVmX3JlZmNvdW50ID4gMCk7CisJQXNzZXJ0 KChidWZfc3RhdGUgJiBCTV9QSU5fQ09VTlRfV0FJVEVSKSA9PSAwIHx8CisJCSAgIGJ1Zkhk ci0+d2FpdF9iYWNrZW5kX3BpZCA9PSBNeVByb2NQaWQpOworCisJaWYgKGJ1Zl9yZWZjb3Vu dCA9PSAxKQorCXsKKwkJVW5sb2NrQnVmSGRyKGJ1ZkhkciwgYnVmX3N0YXRlKTsKKwkJcmV0 dXJuIHRydWU7CisJfQorCisJLyoKKwkgKiBJZiBvdGhlciBwcm9jZXNzZXMgc3RpbGwgcGlu IHRoZSBidWZmZXIsIHJlZ2lzdGVyIHRoaXMgcHJvY2VzcyBhZ2FpbiBhcworCSAqIHRoZSBw aW5jb3VudCB3YWl0ZXIgdG8gd2FpdCBhZ2Fpbi4KKwkgKi8KKwlSZWdpc3RlclBpbkNvdW50 V2FpdGVyKGJ1ZkhkciwgYnVmX3N0YXRlKTsKKworCXJldHVybiBmYWxzZTsKK30KKwogLyog LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAgKgkJRHJvcFJlbEZpbGVOb2RlQnVmZmVycwogICoKQEAgLTQy MTksMTAgKzQyOTQsNyBAQCBMb2NrQnVmZmVyRm9yQ2xlYW51cChCdWZmZXIgYnVmZmVyKQog CQkJTG9ja0J1ZmZlcihidWZmZXIsIEJVRkZFUl9MT0NLX1VOTE9DSyk7CiAJCQllbG9nKEVS Uk9SLCAibXVsdGlwbGUgYmFja2VuZHMgYXR0ZW1wdGluZyB0byB3YWl0IGZvciBwaW5jb3Vu dCAxIik7CiAJCX0KLQkJYnVmSGRyLT53YWl0X2JhY2tlbmRfcGlkID0gTXlQcm9jUGlkOwot CQlQaW5Db3VudFdhaXRCdWYgPSBidWZIZHI7Ci0JCWJ1Zl9zdGF0ZSB8PSBCTV9QSU5fQ09V TlRfV0FJVEVSOwotCQlVbmxvY2tCdWZIZHIoYnVmSGRyLCBidWZfc3RhdGUpOworCQlSZWdp c3RlclBpbkNvdW50V2FpdGVyKGJ1ZkhkciwgYnVmX3N0YXRlKTsKIAkJTG9ja0J1ZmZlcihi dWZmZXIsIEJVRkZFUl9MT0NLX1VOTE9DSyk7CiAKIAkJLyogV2FpdCB0byBiZSBzaWduYWxl ZCBieSBVbnBpbkJ1ZmZlcigpICovCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9zdG9yYWdl L2lwYy9zdGFuZGJ5LmMgYi9zcmMvYmFja2VuZC9zdG9yYWdlL2lwYy9zdGFuZGJ5LmMKaW5k ZXggNDljY2NhZDliZjYuLmNiODdmMGIxZmUxIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9z dG9yYWdlL2lwYy9zdGFuZGJ5LmMKKysrIGIvc3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvc3Rh bmRieS5jCkBAIC03NDksMTQgKzc0OSwyMSBAQCBjbGVhbnVwOgogICogRGVhZGxvY2tzIGFy ZSBleHRyZW1lbHkgcmFyZSwgYW5kIHJlbGF0aXZlbHkgZXhwZW5zaXZlIHRvIGNoZWNrIGZv ciwKICAqIHNvIHdlIGRvbid0IGRvIGEgZGVhZGxvY2sgY2hlY2sgcmlnaHQgYXdheSAuLi4g b25seSBpZiB3ZSBoYXZlIGhhZCB0byB3YWl0CiAgKiBhdCBsZWFzdCBkZWFkbG9ja190aW1l b3V0LgorICoKKyAqIFRoZSBjdXJyZW50IHByb2Nlc3Mgc2hvdWxkIGJlIHRoZSB3YWl0ZXIg cHJvY2VzcyBhbmQgc2hvdWxkIGhhdmUKKyAqIHB1Ymxpc2hlZCB0aGUgd2FpdGVkIGJ1ZmZl ciB2aWEgU2V0U3RhcnR1cEJ1ZmZlclBpbldhaXRCdWZJZCgpLgogICovCiB2b2lkCiBSZXNv bHZlUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4odm9pZCkKIHsKIAlUaW1lc3RhbXBU eiBsdGltZTsKKwlpbnQJCQlidWZpZDsKIAogCUFzc2VydChJbkhvdFN0YW5kYnkpOwogCisJ YnVmaWQgPSBHZXRTdGFydHVwQnVmZmVyUGluV2FpdEJ1ZklkKCk7CisJQXNzZXJ0KGJ1Zmlk ID49IDApOworCiAJbHRpbWUgPSBHZXRTdGFuZGJ5TGltaXRUaW1lKCk7CiAKIAlpZiAoR2V0 Q3VycmVudFRpbWVzdGFtcCgpID49IGx0aW1lICYmIGx0aW1lICE9IDApCkBAIC03OTIsMzYg Kzc5OSw0OCBAQCBSZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4odm9pZCkK IAkJZW5hYmxlX3RpbWVvdXRzKHRpbWVvdXRzLCBjbnQpOwogCX0KIAotCS8qCi0JICogV2Fp dCB0byBiZSBzaWduYWxlZCBieSBVbnBpbkJ1ZmZlcigpIG9yIGZvciB0aGUgd2FpdCB0byBi ZSBpbnRlcnJ1cHRlZAotCSAqIGJ5IG9uZSBvZiB0aGUgdGltZW91dHMgZXN0YWJsaXNoZWQg YWJvdmUuCi0JICoKLQkgKiBXZSBhc3N1bWUgdGhhdCBvbmx5IFVucGluQnVmZmVyKCkgYW5k IHRoZSB0aW1lb3V0IHJlcXVlc3RzIGVzdGFibGlzaGVkCi0JICogYWJvdmUgY2FuIHdha2Ug dXMgdXAgaGVyZS4gV2FrZXVwUmVjb3ZlcnkoKSBjYWxsZWQgYnkgd2FscmVjZWl2ZXIgb3IK LQkgKiBTSUdIVVAgc2lnbmFsIGhhbmRsZXIsIGV0YyBjYW5ub3QgZG8gdGhhdCBiZWNhdXNl IGl0IHVzZXMgdGhlIGRpZmZlcmVudAotCSAqIGxhdGNoIGZyb20gdGhhdCBQcm9jV2FpdEZv clNpZ25hbCgpIHdhaXRzIG9uLgotCSAqLwotCVByb2NXYWl0Rm9yU2lnbmFsKFBHX1dBSVRf QlVGRkVSX1BJTik7Ci0KLQlpZiAoZ290X3N0YW5kYnlfZGVsYXlfdGltZW91dCkKLQkJU2Vu ZFJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKFBST0NTSUdfUkVDT1ZFUllfQ09ORkxJ Q1RfQlVGRkVSUElOKTsKLQllbHNlIGlmIChnb3Rfc3RhbmRieV9kZWFkbG9ja190aW1lb3V0 KQorCWZvciAoOzspCiAJewogCQkvKgotCQkgKiBTZW5kIG91dCBhIHJlcXVlc3QgZm9yIGhv dC1zdGFuZGJ5IGJhY2tlbmRzIHRvIGNoZWNrIHRoZW1zZWx2ZXMgZm9yCi0JCSAqIGRlYWRs b2Nrcy4KKwkJICogV2FpdCB0byBiZSBzaWduYWxlZCBieSBVbnBpbkJ1ZmZlcigpIG9yIGZv ciB0aGUgd2FpdCB0byBiZQorCQkgKiBpbnRlcnJ1cHRlZCBieSBvbmUgb2YgdGhlIHRpbWVv dXRzIGVzdGFibGlzaGVkIGFib3ZlLgogCQkgKgotCQkgKiBYWFggVGhlIHN1YnNlcXVlbnQg UmVzb2x2ZVJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKCkgd2lsbCB3YWl0Ci0JCSAq IHRvIGJlIHNpZ25hbGVkIGJ5IFVucGluQnVmZmVyKCkgYWdhaW4gYW5kIHNlbmQgYSByZXF1 ZXN0IGZvcgotCQkgKiBkZWFkbG9ja3MgY2hlY2sgaWYgZGVhZGxvY2tfdGltZW91dCBoYXBw ZW5zLiBUaGlzIGNhdXNlcyB0aGUKLQkJICogcmVxdWVzdCB0byBjb250aW51ZSB0byBiZSBz ZW50IGV2ZXJ5IGRlYWRsb2NrX3RpbWVvdXQgdW50aWwgdGhlCi0JCSAqIGJ1ZmZlciBpcyB1 bnBpbm5lZCBvciBsdGltZSBpcyByZWFjaGVkLiBUaGlzIHdvdWxkIGluY3JlYXNlIHRoZQot CQkgKiB3b3JrbG9hZCBpbiB0aGUgc3RhcnR1cCBwcm9jZXNzIGFuZCBiYWNrZW5kcy4gSW4g cHJhY3RpY2UgaXQgbWF5Ci0JCSAqIG5vdCBiZSBzbyBoYXJtZnVsIGJlY2F1c2UgdGhlIHBl cmlvZCB0aGF0IHRoZSBidWZmZXIgaXMga2VwdCBwaW5uZWQKLQkJICogaXMgYmFzaWNhbGx5 IG5vIHNvIGxvbmcuIEJ1dCB3ZSBzaG91bGQgZml4IHRoaXM/CisJCSAqIFByb2NXYWl0Rm9y U2lnbmFsKCkgY2FuIGFsc28gd2FrZSB1cCBmb3IgdW5yZWxhdGVkIHJlYXNvbnMsIHNvCisJ CSAqIHJlY2hlY2sgbGF0ZXIgd2hldGhlciBjbGVhbnVwIGNhbiBwcm9jZWVkLgorCQkgKi8K KwkJUHJvY1dhaXRGb3JTaWduYWwoUEdfV0FJVF9CVUZGRVJfUElOKTsKKworCQkvKgorCQkg KiBPbmNlIHRoZSByZWZlcmVuY2UgY291bnQgaXMgMSwgdGhlIHdhaXRlciBwcm9jZXNzIGl0 c2VsZiBpcyB0aGUKKwkJICogb25seSBiYWNrZW5kIHBpbm5pbmcgdGhlIGJ1ZmZlciBhdCB0 aGUgbW9tZW50LiBUaGVyZSBpcyBhIGNoYW5jZSB0bworCQkgKiBsb2NrIHRoZSBidWZmZXIg ZXhjbHVzaXZlbHkuCiAJCSAqLwotCQlTZW5kUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQ aW4oCi0JCQkJCQkJCQkJICBQUk9DU0lHX1JFQ09WRVJZX0NPTkZMSUNUX1NUQVJUVVBfREVB RExPQ0spOworCQlpZiAoQnVmZmVySXNSZWFkeUZvckNsZWFudXAoYnVmaWQgKyAxKSkKKwkJ CWJyZWFrOworCisJCWlmIChnb3Rfc3RhbmRieV9kZWxheV90aW1lb3V0KQorCQl7CisJCQlT ZW5kUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4oUFJPQ1NJR19SRUNPVkVSWV9DT05G TElDVF9CVUZGRVJQSU4pOworCQkJYnJlYWs7CisJCX0KKwkJZWxzZSBpZiAoZ290X3N0YW5k YnlfZGVhZGxvY2tfdGltZW91dCkKKwkJeworCQkJLyoKKwkJCSAqIFNlbmQgb3V0IGEgcmVx dWVzdCBmb3IgaG90LXN0YW5kYnkgYmFja2VuZHMgdG8gY2hlY2sgdGhlbXNlbHZlcworCQkJ ICogZm9yIGRlYWRsb2Nrcy4KKwkJCSAqCisJCQkgKiBYWFggVGhlIHN1YnNlcXVlbnQgUmVz b2x2ZVJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKCkgd2lsbAorCQkJICogd2FpdCB0 byBiZSBzaWduYWxlZCBieSBVbnBpbkJ1ZmZlcigpIGFnYWluIGFuZCBzZW5kIGEgcmVxdWVz dAorCQkJICogZm9yIGRlYWRsb2NrcyBjaGVjayBpZiBkZWFkbG9ja190aW1lb3V0IGhhcHBl bnMuIFRoaXMgY2F1c2VzCisJCQkgKiB0aGUgcmVxdWVzdCB0byBjb250aW51ZSB0byBiZSBz ZW50IGV2ZXJ5IGRlYWRsb2NrX3RpbWVvdXQgdW50aWwKKwkJCSAqIHRoZSBidWZmZXIgaXMg dW5waW5uZWQgb3IgbHRpbWUgaXMgcmVhY2hlZC4gVGhpcyB3b3VsZCBpbmNyZWFzZQorCQkJ ICogdGhlIHdvcmtsb2FkIGluIHRoZSBzdGFydHVwIHByb2Nlc3MgYW5kIGJhY2tlbmRzLiBJ biBwcmFjdGljZQorCQkJICogaXQgbWF5IG5vdCBiZSBzbyBoYXJtZnVsIGJlY2F1c2UgdGhl IHBlcmlvZCB0aGF0IHRoZSBidWZmZXIgaXMKKwkJCSAqIGtlcHQgcGlubmVkIGlzIGJhc2lj YWxseSBubyBzbyBsb25nLiBCdXQgd2Ugc2hvdWxkIGZpeCB0aGlzPworCQkJICovCisJCQlT ZW5kUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4oUFJPQ1NJR19SRUNPVkVSWV9DT05G TElDVF9TVEFSVFVQX0RFQURMT0NLKTsKKwkJCWJyZWFrOworCQl9CiAJfQogCiAJLyoKZGlm ZiAtLWdpdCBhL3NyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmggYi9zcmMvaW5jbHVkZS9z dG9yYWdlL2J1Zm1nci5oCmluZGV4IDg1Y2FhYzMyNTNkLi4zZWY1ZGM3ZTM0OSAxMDA2NDQK LS0tIGEvc3JjL2luY2x1ZGUvc3RvcmFnZS9idWZtZ3IuaAorKysgYi9zcmMvaW5jbHVkZS9z dG9yYWdlL2J1Zm1nci5oCkBAIC0yMjMsNiArMjIzLDcgQEAgZXh0ZXJuIFhMb2dSZWNQdHIg QnVmZmVyR2V0TFNOQXRvbWljKEJ1ZmZlciBidWZmZXIpOwogZXh0ZXJuIHZvaWQgUHJpbnRQ aW5uZWRCdWZzKHZvaWQpOwogI2VuZGlmCiBleHRlcm4gU2l6ZSBCdWZmZXJTaG1lbVNpemUo dm9pZCk7CitleHRlcm4gYm9vbCBCdWZmZXJJc1JlYWR5Rm9yQ2xlYW51cChCdWZmZXIgYnVm ZmVyKTsKIGV4dGVybiB2b2lkIEJ1ZmZlckdldFRhZyhCdWZmZXIgYnVmZmVyLCBSZWxGaWxl Tm9kZSAqcm5vZGUsCiAJCQkJCQkgRm9ya051bWJlciAqZm9ya251bSwgQmxvY2tOdW1iZXIg KmJsa251bSk7CiAKLS0gCjIuNDMuMAoK --------------oR8maRe4mv0VVgV4qptiRJWR Content-Type: text/x-patch; charset=UTF-8; name="v6.1-REL_15_STABLE-0001-Fix-deadlock-detector-activation-.patch" Content-Disposition: attachment; filename*0="v6.1-REL_15_STABLE-0001-Fix-deadlock-detector-activation-.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAxYjU3Y2NhYTQ4YzJhMWQ5MjU0N2MyMTJjOThkMWMyMmJjMDMyZjMzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBWaXRhbHkgRGF2eWRvdiA8di5kYXZ5ZG92QHBvc3Rn cmVzcHJvLnJ1PgpEYXRlOiBXZWQsIDEwIEp1biAyMDI2IDEyOjEyOjU0ICswOTAwClN1Ympl Y3Q6IFtQQVRDSCB2Ni4xLVJFTF8xNV9TVEFCTEVdIEZpeCBkZWFkbG9jayBkZXRlY3RvciBh Y3RpdmF0aW9uIGluIGEKIHJlY292ZXJ5IGNvbmZsaWN0CgpXaGVuIHRoZSBzdGFydHVwIHBy b2Nlc3MgaW4gYSBkZWFkbG9jayB3aXRoIGEgYmFja2VuZCwgaXQgc2VuZHMgdGhlCnNpZ25h bCB0byB0aGUgYmFja2VuZCB0byB0cmlnZ2VyIHRoZSBkZWFkbG9jayBkZXRlY3RvciB3aGVu CnRoZSBkZWFkbG9jayB0aW1lb3V0IGlzIGVsYXBzZWQgKGRlYWRsb2NrX3RpbWVvdXQgZ3Vj KS4gRHVlIHRvIHNvbWUKb3B0aW1pemF0aW9uIGluIHRpbWVvdXQuYywgd2hlbiBzcG9udGFu ZW91cyBTSUdBTFJNIHNpZ25hbHMgYXJlCnBvc3NpYmxlLCB3aGljaCBkb2Vzbid0IHJlbGF0 ZSB0byBhbnkgZW5hYmxlZCB0aW1lb3V0LCB0aGUgZnVuY3Rpb24KUmVzb2x2ZVJlY292ZXJ5 Q29uZmxpY3RXaXRoQnVmZmVyUGluIGNhbiBuZXZlciBzZW5kIHRoZSBzaWduYWwgdG8gdGhl CmNvbmZsaWN0aW5nIGJhY2tlbmQsIGJlY2FzZSB0aGUgZGVhZGxvY2sgdGltZW91dCB3aWxs IG5ldmVyIGJlCnRyaWdnZXJlZC4KClRoZSBwYXRjaCBmaXhlcyBSZXNvbHZlUmVjb3ZlcnlD b25mbGljdFdpdGhCdWZmZXJQaW4gYnkgaWdub3JpbmcKc3BvbnRhbmVvdXMgU0lHQUxSTSBz aWduYWxzLCB0aGF0IGFyZSBwb3NzaWJsZSBpbiB0aGUgY3VycmVudAppbXBsZW1lbnRhdGlv biBvZiB0aW1lb3V0LmMgZnVuY3Rpb25hbGl0eS4KLS0tCiBzcmMvYmFja2VuZC9zdG9yYWdl L2J1ZmZlci9idWZtZ3IuYyB8IDgwICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBz cmMvYmFja2VuZC9zdG9yYWdlL2lwYy9zdGFuZGJ5LmMgICB8IDcwICsrKysrKysrKysrKysr KystLS0tLS0tLS0KIHNyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmggICAgICAgIHwgIDEg KwogMyBmaWxlcyBjaGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9idWZmZXIvYnVmbWdyLmMgYi9z cmMvYmFja2VuZC9zdG9yYWdlL2J1ZmZlci9idWZtZ3IuYwppbmRleCBhMDI4MTRhOGY1MS4u MDAzNGYwOGU2NTggMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1 Zm1nci5jCisrKyBiL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1Zm1nci5jCkBAIC0x ODQ3LDYgKzE4NDcsMzIgQEAgUGluQnVmZmVyX0xvY2tlZChCdWZmZXJEZXNjICpidWYpCiAJ UmVzb3VyY2VPd25lclJlbWVtYmVyQnVmZmVyKEN1cnJlbnRSZXNvdXJjZU93bmVyLCBiKTsK IH0KIAorLyoKKyAqIFJlZ2lzdGVyIHRoZSBjdXJyZW50IHByb2Nlc3MgYXMgdGhlIHBpbmNv dW50IHdhaXRlciBmb3IgYSBzaGFyZWQgYnVmZmVyLgorICoKKyAqIFRoZSBjYWxsZXIgbXVz dCBob2xkIHRoZSBidWZmZXIgaGVhZGVyIGxvY2ssIHBhc3MgdGhlIGN1cnJlbnQgYnVmZmVy IHN0YXRlCisgKiByZXR1cm5lZCBieSBMb2NrQnVmSGRyKCksIGFuZCBlbnN1cmUgdGhhdCBu byBvdGhlciBiYWNrZW5kIGlzIGFscmVhZHkKKyAqIHJlZ2lzdGVyZWQgYXMgdGhlIHdhaXRl ci4KKyAqLworc3RhdGljIHZvaWQKK1JlZ2lzdGVyUGluQ291bnRXYWl0ZXIoQnVmZmVyRGVz YyAqYnVmSGRyLCB1aW50NjQgYnVmX3N0YXRlKQoreworCUFzc2VydCgoYnVmX3N0YXRlICYg Qk1fUElOX0NPVU5UX1dBSVRFUikgPT0gMCB8fAorCQkgICBidWZIZHItPndhaXRfYmFja2Vu ZF9wZ3Byb2NubyA9PSBNeVByb2MtPnBncHJvY25vKTsKKworCWlmICgoYnVmX3N0YXRlICYg Qk1fUElOX0NPVU5UX1dBSVRFUikgIT0gMCAmJgorCQlidWZIZHItPndhaXRfYmFja2VuZF9w Z3Byb2NubyAhPSBNeVByb2MtPnBncHJvY25vKQorCXsKKwkJVW5sb2NrQnVmSGRyKGJ1Zkhk ciwgYnVmX3N0YXRlKTsKKwkJZWxvZyhFUlJPUiwgIm11bHRpcGxlIHByb2Nlc3NlcyBhdHRl bXB0aW5nIHRvIHdhaXQgZm9yIHBpbmNvdW50IDEiKTsKKwl9CisKKwlidWZIZHItPndhaXRf YmFja2VuZF9wZ3Byb2NubyA9IE15UHJvYy0+cGdwcm9jbm87CisJUGluQ291bnRXYWl0QnVm ID0gYnVmSGRyOworCWJ1Zl9zdGF0ZSB8PSBCTV9QSU5fQ09VTlRfV0FJVEVSOworCVVubG9j a0J1ZkhkcihidWZIZHIsIGJ1Zl9zdGF0ZSk7Cit9CisKIC8qCiAgKiBVbnBpbkJ1ZmZlciAt LSBtYWtlIGJ1ZmZlciBhdmFpbGFibGUgZm9yIHJlcGxhY2VtZW50LgogICoKQEAgLTMxMDIs NiArMzEyOCw1NSBAQCBCdWZmZXJHZXRMU05BdG9taWMoQnVmZmVyIGJ1ZmZlcikKIAlyZXR1 cm4gbHNuOwogfQogCisvKgorICogQnVmZmVySXNSZWFkeUZvckNsZWFudXAKKyAqCQlSZWNo ZWNrIHdoZXRoZXIgdGhlIHN0YXJ0dXAgcHJvY2VzcyBjYW4gcmV0cnkgY2xlYW51cCBsb2Nr IGFjcXVpc2l0aW9uLgorICoKKyAqIFRoaXMgaXMgb25seSBmb3IgdGhlIGhvdC1zdGFuZGJ5 IHBhdGggaW4gTG9ja0J1ZmZlckZvckNsZWFudXAoKSwgdmlhCisgKiBSZXNvbHZlUmVjb3Zl cnlDb25mbGljdFdpdGhCdWZmZXJQaW4oKSwgYWZ0ZXIgUHJvY1dhaXRGb3JTaWduYWwoKSBy ZXR1cm5zLgorICogVGhlIGNhbGxlciBtdXN0IGFscmVhZHkgYmUgcmVnaXN0ZXJlZCBhcyB0 aGUgc2hhcmVkIGJ1ZmZlcidzCisgKiBCTV9QSU5fQ09VTlRfV0FJVEVSLgorICoKKyAqIFJl dHVybnMgdHJ1ZSB3aGVuIHRoZSBjYWxsZXIgaXRzZWxmIGlzIHRoZSBvbmx5IHJlbWFpbmlu ZyBwaW4gaG9sZGVyLCBzbyBpdAorICogY2FuIHJldHJ5IHRha2luZyB0aGUgY2xlYW51cCBs b2NrLiBSZXR1cm5zIGZhbHNlIGlmIG90aGVyIGJhY2tlbmRzIHN0aWxsCisgKiBwaW4gdGhl IHNoYXJlZCBidWZmZXIuIEluIHRoYXQgY2FzZSwgdGhpcyBmdW5jdGlvbiBndWFyYW50ZWVz IHRoYXQgdGhlCisgKiBjdXJyZW50IGJhY2tlbmQgcmVtYWlucyByZWdpc3RlcmVkIGFzIHRo ZSBwaW5jb3VudCB3YWl0ZXIgdG8gYmUgd29rZW4gd2hlbgorICogdGhlIGJ1ZmZlciByZWZj b3VudCBkcm9wcyB0byAxLgorICovCitib29sCitCdWZmZXJJc1JlYWR5Rm9yQ2xlYW51cChC dWZmZXIgYnVmZmVyKQoreworCUJ1ZmZlckRlc2MgKmJ1ZkhkcjsKKwl1aW50NjQJCWJ1Zl9z dGF0ZTsKKwl1aW50MzIJCWJ1Zl9yZWZjb3VudDsKKworCUFzc2VydChCdWZmZXJJc1ZhbGlk KGJ1ZmZlcikpOworCUFzc2VydCghQnVmZmVySXNMb2NhbChidWZmZXIpKTsKKworCWJ1Zkhk ciA9IEdldEJ1ZmZlckRlc2NyaXB0b3IoYnVmZmVyIC0gMSk7CisJQXNzZXJ0KFBpbkNvdW50 V2FpdEJ1ZiA9PSBidWZIZHIpOworCisJYnVmX3N0YXRlID0gTG9ja0J1ZkhkcihidWZIZHIp OworCWJ1Zl9yZWZjb3VudCA9IEJVRl9TVEFURV9HRVRfUkVGQ09VTlQoYnVmX3N0YXRlKTsK KwlBc3NlcnQoYnVmX3JlZmNvdW50ID4gMCk7CisJQXNzZXJ0KChidWZfc3RhdGUgJiBCTV9Q SU5fQ09VTlRfV0FJVEVSKSA9PSAwIHx8CisJCSAgIGJ1Zkhkci0+d2FpdF9iYWNrZW5kX3Bn cHJvY25vID09IE15UHJvYy0+cGdwcm9jbm8pOworCisJaWYgKGJ1Zl9yZWZjb3VudCA9PSAx KQorCXsKKwkJVW5sb2NrQnVmSGRyKGJ1ZkhkciwgYnVmX3N0YXRlKTsKKwkJcmV0dXJuIHRy dWU7CisJfQorCisJLyoKKwkgKiBJZiBvdGhlciBwcm9jZXNzZXMgc3RpbGwgcGluIHRoZSBi dWZmZXIsIHJlZ2lzdGVyIHRoaXMgcHJvY2VzcyBhZ2FpbiBhcworCSAqIHRoZSBwaW5jb3Vu dCB3YWl0ZXIgdG8gd2FpdCBhZ2Fpbi4KKwkgKi8KKwlSZWdpc3RlclBpbkNvdW50V2FpdGVy KGJ1ZkhkciwgYnVmX3N0YXRlKTsKKworCXJldHVybiBmYWxzZTsKK30KKwogLyogLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAgKgkJRHJvcFJlbEZpbGVOb2RlQnVmZmVycwogICoKQEAgLTQzNTYsMTAg KzQ0MzEsNyBAQCBMb2NrQnVmZmVyRm9yQ2xlYW51cChCdWZmZXIgYnVmZmVyKQogCQkJTG9j a0J1ZmZlcihidWZmZXIsIEJVRkZFUl9MT0NLX1VOTE9DSyk7CiAJCQllbG9nKEVSUk9SLCAi bXVsdGlwbGUgYmFja2VuZHMgYXR0ZW1wdGluZyB0byB3YWl0IGZvciBwaW5jb3VudCAxIik7 CiAJCX0KLQkJYnVmSGRyLT53YWl0X2JhY2tlbmRfcGdwcm9jbm8gPSBNeVByb2MtPnBncHJv Y25vOwotCQlQaW5Db3VudFdhaXRCdWYgPSBidWZIZHI7Ci0JCWJ1Zl9zdGF0ZSB8PSBCTV9Q SU5fQ09VTlRfV0FJVEVSOwotCQlVbmxvY2tCdWZIZHIoYnVmSGRyLCBidWZfc3RhdGUpOwor CQlSZWdpc3RlclBpbkNvdW50V2FpdGVyKGJ1ZkhkciwgYnVmX3N0YXRlKTsKIAkJTG9ja0J1 ZmZlcihidWZmZXIsIEJVRkZFUl9MT0NLX1VOTE9DSyk7CiAKIAkJLyogV2FpdCB0byBiZSBz aWduYWxlZCBieSBVbnBpbkJ1ZmZlcigpICovCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9z dG9yYWdlL2lwYy9zdGFuZGJ5LmMgYi9zcmMvYmFja2VuZC9zdG9yYWdlL2lwYy9zdGFuZGJ5 LmMKaW5kZXggYTM2ZWI4MGU5YWUuLjJiMDI5Y2RjZjEwIDEwMDY0NAotLS0gYS9zcmMvYmFj a2VuZC9zdG9yYWdlL2lwYy9zdGFuZGJ5LmMKKysrIGIvc3JjL2JhY2tlbmQvc3RvcmFnZS9p cGMvc3RhbmRieS5jCkBAIC03NTAsMTQgKzc1MCwyMSBAQCBjbGVhbnVwOgogICogRGVhZGxv Y2tzIGFyZSBleHRyZW1lbHkgcmFyZSwgYW5kIHJlbGF0aXZlbHkgZXhwZW5zaXZlIHRvIGNo ZWNrIGZvciwKICAqIHNvIHdlIGRvbid0IGRvIGEgZGVhZGxvY2sgY2hlY2sgcmlnaHQgYXdh eSAuLi4gb25seSBpZiB3ZSBoYXZlIGhhZCB0byB3YWl0CiAgKiBhdCBsZWFzdCBkZWFkbG9j a190aW1lb3V0LgorICoKKyAqIFRoZSBjdXJyZW50IHByb2Nlc3Mgc2hvdWxkIGJlIHRoZSB3 YWl0ZXIgcHJvY2VzcyBhbmQgc2hvdWxkIGhhdmUKKyAqIHB1Ymxpc2hlZCB0aGUgd2FpdGVk IGJ1ZmZlciB2aWEgU2V0U3RhcnR1cEJ1ZmZlclBpbldhaXRCdWZJZCgpLgogICovCiB2b2lk CiBSZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4odm9pZCkKIHsKIAlUaW1l c3RhbXBUeiBsdGltZTsKKwlpbnQJCQlidWZpZDsKIAogCUFzc2VydChJbkhvdFN0YW5kYnkp OwogCisJYnVmaWQgPSBHZXRTdGFydHVwQnVmZmVyUGluV2FpdEJ1ZklkKCk7CisJQXNzZXJ0 KGJ1ZmlkID49IDApOworCiAJbHRpbWUgPSBHZXRTdGFuZGJ5TGltaXRUaW1lKCk7CiAKIAlp ZiAoR2V0Q3VycmVudFRpbWVzdGFtcCgpID49IGx0aW1lICYmIGx0aW1lICE9IDApCkBAIC03 OTMsMzUgKzgwMCw0OCBAQCBSZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4o dm9pZCkKIAkJZW5hYmxlX3RpbWVvdXRzKHRpbWVvdXRzLCBjbnQpOwogCX0KIAotCS8qCi0J ICogV2FpdCB0byBiZSBzaWduYWxlZCBieSBVbnBpbkJ1ZmZlcigpIG9yIGZvciB0aGUgd2Fp dCB0byBiZSBpbnRlcnJ1cHRlZAotCSAqIGJ5IG9uZSBvZiB0aGUgdGltZW91dHMgZXN0YWJs aXNoZWQgYWJvdmUuCi0JICoKLQkgKiBXZSBhc3N1bWUgdGhhdCBvbmx5IFVucGluQnVmZmVy KCkgYW5kIHRoZSB0aW1lb3V0IHJlcXVlc3RzIGVzdGFibGlzaGVkCi0JICogYWJvdmUgY2Fu IHdha2UgdXMgdXAgaGVyZS4gV2FrZXVwUmVjb3ZlcnkoKSBjYWxsZWQgYnkgd2FscmVjZWl2 ZXIgb3IKLQkgKiBTSUdIVVAgc2lnbmFsIGhhbmRsZXIsIGV0YyBjYW5ub3QgZG8gdGhhdCBi ZWNhdXNlIGl0IHVzZXMgdGhlIGRpZmZlcmVudAotCSAqIGxhdGNoIGZyb20gdGhhdCBQcm9j V2FpdEZvclNpZ25hbCgpIHdhaXRzIG9uLgotCSAqLwotCVByb2NXYWl0Rm9yU2lnbmFsKFBH X1dBSVRfQlVGRkVSX1BJTik7Ci0KLQlpZiAoZ290X3N0YW5kYnlfZGVsYXlfdGltZW91dCkK LQkJU2VuZFJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKFBST0NTSUdfUkVDT1ZFUllf Q09ORkxJQ1RfQlVGRkVSUElOKTsKLQllbHNlIGlmIChnb3Rfc3RhbmRieV9kZWFkbG9ja190 aW1lb3V0KQorCWZvciAoOzspCiAJewogCQkvKgotCQkgKiBTZW5kIG91dCBhIHJlcXVlc3Qg Zm9yIGhvdC1zdGFuZGJ5IGJhY2tlbmRzIHRvIGNoZWNrIHRoZW1zZWx2ZXMgZm9yCi0JCSAq IGRlYWRsb2Nrcy4KKwkJICogV2FpdCB0byBiZSBzaWduYWxlZCBieSBVbnBpbkJ1ZmZlcigp IG9yIGZvciB0aGUgd2FpdCB0byBiZQorCQkgKiBpbnRlcnJ1cHRlZCBieSBvbmUgb2YgdGhl IHRpbWVvdXRzIGVzdGFibGlzaGVkIGFib3ZlLgogCQkgKgotCQkgKiBYWFggVGhlIHN1YnNl cXVlbnQgUmVzb2x2ZVJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKCkgd2lsbCB3YWl0 Ci0JCSAqIHRvIGJlIHNpZ25hbGVkIGJ5IFVucGluQnVmZmVyKCkgYWdhaW4gYW5kIHNlbmQg YSByZXF1ZXN0IGZvcgotCQkgKiBkZWFkbG9ja3MgY2hlY2sgaWYgZGVhZGxvY2tfdGltZW91 dCBoYXBwZW5zLiBUaGlzIGNhdXNlcyB0aGUKLQkJICogcmVxdWVzdCB0byBjb250aW51ZSB0 byBiZSBzZW50IGV2ZXJ5IGRlYWRsb2NrX3RpbWVvdXQgdW50aWwgdGhlCi0JCSAqIGJ1ZmZl ciBpcyB1bnBpbm5lZCBvciBsdGltZSBpcyByZWFjaGVkLiBUaGlzIHdvdWxkIGluY3JlYXNl IHRoZQotCQkgKiB3b3JrbG9hZCBpbiB0aGUgc3RhcnR1cCBwcm9jZXNzIGFuZCBiYWNrZW5k cy4gSW4gcHJhY3RpY2UgaXQgbWF5Ci0JCSAqIG5vdCBiZSBzbyBoYXJtZnVsIGJlY2F1c2Ug dGhlIHBlcmlvZCB0aGF0IHRoZSBidWZmZXIgaXMga2VwdCBwaW5uZWQKLQkJICogaXMgYmFz aWNhbGx5IG5vIHNvIGxvbmcuIEJ1dCB3ZSBzaG91bGQgZml4IHRoaXM/CisJCSAqIFByb2NX YWl0Rm9yU2lnbmFsKCkgY2FuIGFsc28gd2FrZSB1cCBmb3IgdW5yZWxhdGVkIHJlYXNvbnMs IHNvCisJCSAqIHJlY2hlY2sgbGF0ZXIgd2hldGhlciBjbGVhbnVwIGNhbiBwcm9jZWVkLgor CQkgKi8KKwkJUHJvY1dhaXRGb3JTaWduYWwoUEdfV0FJVF9CVUZGRVJfUElOKTsKKworCQkv KgorCQkgKiBPbmNlIHRoZSByZWZlcmVuY2UgY291bnQgaXMgMSwgdGhlIHdhaXRlciBwcm9j ZXNzIGl0c2VsZiBpcyB0aGUKKwkJICogb25seSBiYWNrZW5kIHBpbm5pbmcgdGhlIGJ1ZmZl ciBhdCB0aGUgbW9tZW50LiBUaGVyZSBpcyBhIGNoYW5jZSB0bworCQkgKiBsb2NrIHRoZSBi dWZmZXIgZXhjbHVzaXZlbHkuCiAJCSAqLwotCQlTZW5kUmVjb3ZlcnlDb25mbGljdFdpdGhC dWZmZXJQaW4oUFJPQ1NJR19SRUNPVkVSWV9DT05GTElDVF9TVEFSVFVQX0RFQURMT0NLKTsK KwkJaWYgKEJ1ZmZlcklzUmVhZHlGb3JDbGVhbnVwKGJ1ZmlkICsgMSkpCisJCQlicmVhazsK KworCQlpZiAoZ290X3N0YW5kYnlfZGVsYXlfdGltZW91dCkKKwkJeworCQkJU2VuZFJlY292 ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKFBST0NTSUdfUkVDT1ZFUllfQ09ORkxJQ1RfQlVG RkVSUElOKTsKKwkJCWJyZWFrOworCQl9CisJCWVsc2UgaWYgKGdvdF9zdGFuZGJ5X2RlYWRs b2NrX3RpbWVvdXQpCisJCXsKKwkJCS8qCisJCQkgKiBTZW5kIG91dCBhIHJlcXVlc3QgZm9y IGhvdC1zdGFuZGJ5IGJhY2tlbmRzIHRvIGNoZWNrIHRoZW1zZWx2ZXMKKwkJCSAqIGZvciBk ZWFkbG9ja3MuCisJCQkgKgorCQkJICogWFhYIFRoZSBzdWJzZXF1ZW50IFJlc29sdmVSZWNv dmVyeUNvbmZsaWN0V2l0aEJ1ZmZlclBpbigpIHdpbGwKKwkJCSAqIHdhaXQgdG8gYmUgc2ln bmFsZWQgYnkgVW5waW5CdWZmZXIoKSBhZ2FpbiBhbmQgc2VuZCBhIHJlcXVlc3QKKwkJCSAq IGZvciBkZWFkbG9ja3MgY2hlY2sgaWYgZGVhZGxvY2tfdGltZW91dCBoYXBwZW5zLiBUaGlz IGNhdXNlcworCQkJICogdGhlIHJlcXVlc3QgdG8gY29udGludWUgdG8gYmUgc2VudCBldmVy eSBkZWFkbG9ja190aW1lb3V0IHVudGlsCisJCQkgKiB0aGUgYnVmZmVyIGlzIHVucGlubmVk IG9yIGx0aW1lIGlzIHJlYWNoZWQuIFRoaXMgd291bGQgaW5jcmVhc2UKKwkJCSAqIHRoZSB3 b3JrbG9hZCBpbiB0aGUgc3RhcnR1cCBwcm9jZXNzIGFuZCBiYWNrZW5kcy4gSW4gcHJhY3Rp Y2UKKwkJCSAqIGl0IG1heSBub3QgYmUgc28gaGFybWZ1bCBiZWNhdXNlIHRoZSBwZXJpb2Qg dGhhdCB0aGUgYnVmZmVyIGlzCisJCQkgKiBrZXB0IHBpbm5lZCBpcyBiYXNpY2FsbHkgbm8g c28gbG9uZy4gQnV0IHdlIHNob3VsZCBmaXggdGhpcz8KKwkJCSAqLworCQkJU2VuZFJlY292 ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKFBST0NTSUdfUkVDT1ZFUllfQ09ORkxJQ1RfU1RB UlRVUF9ERUFETE9DSyk7CisJCQlicmVhazsKKwkJfQogCX0KIAogCS8qCmRpZmYgLS1naXQg YS9zcmMvaW5jbHVkZS9zdG9yYWdlL2J1Zm1nci5oIGIvc3JjL2luY2x1ZGUvc3RvcmFnZS9i dWZtZ3IuaAppbmRleCA4ZTkzZDMxNWE2Ny4uZDBhOTI1NDFlZDggMTAwNjQ0Ci0tLSBhL3Ny Yy9pbmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmgKKysrIGIvc3JjL2luY2x1ZGUvc3RvcmFnZS9i dWZtZ3IuaApAQCAtMjI2LDYgKzIyNiw3IEBAIGV4dGVybiBYTG9nUmVjUHRyIEJ1ZmZlckdl dExTTkF0b21pYyhCdWZmZXIgYnVmZmVyKTsKIGV4dGVybiB2b2lkIFByaW50UGlubmVkQnVm cyh2b2lkKTsKICNlbmRpZgogZXh0ZXJuIFNpemUgQnVmZmVyU2htZW1TaXplKHZvaWQpOwor ZXh0ZXJuIGJvb2wgQnVmZmVySXNSZWFkeUZvckNsZWFudXAoQnVmZmVyIGJ1ZmZlcik7CiBl eHRlcm4gdm9pZCBCdWZmZXJHZXRUYWcoQnVmZmVyIGJ1ZmZlciwgUmVsRmlsZU5vZGUgKnJu b2RlLAogCQkJCQkJIEZvcmtOdW1iZXIgKmZvcmtudW0sIEJsb2NrTnVtYmVyICpibGtudW0p OwogCi0tIAoyLjQzLjAKCg== --------------oR8maRe4mv0VVgV4qptiRJWR Content-Type: text/x-patch; charset=UTF-8; name="v6.1-REL_16_STABLE-0001-Fix-deadlock-detector-activation-.patch" Content-Disposition: attachment; filename*0="v6.1-REL_16_STABLE-0001-Fix-deadlock-detector-activation-.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA2ZGNlNmMwOGU1ZGVmYWJhYzkyNzRkNzI3YmQ3NThmM2EzNjc1ZGFhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBWaXRhbHkgRGF2eWRvdiA8di5kYXZ5ZG92QHBvc3Rn cmVzcHJvLnJ1PgpEYXRlOiBXZWQsIDEwIEp1biAyMDI2IDEyOjEyOjU0ICswOTAwClN1Ympl Y3Q6IFtQQVRDSCB2Ni4xLVJFTF8xNl9TVEFCTEVdIEZpeCBkZWFkbG9jayBkZXRlY3RvciBh Y3RpdmF0aW9uIGluIGEKIHJlY292ZXJ5IGNvbmZsaWN0CgpXaGVuIHRoZSBzdGFydHVwIHBy b2Nlc3MgaW4gYSBkZWFkbG9jayB3aXRoIGEgYmFja2VuZCwgaXQgc2VuZHMgdGhlCnNpZ25h bCB0byB0aGUgYmFja2VuZCB0byB0cmlnZ2VyIHRoZSBkZWFkbG9jayBkZXRlY3RvciB3aGVu CnRoZSBkZWFkbG9jayB0aW1lb3V0IGlzIGVsYXBzZWQgKGRlYWRsb2NrX3RpbWVvdXQgZ3Vj KS4gRHVlIHRvIHNvbWUKb3B0aW1pemF0aW9uIGluIHRpbWVvdXQuYywgd2hlbiBzcG9udGFu ZW91cyBTSUdBTFJNIHNpZ25hbHMgYXJlCnBvc3NpYmxlLCB3aGljaCBkb2Vzbid0IHJlbGF0 ZSB0byBhbnkgZW5hYmxlZCB0aW1lb3V0LCB0aGUgZnVuY3Rpb24KUmVzb2x2ZVJlY292ZXJ5 Q29uZmxpY3RXaXRoQnVmZmVyUGluIGNhbiBuZXZlciBzZW5kIHRoZSBzaWduYWwgdG8gdGhl CmNvbmZsaWN0aW5nIGJhY2tlbmQsIGJlY2FzZSB0aGUgZGVhZGxvY2sgdGltZW91dCB3aWxs IG5ldmVyIGJlCnRyaWdnZXJlZC4KClRoZSBwYXRjaCBmaXhlcyBSZXNvbHZlUmVjb3ZlcnlD b25mbGljdFdpdGhCdWZmZXJQaW4gYnkgaWdub3JpbmcKc3BvbnRhbmVvdXMgU0lHQUxSTSBz aWduYWxzLCB0aGF0IGFyZSBwb3NzaWJsZSBpbiB0aGUgY3VycmVudAppbXBsZW1lbnRhdGlv biBvZiB0aW1lb3V0LmMgZnVuY3Rpb25hbGl0eS4KLS0tCiBzcmMvYmFja2VuZC9zdG9yYWdl L2J1ZmZlci9idWZtZ3IuYyB8IDgwICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBz cmMvYmFja2VuZC9zdG9yYWdlL2lwYy9zdGFuZGJ5LmMgICB8IDcwICsrKysrKysrKysrKysr KystLS0tLS0tLS0KIHNyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmggICAgICAgIHwgIDEg KwogMyBmaWxlcyBjaGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9idWZmZXIvYnVmbWdyLmMgYi9z cmMvYmFja2VuZC9zdG9yYWdlL2J1ZmZlci9idWZtZ3IuYwppbmRleCBlZjE0NzkxZTJkYS4u Mzg1Y2EwOWJiZTYgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1 Zm1nci5jCisrKyBiL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1Zm1nci5jCkBAIC0y Mzc2LDYgKzIzNzYsMzIgQEAgUGluQnVmZmVyX0xvY2tlZChCdWZmZXJEZXNjICpidWYpCiAJ UmVzb3VyY2VPd25lclJlbWVtYmVyQnVmZmVyKEN1cnJlbnRSZXNvdXJjZU93bmVyLCBiKTsK IH0KIAorLyoKKyAqIFJlZ2lzdGVyIHRoZSBjdXJyZW50IHByb2Nlc3MgYXMgdGhlIHBpbmNv dW50IHdhaXRlciBmb3IgYSBzaGFyZWQgYnVmZmVyLgorICoKKyAqIFRoZSBjYWxsZXIgbXVz dCBob2xkIHRoZSBidWZmZXIgaGVhZGVyIGxvY2ssIHBhc3MgdGhlIGN1cnJlbnQgYnVmZmVy IHN0YXRlCisgKiByZXR1cm5lZCBieSBMb2NrQnVmSGRyKCksIGFuZCBlbnN1cmUgdGhhdCBu byBvdGhlciBiYWNrZW5kIGlzIGFscmVhZHkKKyAqIHJlZ2lzdGVyZWQgYXMgdGhlIHdhaXRl ci4KKyAqLworc3RhdGljIHZvaWQKK1JlZ2lzdGVyUGluQ291bnRXYWl0ZXIoQnVmZmVyRGVz YyAqYnVmSGRyLCB1aW50NjQgYnVmX3N0YXRlKQoreworCUFzc2VydCgoYnVmX3N0YXRlICYg Qk1fUElOX0NPVU5UX1dBSVRFUikgPT0gMCB8fAorCQkgICBidWZIZHItPndhaXRfYmFja2Vu ZF9wZ3Byb2NubyA9PSBNeVByb2MtPnBncHJvY25vKTsKKworCWlmICgoYnVmX3N0YXRlICYg Qk1fUElOX0NPVU5UX1dBSVRFUikgIT0gMCAmJgorCQlidWZIZHItPndhaXRfYmFja2VuZF9w Z3Byb2NubyAhPSBNeVByb2MtPnBncHJvY25vKQorCXsKKwkJVW5sb2NrQnVmSGRyKGJ1Zkhk ciwgYnVmX3N0YXRlKTsKKwkJZWxvZyhFUlJPUiwgIm11bHRpcGxlIHByb2Nlc3NlcyBhdHRl bXB0aW5nIHRvIHdhaXQgZm9yIHBpbmNvdW50IDEiKTsKKwl9CisKKwlidWZIZHItPndhaXRf YmFja2VuZF9wZ3Byb2NubyA9IE15UHJvYy0+cGdwcm9jbm87CisJUGluQ291bnRXYWl0QnVm ID0gYnVmSGRyOworCWJ1Zl9zdGF0ZSB8PSBCTV9QSU5fQ09VTlRfV0FJVEVSOworCVVubG9j a0J1ZkhkcihidWZIZHIsIGJ1Zl9zdGF0ZSk7Cit9CisKIC8qCiAgKiBVbnBpbkJ1ZmZlciAt LSBtYWtlIGJ1ZmZlciBhdmFpbGFibGUgZm9yIHJlcGxhY2VtZW50LgogICoKQEAgLTM2NDAs NiArMzY2Niw1NSBAQCBCdWZmZXJHZXRMU05BdG9taWMoQnVmZmVyIGJ1ZmZlcikKIAlyZXR1 cm4gbHNuOwogfQogCisvKgorICogQnVmZmVySXNSZWFkeUZvckNsZWFudXAKKyAqCQlSZWNo ZWNrIHdoZXRoZXIgdGhlIHN0YXJ0dXAgcHJvY2VzcyBjYW4gcmV0cnkgY2xlYW51cCBsb2Nr IGFjcXVpc2l0aW9uLgorICoKKyAqIFRoaXMgaXMgb25seSBmb3IgdGhlIGhvdC1zdGFuZGJ5 IHBhdGggaW4gTG9ja0J1ZmZlckZvckNsZWFudXAoKSwgdmlhCisgKiBSZXNvbHZlUmVjb3Zl cnlDb25mbGljdFdpdGhCdWZmZXJQaW4oKSwgYWZ0ZXIgUHJvY1dhaXRGb3JTaWduYWwoKSBy ZXR1cm5zLgorICogVGhlIGNhbGxlciBtdXN0IGFscmVhZHkgYmUgcmVnaXN0ZXJlZCBhcyB0 aGUgc2hhcmVkIGJ1ZmZlcidzCisgKiBCTV9QSU5fQ09VTlRfV0FJVEVSLgorICoKKyAqIFJl dHVybnMgdHJ1ZSB3aGVuIHRoZSBjYWxsZXIgaXRzZWxmIGlzIHRoZSBvbmx5IHJlbWFpbmlu ZyBwaW4gaG9sZGVyLCBzbyBpdAorICogY2FuIHJldHJ5IHRha2luZyB0aGUgY2xlYW51cCBs b2NrLiBSZXR1cm5zIGZhbHNlIGlmIG90aGVyIGJhY2tlbmRzIHN0aWxsCisgKiBwaW4gdGhl IHNoYXJlZCBidWZmZXIuIEluIHRoYXQgY2FzZSwgdGhpcyBmdW5jdGlvbiBndWFyYW50ZWVz IHRoYXQgdGhlCisgKiBjdXJyZW50IGJhY2tlbmQgcmVtYWlucyByZWdpc3RlcmVkIGFzIHRo ZSBwaW5jb3VudCB3YWl0ZXIgdG8gYmUgd29rZW4gd2hlbgorICogdGhlIGJ1ZmZlciByZWZj b3VudCBkcm9wcyB0byAxLgorICovCitib29sCitCdWZmZXJJc1JlYWR5Rm9yQ2xlYW51cChC dWZmZXIgYnVmZmVyKQoreworCUJ1ZmZlckRlc2MgKmJ1ZkhkcjsKKwl1aW50NjQJCWJ1Zl9z dGF0ZTsKKwl1aW50MzIJCWJ1Zl9yZWZjb3VudDsKKworCUFzc2VydChCdWZmZXJJc1ZhbGlk KGJ1ZmZlcikpOworCUFzc2VydCghQnVmZmVySXNMb2NhbChidWZmZXIpKTsKKworCWJ1Zkhk ciA9IEdldEJ1ZmZlckRlc2NyaXB0b3IoYnVmZmVyIC0gMSk7CisJQXNzZXJ0KFBpbkNvdW50 V2FpdEJ1ZiA9PSBidWZIZHIpOworCisJYnVmX3N0YXRlID0gTG9ja0J1ZkhkcihidWZIZHIp OworCWJ1Zl9yZWZjb3VudCA9IEJVRl9TVEFURV9HRVRfUkVGQ09VTlQoYnVmX3N0YXRlKTsK KwlBc3NlcnQoYnVmX3JlZmNvdW50ID4gMCk7CisJQXNzZXJ0KChidWZfc3RhdGUgJiBCTV9Q SU5fQ09VTlRfV0FJVEVSKSA9PSAwIHx8CisJCSAgIGJ1Zkhkci0+d2FpdF9iYWNrZW5kX3Bn cHJvY25vID09IE15UHJvYy0+cGdwcm9jbm8pOworCisJaWYgKGJ1Zl9yZWZjb3VudCA9PSAx KQorCXsKKwkJVW5sb2NrQnVmSGRyKGJ1ZkhkciwgYnVmX3N0YXRlKTsKKwkJcmV0dXJuIHRy dWU7CisJfQorCisJLyoKKwkgKiBJZiBvdGhlciBwcm9jZXNzZXMgc3RpbGwgcGluIHRoZSBi dWZmZXIsIHJlZ2lzdGVyIHRoaXMgcHJvY2VzcyBhZ2FpbiBhcworCSAqIHRoZSBwaW5jb3Vu dCB3YWl0ZXIgdG8gd2FpdCBhZ2Fpbi4KKwkgKi8KKwlSZWdpc3RlclBpbkNvdW50V2FpdGVy KGJ1ZkhkciwgYnVmX3N0YXRlKTsKKworCXJldHVybiBmYWxzZTsKK30KKwogLyogLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAgKgkJRHJvcFJlbGF0aW9uQnVmZmVycwogICoKQEAgLTQ5MTcsMTAgKzQ5 OTIsNyBAQCBMb2NrQnVmZmVyRm9yQ2xlYW51cChCdWZmZXIgYnVmZmVyKQogCQkJTG9ja0J1 ZmZlcihidWZmZXIsIEJVRkZFUl9MT0NLX1VOTE9DSyk7CiAJCQllbG9nKEVSUk9SLCAibXVs dGlwbGUgYmFja2VuZHMgYXR0ZW1wdGluZyB0byB3YWl0IGZvciBwaW5jb3VudCAxIik7CiAJ CX0KLQkJYnVmSGRyLT53YWl0X2JhY2tlbmRfcGdwcm9jbm8gPSBNeVByb2MtPnBncHJvY25v OwotCQlQaW5Db3VudFdhaXRCdWYgPSBidWZIZHI7Ci0JCWJ1Zl9zdGF0ZSB8PSBCTV9QSU5f Q09VTlRfV0FJVEVSOwotCQlVbmxvY2tCdWZIZHIoYnVmSGRyLCBidWZfc3RhdGUpOworCQlS ZWdpc3RlclBpbkNvdW50V2FpdGVyKGJ1ZkhkciwgYnVmX3N0YXRlKTsKIAkJTG9ja0J1ZmZl cihidWZmZXIsIEJVRkZFUl9MT0NLX1VOTE9DSyk7CiAKIAkJLyogV2FpdCB0byBiZSBzaWdu YWxlZCBieSBVbnBpbkJ1ZmZlcigpICovCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9zdG9y YWdlL2lwYy9zdGFuZGJ5LmMgYi9zcmMvYmFja2VuZC9zdG9yYWdlL2lwYy9zdGFuZGJ5LmMK aW5kZXggM2JkYzVmN2ZiNmMuLmQ3MWZlNjNkOTliIDEwMDY0NAotLS0gYS9zcmMvYmFja2Vu ZC9zdG9yYWdlL2lwYy9zdGFuZGJ5LmMKKysrIGIvc3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMv c3RhbmRieS5jCkBAIC03ODgsMTQgKzc4OCwyMSBAQCBjbGVhbnVwOgogICogRGVhZGxvY2tz IGFyZSBleHRyZW1lbHkgcmFyZSwgYW5kIHJlbGF0aXZlbHkgZXhwZW5zaXZlIHRvIGNoZWNr IGZvciwKICAqIHNvIHdlIGRvbid0IGRvIGEgZGVhZGxvY2sgY2hlY2sgcmlnaHQgYXdheSAu Li4gb25seSBpZiB3ZSBoYXZlIGhhZCB0byB3YWl0CiAgKiBhdCBsZWFzdCBkZWFkbG9ja190 aW1lb3V0LgorICoKKyAqIFRoZSBjdXJyZW50IHByb2Nlc3Mgc2hvdWxkIGJlIHRoZSB3YWl0 ZXIgcHJvY2VzcyBhbmQgc2hvdWxkIGhhdmUKKyAqIHB1Ymxpc2hlZCB0aGUgd2FpdGVkIGJ1 ZmZlciB2aWEgU2V0U3RhcnR1cEJ1ZmZlclBpbldhaXRCdWZJZCgpLgogICovCiB2b2lkCiBS ZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4odm9pZCkKIHsKIAlUaW1lc3Rh bXBUeiBsdGltZTsKKwlpbnQJCQlidWZpZDsKIAogCUFzc2VydChJbkhvdFN0YW5kYnkpOwog CisJYnVmaWQgPSBHZXRTdGFydHVwQnVmZmVyUGluV2FpdEJ1ZklkKCk7CisJQXNzZXJ0KGJ1 ZmlkID49IDApOworCiAJbHRpbWUgPSBHZXRTdGFuZGJ5TGltaXRUaW1lKCk7CiAKIAlpZiAo R2V0Q3VycmVudFRpbWVzdGFtcCgpID49IGx0aW1lICYmIGx0aW1lICE9IDApCkBAIC04MzEs MzUgKzgzOCw0OCBAQCBSZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4odm9p ZCkKIAkJZW5hYmxlX3RpbWVvdXRzKHRpbWVvdXRzLCBjbnQpOwogCX0KIAotCS8qCi0JICog V2FpdCB0byBiZSBzaWduYWxlZCBieSBVbnBpbkJ1ZmZlcigpIG9yIGZvciB0aGUgd2FpdCB0 byBiZSBpbnRlcnJ1cHRlZAotCSAqIGJ5IG9uZSBvZiB0aGUgdGltZW91dHMgZXN0YWJsaXNo ZWQgYWJvdmUuCi0JICoKLQkgKiBXZSBhc3N1bWUgdGhhdCBvbmx5IFVucGluQnVmZmVyKCkg YW5kIHRoZSB0aW1lb3V0IHJlcXVlc3RzIGVzdGFibGlzaGVkCi0JICogYWJvdmUgY2FuIHdh a2UgdXMgdXAgaGVyZS4gV2FrZXVwUmVjb3ZlcnkoKSBjYWxsZWQgYnkgd2FscmVjZWl2ZXIg b3IKLQkgKiBTSUdIVVAgc2lnbmFsIGhhbmRsZXIsIGV0YyBjYW5ub3QgZG8gdGhhdCBiZWNh dXNlIGl0IHVzZXMgdGhlIGRpZmZlcmVudAotCSAqIGxhdGNoIGZyb20gdGhhdCBQcm9jV2Fp dEZvclNpZ25hbCgpIHdhaXRzIG9uLgotCSAqLwotCVByb2NXYWl0Rm9yU2lnbmFsKFBHX1dB SVRfQlVGRkVSX1BJTik7Ci0KLQlpZiAoZ290X3N0YW5kYnlfZGVsYXlfdGltZW91dCkKLQkJ U2VuZFJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKFBST0NTSUdfUkVDT1ZFUllfQ09O RkxJQ1RfQlVGRkVSUElOKTsKLQllbHNlIGlmIChnb3Rfc3RhbmRieV9kZWFkbG9ja190aW1l b3V0KQorCWZvciAoOzspCiAJewogCQkvKgotCQkgKiBTZW5kIG91dCBhIHJlcXVlc3QgZm9y IGhvdC1zdGFuZGJ5IGJhY2tlbmRzIHRvIGNoZWNrIHRoZW1zZWx2ZXMgZm9yCi0JCSAqIGRl YWRsb2Nrcy4KKwkJICogV2FpdCB0byBiZSBzaWduYWxlZCBieSBVbnBpbkJ1ZmZlcigpIG9y IGZvciB0aGUgd2FpdCB0byBiZQorCQkgKiBpbnRlcnJ1cHRlZCBieSBvbmUgb2YgdGhlIHRp bWVvdXRzIGVzdGFibGlzaGVkIGFib3ZlLgogCQkgKgotCQkgKiBYWFggVGhlIHN1YnNlcXVl bnQgUmVzb2x2ZVJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKCkgd2lsbCB3YWl0Ci0J CSAqIHRvIGJlIHNpZ25hbGVkIGJ5IFVucGluQnVmZmVyKCkgYWdhaW4gYW5kIHNlbmQgYSBy ZXF1ZXN0IGZvcgotCQkgKiBkZWFkbG9ja3MgY2hlY2sgaWYgZGVhZGxvY2tfdGltZW91dCBo YXBwZW5zLiBUaGlzIGNhdXNlcyB0aGUKLQkJICogcmVxdWVzdCB0byBjb250aW51ZSB0byBi ZSBzZW50IGV2ZXJ5IGRlYWRsb2NrX3RpbWVvdXQgdW50aWwgdGhlCi0JCSAqIGJ1ZmZlciBp cyB1bnBpbm5lZCBvciBsdGltZSBpcyByZWFjaGVkLiBUaGlzIHdvdWxkIGluY3JlYXNlIHRo ZQotCQkgKiB3b3JrbG9hZCBpbiB0aGUgc3RhcnR1cCBwcm9jZXNzIGFuZCBiYWNrZW5kcy4g SW4gcHJhY3RpY2UgaXQgbWF5Ci0JCSAqIG5vdCBiZSBzbyBoYXJtZnVsIGJlY2F1c2UgdGhl IHBlcmlvZCB0aGF0IHRoZSBidWZmZXIgaXMga2VwdCBwaW5uZWQKLQkJICogaXMgYmFzaWNh bGx5IG5vIHNvIGxvbmcuIEJ1dCB3ZSBzaG91bGQgZml4IHRoaXM/CisJCSAqIFByb2NXYWl0 Rm9yU2lnbmFsKCkgY2FuIGFsc28gd2FrZSB1cCBmb3IgdW5yZWxhdGVkIHJlYXNvbnMsIHNv CisJCSAqIHJlY2hlY2sgbGF0ZXIgd2hldGhlciBjbGVhbnVwIGNhbiBwcm9jZWVkLgorCQkg Ki8KKwkJUHJvY1dhaXRGb3JTaWduYWwoUEdfV0FJVF9CVUZGRVJfUElOKTsKKworCQkvKgor CQkgKiBPbmNlIHRoZSByZWZlcmVuY2UgY291bnQgaXMgMSwgdGhlIHdhaXRlciBwcm9jZXNz IGl0c2VsZiBpcyB0aGUKKwkJICogb25seSBiYWNrZW5kIHBpbm5pbmcgdGhlIGJ1ZmZlciBh dCB0aGUgbW9tZW50LiBUaGVyZSBpcyBhIGNoYW5jZSB0bworCQkgKiBsb2NrIHRoZSBidWZm ZXIgZXhjbHVzaXZlbHkuCiAJCSAqLwotCQlTZW5kUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZm ZXJQaW4oUFJPQ1NJR19SRUNPVkVSWV9DT05GTElDVF9TVEFSVFVQX0RFQURMT0NLKTsKKwkJ aWYgKEJ1ZmZlcklzUmVhZHlGb3JDbGVhbnVwKGJ1ZmlkICsgMSkpCisJCQlicmVhazsKKwor CQlpZiAoZ290X3N0YW5kYnlfZGVsYXlfdGltZW91dCkKKwkJeworCQkJU2VuZFJlY292ZXJ5 Q29uZmxpY3RXaXRoQnVmZmVyUGluKFBST0NTSUdfUkVDT1ZFUllfQ09ORkxJQ1RfQlVGRkVS UElOKTsKKwkJCWJyZWFrOworCQl9CisJCWVsc2UgaWYgKGdvdF9zdGFuZGJ5X2RlYWRsb2Nr X3RpbWVvdXQpCisJCXsKKwkJCS8qCisJCQkgKiBTZW5kIG91dCBhIHJlcXVlc3QgZm9yIGhv dC1zdGFuZGJ5IGJhY2tlbmRzIHRvIGNoZWNrIHRoZW1zZWx2ZXMKKwkJCSAqIGZvciBkZWFk bG9ja3MuCisJCQkgKgorCQkJICogWFhYIFRoZSBzdWJzZXF1ZW50IFJlc29sdmVSZWNvdmVy eUNvbmZsaWN0V2l0aEJ1ZmZlclBpbigpIHdpbGwKKwkJCSAqIHdhaXQgdG8gYmUgc2lnbmFs ZWQgYnkgVW5waW5CdWZmZXIoKSBhZ2FpbiBhbmQgc2VuZCBhIHJlcXVlc3QKKwkJCSAqIGZv ciBkZWFkbG9ja3MgY2hlY2sgaWYgZGVhZGxvY2tfdGltZW91dCBoYXBwZW5zLiBUaGlzIGNh dXNlcworCQkJICogdGhlIHJlcXVlc3QgdG8gY29udGludWUgdG8gYmUgc2VudCBldmVyeSBk ZWFkbG9ja190aW1lb3V0IHVudGlsCisJCQkgKiB0aGUgYnVmZmVyIGlzIHVucGlubmVkIG9y IGx0aW1lIGlzIHJlYWNoZWQuIFRoaXMgd291bGQgaW5jcmVhc2UKKwkJCSAqIHRoZSB3b3Jr bG9hZCBpbiB0aGUgc3RhcnR1cCBwcm9jZXNzIGFuZCBiYWNrZW5kcy4gSW4gcHJhY3RpY2UK KwkJCSAqIGl0IG1heSBub3QgYmUgc28gaGFybWZ1bCBiZWNhdXNlIHRoZSBwZXJpb2QgdGhh dCB0aGUgYnVmZmVyIGlzCisJCQkgKiBrZXB0IHBpbm5lZCBpcyBiYXNpY2FsbHkgbm8gc28g bG9uZy4gQnV0IHdlIHNob3VsZCBmaXggdGhpcz8KKwkJCSAqLworCQkJU2VuZFJlY292ZXJ5 Q29uZmxpY3RXaXRoQnVmZmVyUGluKFBST0NTSUdfUkVDT1ZFUllfQ09ORkxJQ1RfU1RBUlRV UF9ERUFETE9DSyk7CisJCQlicmVhazsKKwkJfQogCX0KIAogCS8qCmRpZmYgLS1naXQgYS9z cmMvaW5jbHVkZS9zdG9yYWdlL2J1Zm1nci5oIGIvc3JjL2luY2x1ZGUvc3RvcmFnZS9idWZt Z3IuaAppbmRleCAxNjY1MjRjNTBlMC4uMTZlMDZjYzkxNzUgMTAwNjQ0Ci0tLSBhL3NyYy9p bmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmgKKysrIGIvc3JjL2luY2x1ZGUvc3RvcmFnZS9idWZt Z3IuaApAQCAtMjM2LDYgKzIzNiw3IEBAIGV4dGVybiBYTG9nUmVjUHRyIEJ1ZmZlckdldExT TkF0b21pYyhCdWZmZXIgYnVmZmVyKTsKICNpZmRlZiBOT1RfVVNFRAogZXh0ZXJuIHZvaWQg UHJpbnRQaW5uZWRCdWZzKHZvaWQpOwogI2VuZGlmCitleHRlcm4gYm9vbCBCdWZmZXJJc1Jl YWR5Rm9yQ2xlYW51cChCdWZmZXIgYnVmZmVyKTsKIGV4dGVybiB2b2lkIEJ1ZmZlckdldFRh ZyhCdWZmZXIgYnVmZmVyLCBSZWxGaWxlTG9jYXRvciAqcmxvY2F0b3IsCiAJCQkJCQkgRm9y a051bWJlciAqZm9ya251bSwgQmxvY2tOdW1iZXIgKmJsa251bSk7CiAKLS0gCjIuNDMuMAoK --------------oR8maRe4mv0VVgV4qptiRJWR Content-Type: text/x-patch; charset=UTF-8; name="v6.1-REL_17_STABLE-0001-Fix-deadlock-detector-activation-.patch" Content-Disposition: attachment; filename*0="v6.1-REL_17_STABLE-0001-Fix-deadlock-detector-activation-.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAxY2NmOWY5YzZkZjMyZjE5ZGRhNjQwNDk5YWEwMWI1ODllZmUxYjUzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBWaXRhbHkgRGF2eWRvdiA8di5kYXZ5ZG92QHBvc3Rn cmVzcHJvLnJ1PgpEYXRlOiBXZWQsIDEwIEp1biAyMDI2IDEyOjEyOjU0ICswOTAwClN1Ympl Y3Q6IFtQQVRDSCB2Ni4xLVJFTF8xN19TVEFCTEVdIEZpeCBkZWFkbG9jayBkZXRlY3RvciBh Y3RpdmF0aW9uIGluIGEKIHJlY292ZXJ5IGNvbmZsaWN0CgpXaGVuIHRoZSBzdGFydHVwIHBy b2Nlc3MgaW4gYSBkZWFkbG9jayB3aXRoIGEgYmFja2VuZCwgaXQgc2VuZHMgdGhlCnNpZ25h bCB0byB0aGUgYmFja2VuZCB0byB0cmlnZ2VyIHRoZSBkZWFkbG9jayBkZXRlY3RvciB3aGVu CnRoZSBkZWFkbG9jayB0aW1lb3V0IGlzIGVsYXBzZWQgKGRlYWRsb2NrX3RpbWVvdXQgZ3Vj KS4gRHVlIHRvIHNvbWUKb3B0aW1pemF0aW9uIGluIHRpbWVvdXQuYywgd2hlbiBzcG9udGFu ZW91cyBTSUdBTFJNIHNpZ25hbHMgYXJlCnBvc3NpYmxlLCB3aGljaCBkb2Vzbid0IHJlbGF0 ZSB0byBhbnkgZW5hYmxlZCB0aW1lb3V0LCB0aGUgZnVuY3Rpb24KUmVzb2x2ZVJlY292ZXJ5 Q29uZmxpY3RXaXRoQnVmZmVyUGluIGNhbiBuZXZlciBzZW5kIHRoZSBzaWduYWwgdG8gdGhl CmNvbmZsaWN0aW5nIGJhY2tlbmQsIGJlY2FzZSB0aGUgZGVhZGxvY2sgdGltZW91dCB3aWxs IG5ldmVyIGJlCnRyaWdnZXJlZC4KClRoZSBwYXRjaCBmaXhlcyBSZXNvbHZlUmVjb3ZlcnlD b25mbGljdFdpdGhCdWZmZXJQaW4gYnkgaWdub3JpbmcKc3BvbnRhbmVvdXMgU0lHQUxSTSBz aWduYWxzLCB0aGF0IGFyZSBwb3NzaWJsZSBpbiB0aGUgY3VycmVudAppbXBsZW1lbnRhdGlv biBvZiB0aW1lb3V0LmMgZnVuY3Rpb25hbGl0eS4KLS0tCiBzcmMvYmFja2VuZC9zdG9yYWdl L2J1ZmZlci9idWZtZ3IuYyB8IDgwICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBz cmMvYmFja2VuZC9zdG9yYWdlL2lwYy9zdGFuZGJ5LmMgICB8IDcwICsrKysrKysrKysrKysr KystLS0tLS0tLS0KIHNyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmggICAgICAgIHwgIDEg KwogMyBmaWxlcyBjaGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9idWZmZXIvYnVmbWdyLmMgYi9z cmMvYmFja2VuZC9zdG9yYWdlL2J1ZmZlci9idWZtZ3IuYwppbmRleCAxZjJiYmNmMjRiMC4u OTFmMDA3NzI2ZTIgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1 Zm1nci5jCisrKyBiL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1Zm1nci5jCkBAIC0y ODAxLDYgKzI4MDEsMzIgQEAgUGluQnVmZmVyX0xvY2tlZChCdWZmZXJEZXNjICpidWYpCiAJ UmVzb3VyY2VPd25lclJlbWVtYmVyQnVmZmVyKEN1cnJlbnRSZXNvdXJjZU93bmVyLCBiKTsK IH0KIAorLyoKKyAqIFJlZ2lzdGVyIHRoZSBjdXJyZW50IHByb2Nlc3MgYXMgdGhlIHBpbmNv dW50IHdhaXRlciBmb3IgYSBzaGFyZWQgYnVmZmVyLgorICoKKyAqIFRoZSBjYWxsZXIgbXVz dCBob2xkIHRoZSBidWZmZXIgaGVhZGVyIGxvY2ssIHBhc3MgdGhlIGN1cnJlbnQgYnVmZmVy IHN0YXRlCisgKiByZXR1cm5lZCBieSBMb2NrQnVmSGRyKCksIGFuZCBlbnN1cmUgdGhhdCBu byBvdGhlciBiYWNrZW5kIGlzIGFscmVhZHkKKyAqIHJlZ2lzdGVyZWQgYXMgdGhlIHdhaXRl ci4KKyAqLworc3RhdGljIHZvaWQKK1JlZ2lzdGVyUGluQ291bnRXYWl0ZXIoQnVmZmVyRGVz YyAqYnVmSGRyLCB1aW50NjQgYnVmX3N0YXRlKQoreworCUFzc2VydCgoYnVmX3N0YXRlICYg Qk1fUElOX0NPVU5UX1dBSVRFUikgPT0gMCB8fAorCQkgICBidWZIZHItPndhaXRfYmFja2Vu ZF9wZ3Byb2NubyA9PSBNeVByb2NOdW1iZXIpOworCisJaWYgKChidWZfc3RhdGUgJiBCTV9Q SU5fQ09VTlRfV0FJVEVSKSAhPSAwICYmCisJCWJ1Zkhkci0+d2FpdF9iYWNrZW5kX3BncHJv Y25vICE9IE15UHJvY051bWJlcikKKwl7CisJCVVubG9ja0J1ZkhkcihidWZIZHIsIGJ1Zl9z dGF0ZSk7CisJCWVsb2coRVJST1IsICJtdWx0aXBsZSBwcm9jZXNzZXMgYXR0ZW1wdGluZyB0 byB3YWl0IGZvciBwaW5jb3VudCAxIik7CisJfQorCisJYnVmSGRyLT53YWl0X2JhY2tlbmRf cGdwcm9jbm8gPSBNeVByb2NOdW1iZXI7CisJUGluQ291bnRXYWl0QnVmID0gYnVmSGRyOwor CWJ1Zl9zdGF0ZSB8PSBCTV9QSU5fQ09VTlRfV0FJVEVSOworCVVubG9ja0J1ZkhkcihidWZI ZHIsIGJ1Zl9zdGF0ZSk7Cit9CisKIC8qCiAgKiBVbnBpbkJ1ZmZlciAtLSBtYWtlIGJ1ZmZl ciBhdmFpbGFibGUgZm9yIHJlcGxhY2VtZW50LgogICoKQEAgLTQwNzIsNiArNDA5OCw1NSBA QCBCdWZmZXJHZXRMU05BdG9taWMoQnVmZmVyIGJ1ZmZlcikKIAlyZXR1cm4gbHNuOwogfQog CisvKgorICogQnVmZmVySXNSZWFkeUZvckNsZWFudXAKKyAqCQlSZWNoZWNrIHdoZXRoZXIg dGhlIHN0YXJ0dXAgcHJvY2VzcyBjYW4gcmV0cnkgY2xlYW51cCBsb2NrIGFjcXVpc2l0aW9u LgorICoKKyAqIFRoaXMgaXMgb25seSBmb3IgdGhlIGhvdC1zdGFuZGJ5IHBhdGggaW4gTG9j a0J1ZmZlckZvckNsZWFudXAoKSwgdmlhCisgKiBSZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdp dGhCdWZmZXJQaW4oKSwgYWZ0ZXIgUHJvY1dhaXRGb3JTaWduYWwoKSByZXR1cm5zLgorICog VGhlIGNhbGxlciBtdXN0IGFscmVhZHkgYmUgcmVnaXN0ZXJlZCBhcyB0aGUgc2hhcmVkIGJ1 ZmZlcidzCisgKiBCTV9QSU5fQ09VTlRfV0FJVEVSLgorICoKKyAqIFJldHVybnMgdHJ1ZSB3 aGVuIHRoZSBjYWxsZXIgaXRzZWxmIGlzIHRoZSBvbmx5IHJlbWFpbmluZyBwaW4gaG9sZGVy LCBzbyBpdAorICogY2FuIHJldHJ5IHRha2luZyB0aGUgY2xlYW51cCBsb2NrLiBSZXR1cm5z IGZhbHNlIGlmIG90aGVyIGJhY2tlbmRzIHN0aWxsCisgKiBwaW4gdGhlIHNoYXJlZCBidWZm ZXIuIEluIHRoYXQgY2FzZSwgdGhpcyBmdW5jdGlvbiBndWFyYW50ZWVzIHRoYXQgdGhlCisg KiBjdXJyZW50IGJhY2tlbmQgcmVtYWlucyByZWdpc3RlcmVkIGFzIHRoZSBwaW5jb3VudCB3 YWl0ZXIgdG8gYmUgd29rZW4gd2hlbgorICogdGhlIGJ1ZmZlciByZWZjb3VudCBkcm9wcyB0 byAxLgorICovCitib29sCitCdWZmZXJJc1JlYWR5Rm9yQ2xlYW51cChCdWZmZXIgYnVmZmVy KQoreworCUJ1ZmZlckRlc2MgKmJ1ZkhkcjsKKwl1aW50NjQJCWJ1Zl9zdGF0ZTsKKwl1aW50 MzIJCWJ1Zl9yZWZjb3VudDsKKworCUFzc2VydChCdWZmZXJJc1ZhbGlkKGJ1ZmZlcikpOwor CUFzc2VydCghQnVmZmVySXNMb2NhbChidWZmZXIpKTsKKworCWJ1ZkhkciA9IEdldEJ1ZmZl ckRlc2NyaXB0b3IoYnVmZmVyIC0gMSk7CisJQXNzZXJ0KFBpbkNvdW50V2FpdEJ1ZiA9PSBi dWZIZHIpOworCisJYnVmX3N0YXRlID0gTG9ja0J1ZkhkcihidWZIZHIpOworCWJ1Zl9yZWZj b3VudCA9IEJVRl9TVEFURV9HRVRfUkVGQ09VTlQoYnVmX3N0YXRlKTsKKwlBc3NlcnQoYnVm X3JlZmNvdW50ID4gMCk7CisJQXNzZXJ0KChidWZfc3RhdGUgJiBCTV9QSU5fQ09VTlRfV0FJ VEVSKSA9PSAwIHx8CisJCSAgIGJ1Zkhkci0+d2FpdF9iYWNrZW5kX3BncHJvY25vID09IE15 UHJvY051bWJlcik7CisKKwlpZiAoYnVmX3JlZmNvdW50ID09IDEpCisJeworCQlVbmxvY2tC dWZIZHIoYnVmSGRyLCBidWZfc3RhdGUpOworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwkvKgor CSAqIElmIG90aGVyIHByb2Nlc3NlcyBzdGlsbCBwaW4gdGhlIGJ1ZmZlciwgcmVnaXN0ZXIg dGhpcyBwcm9jZXNzIGFnYWluIGFzCisJICogdGhlIHBpbmNvdW50IHdhaXRlciB0byB3YWl0 IGFnYWluLgorCSAqLworCVJlZ2lzdGVyUGluQ291bnRXYWl0ZXIoYnVmSGRyLCBidWZfc3Rh dGUpOworCisJcmV0dXJuIGZhbHNlOworfQorCiAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAqCQlE cm9wUmVsYXRpb25CdWZmZXJzCiAgKgpAQCAtNTM0MiwxMCArNTQxNyw3IEBAIExvY2tCdWZm ZXJGb3JDbGVhbnVwKEJ1ZmZlciBidWZmZXIpCiAJCQlMb2NrQnVmZmVyKGJ1ZmZlciwgQlVG RkVSX0xPQ0tfVU5MT0NLKTsKIAkJCWVsb2coRVJST1IsICJtdWx0aXBsZSBiYWNrZW5kcyBh dHRlbXB0aW5nIHRvIHdhaXQgZm9yIHBpbmNvdW50IDEiKTsKIAkJfQotCQlidWZIZHItPndh aXRfYmFja2VuZF9wZ3Byb2NubyA9IE15UHJvY051bWJlcjsKLQkJUGluQ291bnRXYWl0QnVm ID0gYnVmSGRyOwotCQlidWZfc3RhdGUgfD0gQk1fUElOX0NPVU5UX1dBSVRFUjsKLQkJVW5s b2NrQnVmSGRyKGJ1ZkhkciwgYnVmX3N0YXRlKTsKKwkJUmVnaXN0ZXJQaW5Db3VudFdhaXRl cihidWZIZHIsIGJ1Zl9zdGF0ZSk7CiAJCUxvY2tCdWZmZXIoYnVmZmVyLCBCVUZGRVJfTE9D S19VTkxPQ0spOwogCiAJCS8qIFdhaXQgdG8gYmUgc2lnbmFsZWQgYnkgVW5waW5CdWZmZXIo KSAqLwpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvc3RhbmRieS5jIGIv c3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvc3RhbmRieS5jCmluZGV4IDg3MjY3OWNhNDQ3Li41 YmFjNWU4ZTM1MSAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvc3RhbmRi eS5jCisrKyBiL3NyYy9iYWNrZW5kL3N0b3JhZ2UvaXBjL3N0YW5kYnkuYwpAQCAtNzg3LDE0 ICs3ODcsMjEgQEAgY2xlYW51cDoKICAqIERlYWRsb2NrcyBhcmUgZXh0cmVtZWx5IHJhcmUs IGFuZCByZWxhdGl2ZWx5IGV4cGVuc2l2ZSB0byBjaGVjayBmb3IsCiAgKiBzbyB3ZSBkb24n dCBkbyBhIGRlYWRsb2NrIGNoZWNrIHJpZ2h0IGF3YXkgLi4uIG9ubHkgaWYgd2UgaGF2ZSBo YWQgdG8gd2FpdAogICogYXQgbGVhc3QgZGVhZGxvY2tfdGltZW91dC4KKyAqCisgKiBUaGUg Y3VycmVudCBwcm9jZXNzIHNob3VsZCBiZSB0aGUgd2FpdGVyIHByb2Nlc3MgYW5kIHNob3Vs ZCBoYXZlCisgKiBwdWJsaXNoZWQgdGhlIHdhaXRlZCBidWZmZXIgdmlhIFNldFN0YXJ0dXBC dWZmZXJQaW5XYWl0QnVmSWQoKS4KICAqLwogdm9pZAogUmVzb2x2ZVJlY292ZXJ5Q29uZmxp Y3RXaXRoQnVmZmVyUGluKHZvaWQpCiB7CiAJVGltZXN0YW1wVHogbHRpbWU7CisJaW50CQkJ YnVmaWQ7CiAKIAlBc3NlcnQoSW5Ib3RTdGFuZGJ5KTsKIAorCWJ1ZmlkID0gR2V0U3RhcnR1 cEJ1ZmZlclBpbldhaXRCdWZJZCgpOworCUFzc2VydChidWZpZCA+PSAwKTsKKwogCWx0aW1l ID0gR2V0U3RhbmRieUxpbWl0VGltZSgpOwogCiAJaWYgKEdldEN1cnJlbnRUaW1lc3RhbXAo KSA+PSBsdGltZSAmJiBsdGltZSAhPSAwKQpAQCAtODMwLDM1ICs4MzcsNDggQEAgUmVzb2x2 ZVJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKHZvaWQpCiAJCWVuYWJsZV90aW1lb3V0 cyh0aW1lb3V0cywgY250KTsKIAl9CiAKLQkvKgotCSAqIFdhaXQgdG8gYmUgc2lnbmFsZWQg YnkgVW5waW5CdWZmZXIoKSBvciBmb3IgdGhlIHdhaXQgdG8gYmUgaW50ZXJydXB0ZWQKLQkg KiBieSBvbmUgb2YgdGhlIHRpbWVvdXRzIGVzdGFibGlzaGVkIGFib3ZlLgotCSAqCi0JICog V2UgYXNzdW1lIHRoYXQgb25seSBVbnBpbkJ1ZmZlcigpIGFuZCB0aGUgdGltZW91dCByZXF1 ZXN0cyBlc3RhYmxpc2hlZAotCSAqIGFib3ZlIGNhbiB3YWtlIHVzIHVwIGhlcmUuIFdha2V1 cFJlY292ZXJ5KCkgY2FsbGVkIGJ5IHdhbHJlY2VpdmVyIG9yCi0JICogU0lHSFVQIHNpZ25h bCBoYW5kbGVyLCBldGMgY2Fubm90IGRvIHRoYXQgYmVjYXVzZSBpdCB1c2VzIHRoZSBkaWZm ZXJlbnQKLQkgKiBsYXRjaCBmcm9tIHRoYXQgUHJvY1dhaXRGb3JTaWduYWwoKSB3YWl0cyBv bi4KLQkgKi8KLQlQcm9jV2FpdEZvclNpZ25hbChXQUlUX0VWRU5UX0JVRkZFUl9QSU4pOwot Ci0JaWYgKGdvdF9zdGFuZGJ5X2RlbGF5X3RpbWVvdXQpCi0JCVNlbmRSZWNvdmVyeUNvbmZs aWN0V2l0aEJ1ZmZlclBpbihQUk9DU0lHX1JFQ09WRVJZX0NPTkZMSUNUX0JVRkZFUlBJTik7 Ci0JZWxzZSBpZiAoZ290X3N0YW5kYnlfZGVhZGxvY2tfdGltZW91dCkKKwlmb3IgKDs7KQog CXsKIAkJLyoKLQkJICogU2VuZCBvdXQgYSByZXF1ZXN0IGZvciBob3Qtc3RhbmRieSBiYWNr ZW5kcyB0byBjaGVjayB0aGVtc2VsdmVzIGZvcgotCQkgKiBkZWFkbG9ja3MuCisJCSAqIFdh aXQgdG8gYmUgc2lnbmFsZWQgYnkgVW5waW5CdWZmZXIoKSBvciBmb3IgdGhlIHdhaXQgdG8g YmUKKwkJICogaW50ZXJydXB0ZWQgYnkgb25lIG9mIHRoZSB0aW1lb3V0cyBlc3RhYmxpc2hl ZCBhYm92ZS4KIAkJICoKLQkJICogWFhYIFRoZSBzdWJzZXF1ZW50IFJlc29sdmVSZWNvdmVy eUNvbmZsaWN0V2l0aEJ1ZmZlclBpbigpIHdpbGwgd2FpdAotCQkgKiB0byBiZSBzaWduYWxl ZCBieSBVbnBpbkJ1ZmZlcigpIGFnYWluIGFuZCBzZW5kIGEgcmVxdWVzdCBmb3IKLQkJICog ZGVhZGxvY2tzIGNoZWNrIGlmIGRlYWRsb2NrX3RpbWVvdXQgaGFwcGVucy4gVGhpcyBjYXVz ZXMgdGhlCi0JCSAqIHJlcXVlc3QgdG8gY29udGludWUgdG8gYmUgc2VudCBldmVyeSBkZWFk bG9ja190aW1lb3V0IHVudGlsIHRoZQotCQkgKiBidWZmZXIgaXMgdW5waW5uZWQgb3IgbHRp bWUgaXMgcmVhY2hlZC4gVGhpcyB3b3VsZCBpbmNyZWFzZSB0aGUKLQkJICogd29ya2xvYWQg aW4gdGhlIHN0YXJ0dXAgcHJvY2VzcyBhbmQgYmFja2VuZHMuIEluIHByYWN0aWNlIGl0IG1h eQotCQkgKiBub3QgYmUgc28gaGFybWZ1bCBiZWNhdXNlIHRoZSBwZXJpb2QgdGhhdCB0aGUg YnVmZmVyIGlzIGtlcHQgcGlubmVkCi0JCSAqIGlzIGJhc2ljYWxseSBubyBzbyBsb25nLiBC dXQgd2Ugc2hvdWxkIGZpeCB0aGlzPworCQkgKiBQcm9jV2FpdEZvclNpZ25hbCgpIGNhbiBh bHNvIHdha2UgdXAgZm9yIHVucmVsYXRlZCByZWFzb25zLCBzbworCQkgKiByZWNoZWNrIGxh dGVyIHdoZXRoZXIgY2xlYW51cCBjYW4gcHJvY2VlZC4KKwkJICovCisJCVByb2NXYWl0Rm9y U2lnbmFsKFdBSVRfRVZFTlRfQlVGRkVSX1BJTik7CisKKwkJLyoKKwkJICogT25jZSB0aGUg cmVmZXJlbmNlIGNvdW50IGlzIDEsIHRoZSB3YWl0ZXIgcHJvY2VzcyBpdHNlbGYgaXMgdGhl CisJCSAqIG9ubHkgYmFja2VuZCBwaW5uaW5nIHRoZSBidWZmZXIgYXQgdGhlIG1vbWVudC4g VGhlcmUgaXMgYSBjaGFuY2UgdG8KKwkJICogbG9jayB0aGUgYnVmZmVyIGV4Y2x1c2l2ZWx5 LgogCQkgKi8KLQkJU2VuZFJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKFBST0NTSUdf UkVDT1ZFUllfQ09ORkxJQ1RfU1RBUlRVUF9ERUFETE9DSyk7CisJCWlmIChCdWZmZXJJc1Jl YWR5Rm9yQ2xlYW51cChidWZpZCArIDEpKQorCQkJYnJlYWs7CisKKwkJaWYgKGdvdF9zdGFu ZGJ5X2RlbGF5X3RpbWVvdXQpCisJCXsKKwkJCVNlbmRSZWNvdmVyeUNvbmZsaWN0V2l0aEJ1 ZmZlclBpbihQUk9DU0lHX1JFQ09WRVJZX0NPTkZMSUNUX0JVRkZFUlBJTik7CisJCQlicmVh azsKKwkJfQorCQllbHNlIGlmIChnb3Rfc3RhbmRieV9kZWFkbG9ja190aW1lb3V0KQorCQl7 CisJCQkvKgorCQkJICogU2VuZCBvdXQgYSByZXF1ZXN0IGZvciBob3Qtc3RhbmRieSBiYWNr ZW5kcyB0byBjaGVjayB0aGVtc2VsdmVzCisJCQkgKiBmb3IgZGVhZGxvY2tzLgorCQkJICoK KwkJCSAqIFhYWCBUaGUgc3Vic2VxdWVudCBSZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdpdGhC dWZmZXJQaW4oKSB3aWxsCisJCQkgKiB3YWl0IHRvIGJlIHNpZ25hbGVkIGJ5IFVucGluQnVm ZmVyKCkgYWdhaW4gYW5kIHNlbmQgYSByZXF1ZXN0CisJCQkgKiBmb3IgZGVhZGxvY2tzIGNo ZWNrIGlmIGRlYWRsb2NrX3RpbWVvdXQgaGFwcGVucy4gVGhpcyBjYXVzZXMKKwkJCSAqIHRo ZSByZXF1ZXN0IHRvIGNvbnRpbnVlIHRvIGJlIHNlbnQgZXZlcnkgZGVhZGxvY2tfdGltZW91 dCB1bnRpbAorCQkJICogdGhlIGJ1ZmZlciBpcyB1bnBpbm5lZCBvciBsdGltZSBpcyByZWFj aGVkLiBUaGlzIHdvdWxkIGluY3JlYXNlCisJCQkgKiB0aGUgd29ya2xvYWQgaW4gdGhlIHN0 YXJ0dXAgcHJvY2VzcyBhbmQgYmFja2VuZHMuIEluIHByYWN0aWNlCisJCQkgKiBpdCBtYXkg bm90IGJlIHNvIGhhcm1mdWwgYmVjYXVzZSB0aGUgcGVyaW9kIHRoYXQgdGhlIGJ1ZmZlciBp cworCQkJICoga2VwdCBwaW5uZWQgaXMgYmFzaWNhbGx5IG5vIHNvIGxvbmcuIEJ1dCB3ZSBz aG91bGQgZml4IHRoaXM/CisJCQkgKi8KKwkJCVNlbmRSZWNvdmVyeUNvbmZsaWN0V2l0aEJ1 ZmZlclBpbihQUk9DU0lHX1JFQ09WRVJZX0NPTkZMSUNUX1NUQVJUVVBfREVBRExPQ0spOwor CQkJYnJlYWs7CisJCX0KIAl9CiAKIAkvKgpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvc3Rv cmFnZS9idWZtZ3IuaCBiL3NyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmgKaW5kZXggMDlj NDNkZDljNzIuLmQwZDI2ZWY1ZjY1IDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9zdG9yYWdl L2J1Zm1nci5oCisrKyBiL3NyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmgKQEAgLTI4Niw2 ICsyODYsNyBAQCBleHRlcm4gWExvZ1JlY1B0ciBCdWZmZXJHZXRMU05BdG9taWMoQnVmZmVy IGJ1ZmZlcik7CiAjaWZkZWYgTk9UX1VTRUQKIGV4dGVybiB2b2lkIFByaW50UGlubmVkQnVm cyh2b2lkKTsKICNlbmRpZgorZXh0ZXJuIGJvb2wgQnVmZmVySXNSZWFkeUZvckNsZWFudXAo QnVmZmVyIGJ1ZmZlcik7CiBleHRlcm4gdm9pZCBCdWZmZXJHZXRUYWcoQnVmZmVyIGJ1ZmZl ciwgUmVsRmlsZUxvY2F0b3IgKnJsb2NhdG9yLAogCQkJCQkJIEZvcmtOdW1iZXIgKmZvcmtu dW0sIEJsb2NrTnVtYmVyICpibGtudW0pOwogCi0tIAoyLjQzLjAKCg== --------------oR8maRe4mv0VVgV4qptiRJWR Content-Type: text/x-patch; charset=UTF-8; name="v6.1-REL_18_STABLE-0001-Fix-deadlock-detector-activation-.patch" Content-Disposition: attachment; filename*0="v6.1-REL_18_STABLE-0001-Fix-deadlock-detector-activation-.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBhYWQzNjQ1YzM4ZDJiNjE5YzJjMzZjNWI2YTRiYmYxOThkZTZhMmU3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBWaXRhbHkgRGF2eWRvdiA8di5kYXZ5ZG92QHBvc3Rn cmVzcHJvLnJ1PgpEYXRlOiBXZWQsIDEwIEp1biAyMDI2IDEyOjEyOjU0ICswOTAwClN1Ympl Y3Q6IFtQQVRDSCB2Ni4xLVJFTF8xOF9TVEFCTEVdIEZpeCBkZWFkbG9jayBkZXRlY3RvciBh Y3RpdmF0aW9uIGluIGEKIHJlY292ZXJ5IGNvbmZsaWN0CgpXaGVuIHRoZSBzdGFydHVwIHBy b2Nlc3MgaW4gYSBkZWFkbG9jayB3aXRoIGEgYmFja2VuZCwgaXQgc2VuZHMgdGhlCnNpZ25h bCB0byB0aGUgYmFja2VuZCB0byB0cmlnZ2VyIHRoZSBkZWFkbG9jayBkZXRlY3RvciB3aGVu CnRoZSBkZWFkbG9jayB0aW1lb3V0IGlzIGVsYXBzZWQgKGRlYWRsb2NrX3RpbWVvdXQgZ3Vj KS4gRHVlIHRvIHNvbWUKb3B0aW1pemF0aW9uIGluIHRpbWVvdXQuYywgd2hlbiBzcG9udGFu ZW91cyBTSUdBTFJNIHNpZ25hbHMgYXJlCnBvc3NpYmxlLCB3aGljaCBkb2Vzbid0IHJlbGF0 ZSB0byBhbnkgZW5hYmxlZCB0aW1lb3V0LCB0aGUgZnVuY3Rpb24KUmVzb2x2ZVJlY292ZXJ5 Q29uZmxpY3RXaXRoQnVmZmVyUGluIGNhbiBuZXZlciBzZW5kIHRoZSBzaWduYWwgdG8gdGhl CmNvbmZsaWN0aW5nIGJhY2tlbmQsIGJlY2FzZSB0aGUgZGVhZGxvY2sgdGltZW91dCB3aWxs IG5ldmVyIGJlCnRyaWdnZXJlZC4KClRoZSBwYXRjaCBmaXhlcyBSZXNvbHZlUmVjb3ZlcnlD b25mbGljdFdpdGhCdWZmZXJQaW4gYnkgaWdub3JpbmcKc3BvbnRhbmVvdXMgU0lHQUxSTSBz aWduYWxzLCB0aGF0IGFyZSBwb3NzaWJsZSBpbiB0aGUgY3VycmVudAppbXBsZW1lbnRhdGlv biBvZiB0aW1lb3V0LmMgZnVuY3Rpb25hbGl0eS4KLS0tCiBzcmMvYmFja2VuZC9zdG9yYWdl L2J1ZmZlci9idWZtZ3IuYyB8IDgwICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBz cmMvYmFja2VuZC9zdG9yYWdlL2lwYy9zdGFuZGJ5LmMgICB8IDcwICsrKysrKysrKysrKysr KystLS0tLS0tLS0KIHNyYy9pbmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmggICAgICAgIHwgIDEg KwogMyBmaWxlcyBjaGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9idWZmZXIvYnVmbWdyLmMgYi9z cmMvYmFja2VuZC9zdG9yYWdlL2J1ZmZlci9idWZtZ3IuYwppbmRleCAyN2ZkN2U5NzIwYS4u NmU3OTIzMzBjZWUgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1 Zm1nci5jCisrKyBiL3NyYy9iYWNrZW5kL3N0b3JhZ2UvYnVmZmVyL2J1Zm1nci5jCkBAIC0z MjU4LDYgKzMyNTgsMzIgQEAgV2FrZVBpbkNvdW50V2FpdGVyKEJ1ZmZlckRlc2MgKmJ1ZikK IAkJVW5sb2NrQnVmSGRyKGJ1ZiwgYnVmX3N0YXRlKTsKIH0KIAorLyoKKyAqIFJlZ2lzdGVy IHRoZSBjdXJyZW50IHByb2Nlc3MgYXMgdGhlIHBpbmNvdW50IHdhaXRlciBmb3IgYSBzaGFy ZWQgYnVmZmVyLgorICoKKyAqIFRoZSBjYWxsZXIgbXVzdCBob2xkIHRoZSBidWZmZXIgaGVh ZGVyIGxvY2ssIHBhc3MgdGhlIGN1cnJlbnQgYnVmZmVyIHN0YXRlCisgKiByZXR1cm5lZCBi eSBMb2NrQnVmSGRyKCksIGFuZCBlbnN1cmUgdGhhdCBubyBvdGhlciBiYWNrZW5kIGlzIGFs cmVhZHkKKyAqIHJlZ2lzdGVyZWQgYXMgdGhlIHdhaXRlci4KKyAqLworc3RhdGljIHZvaWQK K1JlZ2lzdGVyUGluQ291bnRXYWl0ZXIoQnVmZmVyRGVzYyAqYnVmSGRyLCB1aW50NjQgYnVm X3N0YXRlKQoreworCUFzc2VydCgoYnVmX3N0YXRlICYgQk1fUElOX0NPVU5UX1dBSVRFUikg PT0gMCB8fAorCQkgICBidWZIZHItPndhaXRfYmFja2VuZF9wZ3Byb2NubyA9PSBNeVByb2NO dW1iZXIpOworCisJaWYgKChidWZfc3RhdGUgJiBCTV9QSU5fQ09VTlRfV0FJVEVSKSAhPSAw ICYmCisJCWJ1Zkhkci0+d2FpdF9iYWNrZW5kX3BncHJvY25vICE9IE15UHJvY051bWJlcikK Kwl7CisJCVVubG9ja0J1ZkhkcihidWZIZHIsIGJ1Zl9zdGF0ZSk7CisJCWVsb2coRVJST1Is ICJtdWx0aXBsZSBwcm9jZXNzZXMgYXR0ZW1wdGluZyB0byB3YWl0IGZvciBwaW5jb3VudCAx Iik7CisJfQorCisJYnVmSGRyLT53YWl0X2JhY2tlbmRfcGdwcm9jbm8gPSBNeVByb2NOdW1i ZXI7CisJUGluQ291bnRXYWl0QnVmID0gYnVmSGRyOworCWJ1Zl9zdGF0ZSB8PSBCTV9QSU5f Q09VTlRfV0FJVEVSOworCVVubG9ja0J1ZkhkcihidWZIZHIsIGJ1Zl9zdGF0ZSk7Cit9CisK IC8qCiAgKiBVbnBpbkJ1ZmZlciAtLSBtYWtlIGJ1ZmZlciBhdmFpbGFibGUgZm9yIHJlcGxh Y2VtZW50LgogICoKQEAgLTQ1MTcsNiArNDU0Myw1NSBAQCBCdWZmZXJHZXRMU05BdG9taWMo QnVmZmVyIGJ1ZmZlcikKIAlyZXR1cm4gbHNuOwogfQogCisvKgorICogQnVmZmVySXNSZWFk eUZvckNsZWFudXAKKyAqCQlSZWNoZWNrIHdoZXRoZXIgdGhlIHN0YXJ0dXAgcHJvY2VzcyBj YW4gcmV0cnkgY2xlYW51cCBsb2NrIGFjcXVpc2l0aW9uLgorICoKKyAqIFRoaXMgaXMgb25s eSBmb3IgdGhlIGhvdC1zdGFuZGJ5IHBhdGggaW4gTG9ja0J1ZmZlckZvckNsZWFudXAoKSwg dmlhCisgKiBSZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4oKSwgYWZ0ZXIg UHJvY1dhaXRGb3JTaWduYWwoKSByZXR1cm5zLgorICogVGhlIGNhbGxlciBtdXN0IGFscmVh ZHkgYmUgcmVnaXN0ZXJlZCBhcyB0aGUgc2hhcmVkIGJ1ZmZlcidzCisgKiBCTV9QSU5fQ09V TlRfV0FJVEVSLgorICoKKyAqIFJldHVybnMgdHJ1ZSB3aGVuIHRoZSBjYWxsZXIgaXRzZWxm IGlzIHRoZSBvbmx5IHJlbWFpbmluZyBwaW4gaG9sZGVyLCBzbyBpdAorICogY2FuIHJldHJ5 IHRha2luZyB0aGUgY2xlYW51cCBsb2NrLiBSZXR1cm5zIGZhbHNlIGlmIG90aGVyIGJhY2tl bmRzIHN0aWxsCisgKiBwaW4gdGhlIHNoYXJlZCBidWZmZXIuIEluIHRoYXQgY2FzZSwgdGhp cyBmdW5jdGlvbiBndWFyYW50ZWVzIHRoYXQgdGhlCisgKiBjdXJyZW50IGJhY2tlbmQgcmVt YWlucyByZWdpc3RlcmVkIGFzIHRoZSBwaW5jb3VudCB3YWl0ZXIgdG8gYmUgd29rZW4gd2hl bgorICogdGhlIGJ1ZmZlciByZWZjb3VudCBkcm9wcyB0byAxLgorICovCitib29sCitCdWZm ZXJJc1JlYWR5Rm9yQ2xlYW51cChCdWZmZXIgYnVmZmVyKQoreworCUJ1ZmZlckRlc2MgKmJ1 ZkhkcjsKKwl1aW50NjQJCWJ1Zl9zdGF0ZTsKKwl1aW50MzIJCWJ1Zl9yZWZjb3VudDsKKwor CUFzc2VydChCdWZmZXJJc1ZhbGlkKGJ1ZmZlcikpOworCUFzc2VydCghQnVmZmVySXNMb2Nh bChidWZmZXIpKTsKKworCWJ1ZkhkciA9IEdldEJ1ZmZlckRlc2NyaXB0b3IoYnVmZmVyIC0g MSk7CisJQXNzZXJ0KFBpbkNvdW50V2FpdEJ1ZiA9PSBidWZIZHIpOworCisJYnVmX3N0YXRl ID0gTG9ja0J1ZkhkcihidWZIZHIpOworCWJ1Zl9yZWZjb3VudCA9IEJVRl9TVEFURV9HRVRf UkVGQ09VTlQoYnVmX3N0YXRlKTsKKwlBc3NlcnQoYnVmX3JlZmNvdW50ID4gMCk7CisJQXNz ZXJ0KChidWZfc3RhdGUgJiBCTV9QSU5fQ09VTlRfV0FJVEVSKSA9PSAwIHx8CisJCSAgIGJ1 Zkhkci0+d2FpdF9iYWNrZW5kX3BncHJvY25vID09IE15UHJvY051bWJlcik7CisKKwlpZiAo YnVmX3JlZmNvdW50ID09IDEpCisJeworCQlVbmxvY2tCdWZIZHIoYnVmSGRyLCBidWZfc3Rh dGUpOworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwkvKgorCSAqIElmIG90aGVyIHByb2Nlc3Nl cyBzdGlsbCBwaW4gdGhlIGJ1ZmZlciwgcmVnaXN0ZXIgdGhpcyBwcm9jZXNzIGFnYWluIGFz CisJICogdGhlIHBpbmNvdW50IHdhaXRlciB0byB3YWl0IGFnYWluLgorCSAqLworCVJlZ2lz dGVyUGluQ291bnRXYWl0ZXIoYnVmSGRyLCBidWZfc3RhdGUpOworCisJcmV0dXJuIGZhbHNl OworfQorCiAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAqCQlEcm9wUmVsYXRpb25CdWZmZXJzCiAg KgpAQCAtNTc1MCwxMCArNTgyNSw3IEBAIExvY2tCdWZmZXJGb3JDbGVhbnVwKEJ1ZmZlciBi dWZmZXIpCiAJCQlMb2NrQnVmZmVyKGJ1ZmZlciwgQlVGRkVSX0xPQ0tfVU5MT0NLKTsKIAkJ CWVsb2coRVJST1IsICJtdWx0aXBsZSBiYWNrZW5kcyBhdHRlbXB0aW5nIHRvIHdhaXQgZm9y IHBpbmNvdW50IDEiKTsKIAkJfQotCQlidWZIZHItPndhaXRfYmFja2VuZF9wZ3Byb2NubyA9 IE15UHJvY051bWJlcjsKLQkJUGluQ291bnRXYWl0QnVmID0gYnVmSGRyOwotCQlidWZfc3Rh dGUgfD0gQk1fUElOX0NPVU5UX1dBSVRFUjsKLQkJVW5sb2NrQnVmSGRyKGJ1ZkhkciwgYnVm X3N0YXRlKTsKKwkJUmVnaXN0ZXJQaW5Db3VudFdhaXRlcihidWZIZHIsIGJ1Zl9zdGF0ZSk7 CiAJCUxvY2tCdWZmZXIoYnVmZmVyLCBCVUZGRVJfTE9DS19VTkxPQ0spOwogCiAJCS8qIFdh aXQgdG8gYmUgc2lnbmFsZWQgYnkgVW5waW5CdWZmZXIoKSAqLwpkaWZmIC0tZ2l0IGEvc3Jj L2JhY2tlbmQvc3RvcmFnZS9pcGMvc3RhbmRieS5jIGIvc3JjL2JhY2tlbmQvc3RvcmFnZS9p cGMvc3RhbmRieS5jCmluZGV4IDdmYThkOTI0N2UwLi45MjRjZmQ2NzFhMSAxMDA2NDQKLS0t IGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvc3RhbmRieS5jCisrKyBiL3NyYy9iYWNrZW5k L3N0b3JhZ2UvaXBjL3N0YW5kYnkuYwpAQCAtNzg4LDE0ICs3ODgsMjEgQEAgY2xlYW51cDoK ICAqIERlYWRsb2NrcyBhcmUgZXh0cmVtZWx5IHJhcmUsIGFuZCByZWxhdGl2ZWx5IGV4cGVu c2l2ZSB0byBjaGVjayBmb3IsCiAgKiBzbyB3ZSBkb24ndCBkbyBhIGRlYWRsb2NrIGNoZWNr IHJpZ2h0IGF3YXkgLi4uIG9ubHkgaWYgd2UgaGF2ZSBoYWQgdG8gd2FpdAogICogYXQgbGVh c3QgZGVhZGxvY2tfdGltZW91dC4KKyAqCisgKiBUaGUgY3VycmVudCBwcm9jZXNzIHNob3Vs ZCBiZSB0aGUgd2FpdGVyIHByb2Nlc3MgYW5kIHNob3VsZCBoYXZlCisgKiBwdWJsaXNoZWQg dGhlIHdhaXRlZCBidWZmZXIgdmlhIFNldFN0YXJ0dXBCdWZmZXJQaW5XYWl0QnVmSWQoKS4K ICAqLwogdm9pZAogUmVzb2x2ZVJlY292ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKHZvaWQp CiB7CiAJVGltZXN0YW1wVHogbHRpbWU7CisJaW50CQkJYnVmaWQ7CiAKIAlBc3NlcnQoSW5I b3RTdGFuZGJ5KTsKIAorCWJ1ZmlkID0gR2V0U3RhcnR1cEJ1ZmZlclBpbldhaXRCdWZJZCgp OworCUFzc2VydChidWZpZCA+PSAwKTsKKwogCWx0aW1lID0gR2V0U3RhbmRieUxpbWl0VGlt ZSgpOwogCiAJaWYgKEdldEN1cnJlbnRUaW1lc3RhbXAoKSA+PSBsdGltZSAmJiBsdGltZSAh PSAwKQpAQCAtODMxLDM1ICs4MzgsNDggQEAgUmVzb2x2ZVJlY292ZXJ5Q29uZmxpY3RXaXRo QnVmZmVyUGluKHZvaWQpCiAJCWVuYWJsZV90aW1lb3V0cyh0aW1lb3V0cywgY250KTsKIAl9 CiAKLQkvKgotCSAqIFdhaXQgdG8gYmUgc2lnbmFsZWQgYnkgVW5waW5CdWZmZXIoKSBvciBm b3IgdGhlIHdhaXQgdG8gYmUgaW50ZXJydXB0ZWQKLQkgKiBieSBvbmUgb2YgdGhlIHRpbWVv dXRzIGVzdGFibGlzaGVkIGFib3ZlLgotCSAqCi0JICogV2UgYXNzdW1lIHRoYXQgb25seSBV bnBpbkJ1ZmZlcigpIGFuZCB0aGUgdGltZW91dCByZXF1ZXN0cyBlc3RhYmxpc2hlZAotCSAq IGFib3ZlIGNhbiB3YWtlIHVzIHVwIGhlcmUuIFdha2V1cFJlY292ZXJ5KCkgY2FsbGVkIGJ5 IHdhbHJlY2VpdmVyIG9yCi0JICogU0lHSFVQIHNpZ25hbCBoYW5kbGVyLCBldGMgY2Fubm90 IGRvIHRoYXQgYmVjYXVzZSBpdCB1c2VzIHRoZSBkaWZmZXJlbnQKLQkgKiBsYXRjaCBmcm9t IHRoYXQgUHJvY1dhaXRGb3JTaWduYWwoKSB3YWl0cyBvbi4KLQkgKi8KLQlQcm9jV2FpdEZv clNpZ25hbChXQUlUX0VWRU5UX0JVRkZFUl9QSU4pOwotCi0JaWYgKGdvdF9zdGFuZGJ5X2Rl bGF5X3RpbWVvdXQpCi0JCVNlbmRSZWNvdmVyeUNvbmZsaWN0V2l0aEJ1ZmZlclBpbihQUk9D U0lHX1JFQ09WRVJZX0NPTkZMSUNUX0JVRkZFUlBJTik7Ci0JZWxzZSBpZiAoZ290X3N0YW5k YnlfZGVhZGxvY2tfdGltZW91dCkKKwlmb3IgKDs7KQogCXsKIAkJLyoKLQkJICogU2VuZCBv dXQgYSByZXF1ZXN0IGZvciBob3Qtc3RhbmRieSBiYWNrZW5kcyB0byBjaGVjayB0aGVtc2Vs dmVzIGZvcgotCQkgKiBkZWFkbG9ja3MuCisJCSAqIFdhaXQgdG8gYmUgc2lnbmFsZWQgYnkg VW5waW5CdWZmZXIoKSBvciBmb3IgdGhlIHdhaXQgdG8gYmUKKwkJICogaW50ZXJydXB0ZWQg Ynkgb25lIG9mIHRoZSB0aW1lb3V0cyBlc3RhYmxpc2hlZCBhYm92ZS4KIAkJICoKLQkJICog WFhYIFRoZSBzdWJzZXF1ZW50IFJlc29sdmVSZWNvdmVyeUNvbmZsaWN0V2l0aEJ1ZmZlclBp bigpIHdpbGwgd2FpdAotCQkgKiB0byBiZSBzaWduYWxlZCBieSBVbnBpbkJ1ZmZlcigpIGFn YWluIGFuZCBzZW5kIGEgcmVxdWVzdCBmb3IKLQkJICogZGVhZGxvY2tzIGNoZWNrIGlmIGRl YWRsb2NrX3RpbWVvdXQgaGFwcGVucy4gVGhpcyBjYXVzZXMgdGhlCi0JCSAqIHJlcXVlc3Qg dG8gY29udGludWUgdG8gYmUgc2VudCBldmVyeSBkZWFkbG9ja190aW1lb3V0IHVudGlsIHRo ZQotCQkgKiBidWZmZXIgaXMgdW5waW5uZWQgb3IgbHRpbWUgaXMgcmVhY2hlZC4gVGhpcyB3 b3VsZCBpbmNyZWFzZSB0aGUKLQkJICogd29ya2xvYWQgaW4gdGhlIHN0YXJ0dXAgcHJvY2Vz cyBhbmQgYmFja2VuZHMuIEluIHByYWN0aWNlIGl0IG1heQotCQkgKiBub3QgYmUgc28gaGFy bWZ1bCBiZWNhdXNlIHRoZSBwZXJpb2QgdGhhdCB0aGUgYnVmZmVyIGlzIGtlcHQgcGlubmVk Ci0JCSAqIGlzIGJhc2ljYWxseSBubyBzbyBsb25nLiBCdXQgd2Ugc2hvdWxkIGZpeCB0aGlz PworCQkgKiBQcm9jV2FpdEZvclNpZ25hbCgpIGNhbiBhbHNvIHdha2UgdXAgZm9yIHVucmVs YXRlZCByZWFzb25zLCBzbworCQkgKiByZWNoZWNrIGxhdGVyIHdoZXRoZXIgY2xlYW51cCBj YW4gcHJvY2VlZC4KKwkJICovCisJCVByb2NXYWl0Rm9yU2lnbmFsKFdBSVRfRVZFTlRfQlVG RkVSX1BJTik7CisKKwkJLyoKKwkJICogT25jZSB0aGUgcmVmZXJlbmNlIGNvdW50IGlzIDEs IHRoZSB3YWl0ZXIgcHJvY2VzcyBpdHNlbGYgaXMgdGhlCisJCSAqIG9ubHkgYmFja2VuZCBw aW5uaW5nIHRoZSBidWZmZXIgYXQgdGhlIG1vbWVudC4gVGhlcmUgaXMgYSBjaGFuY2UgdG8K KwkJICogbG9jayB0aGUgYnVmZmVyIGV4Y2x1c2l2ZWx5LgogCQkgKi8KLQkJU2VuZFJlY292 ZXJ5Q29uZmxpY3RXaXRoQnVmZmVyUGluKFBST0NTSUdfUkVDT1ZFUllfQ09ORkxJQ1RfU1RB UlRVUF9ERUFETE9DSyk7CisJCWlmIChCdWZmZXJJc1JlYWR5Rm9yQ2xlYW51cChidWZpZCAr IDEpKQorCQkJYnJlYWs7CisKKwkJaWYgKGdvdF9zdGFuZGJ5X2RlbGF5X3RpbWVvdXQpCisJ CXsKKwkJCVNlbmRSZWNvdmVyeUNvbmZsaWN0V2l0aEJ1ZmZlclBpbihQUk9DU0lHX1JFQ09W RVJZX0NPTkZMSUNUX0JVRkZFUlBJTik7CisJCQlicmVhazsKKwkJfQorCQllbHNlIGlmIChn b3Rfc3RhbmRieV9kZWFkbG9ja190aW1lb3V0KQorCQl7CisJCQkvKgorCQkJICogU2VuZCBv dXQgYSByZXF1ZXN0IGZvciBob3Qtc3RhbmRieSBiYWNrZW5kcyB0byBjaGVjayB0aGVtc2Vs dmVzCisJCQkgKiBmb3IgZGVhZGxvY2tzLgorCQkJICoKKwkJCSAqIFhYWCBUaGUgc3Vic2Vx dWVudCBSZXNvbHZlUmVjb3ZlcnlDb25mbGljdFdpdGhCdWZmZXJQaW4oKSB3aWxsCisJCQkg KiB3YWl0IHRvIGJlIHNpZ25hbGVkIGJ5IFVucGluQnVmZmVyKCkgYWdhaW4gYW5kIHNlbmQg YSByZXF1ZXN0CisJCQkgKiBmb3IgZGVhZGxvY2tzIGNoZWNrIGlmIGRlYWRsb2NrX3RpbWVv dXQgaGFwcGVucy4gVGhpcyBjYXVzZXMKKwkJCSAqIHRoZSByZXF1ZXN0IHRvIGNvbnRpbnVl IHRvIGJlIHNlbnQgZXZlcnkgZGVhZGxvY2tfdGltZW91dCB1bnRpbAorCQkJICogdGhlIGJ1 ZmZlciBpcyB1bnBpbm5lZCBvciBsdGltZSBpcyByZWFjaGVkLiBUaGlzIHdvdWxkIGluY3Jl YXNlCisJCQkgKiB0aGUgd29ya2xvYWQgaW4gdGhlIHN0YXJ0dXAgcHJvY2VzcyBhbmQgYmFj a2VuZHMuIEluIHByYWN0aWNlCisJCQkgKiBpdCBtYXkgbm90IGJlIHNvIGhhcm1mdWwgYmVj YXVzZSB0aGUgcGVyaW9kIHRoYXQgdGhlIGJ1ZmZlciBpcworCQkJICoga2VwdCBwaW5uZWQg aXMgYmFzaWNhbGx5IG5vIHNvIGxvbmcuIEJ1dCB3ZSBzaG91bGQgZml4IHRoaXM/CisJCQkg Ki8KKwkJCVNlbmRSZWNvdmVyeUNvbmZsaWN0V2l0aEJ1ZmZlclBpbihQUk9DU0lHX1JFQ09W RVJZX0NPTkZMSUNUX1NUQVJUVVBfREVBRExPQ0spOworCQkJYnJlYWs7CisJCX0KIAl9CiAK IAkvKgpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvc3RvcmFnZS9idWZtZ3IuaCBiL3NyYy9p bmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmgKaW5kZXggNDFmZGMxZTc2OTMuLmIzMDcyM2Q4MTI5 IDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9zdG9yYWdlL2J1Zm1nci5oCisrKyBiL3NyYy9p bmNsdWRlL3N0b3JhZ2UvYnVmbWdyLmgKQEAgLTI4NSw2ICsyODUsNyBAQCBleHRlcm4gdm9p ZCBEcm9wRGF0YWJhc2VCdWZmZXJzKE9pZCBkYmlkKTsKIAogZXh0ZXJuIGJvb2wgQnVmZmVy SXNQZXJtYW5lbnQoQnVmZmVyIGJ1ZmZlcik7CiBleHRlcm4gWExvZ1JlY1B0ciBCdWZmZXJH ZXRMU05BdG9taWMoQnVmZmVyIGJ1ZmZlcik7CitleHRlcm4gYm9vbCBCdWZmZXJJc1JlYWR5 Rm9yQ2xlYW51cChCdWZmZXIgYnVmZmVyKTsKIGV4dGVybiB2b2lkIEJ1ZmZlckdldFRhZyhC dWZmZXIgYnVmZmVyLCBSZWxGaWxlTG9jYXRvciAqcmxvY2F0b3IsCiAJCQkJCQkgRm9ya051 bWJlciAqZm9ya251bSwgQmxvY2tOdW1iZXIgKmJsa251bSk7CiAKLS0gCjIuNDMuMAoK --------------oR8maRe4mv0VVgV4qptiRJWR--