From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Keith David Bershatsky Newsgroups: gmane.emacs.devel Subject: buffer.c/buffer.h: How to add new buffer-local variables? Date: Sat, 30 Mar 2019 16:19:50 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart_Sat_Mar_30_16:19:50_2019-1" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="88728"; mail-complaints-to="usenet@blaine.gmane.org" To: Emacs Devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 31 00:20:51 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hANHP-000My8-2v for ged-emacs-devel@m.gmane.org; Sun, 31 Mar 2019 00:20:51 +0100 Original-Received: from localhost ([127.0.0.1]:36957 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hANHO-0002jW-4E for ged-emacs-devel@m.gmane.org; Sat, 30 Mar 2019 19:20:50 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:54708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hANGg-0002hu-P6 for emacs-devel@gnu.org; Sat, 30 Mar 2019 19:20:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hANGf-0007Z3-QP for emacs-devel@gnu.org; Sat, 30 Mar 2019 19:20:06 -0400 Original-Received: from gateway23.websitewelcome.com ([192.185.50.107]:28666) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hANGf-0007Wg-4o for emacs-devel@gnu.org; Sat, 30 Mar 2019 19:20:05 -0400 Original-Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 82612192A8 for ; Sat, 30 Mar 2019 18:19:52 -0500 (CDT) Original-Received: from gator3053.hostgator.com ([50.87.144.69]) by cmsmtp with SMTP id ANGShC7tdiQerANGShxozl; Sat, 30 Mar 2019 18:19:52 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lawlist.com ; s=default; h=Content-Type:MIME-Version:Subject:To:From:Message-ID:Date: Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=1WUS0t8j8qeOBVrc6a5/23SzKzGji64noxGW4mCvNqA=; b=aZSEfHaynCI6TO+JkTDxaT7rYr CRdpwfvIeTtQaE6no+bchOVROD/bzIfsqt5CXcvPVGHdo0OlZwL6JW/Pne8mXx2ysBnVPckV42XMS Ab/dbMl1IpjZwLds80s/tn90fNb6tzV1daw+xJZ3Jpqx6OVrEKSSfXb6xBN6an7x7n4hb9VdQpmJT Yn7dDXz2Q4VT23HW7704OVJ4g2drK0YxoA2ScglXfXXH1Idof2tr02N/pXHHHGcwRSpO5etwIibvu qTO2D2KW+ENUk2MKv2Dp7JmNggJbMNhs4jeQ3AN+6WVTsVr8q2pnLguFYfTB+Ht+DFRgUrNsddB6p PbgDlZsw==; Original-Received: from cpe-45-48-239-195.socal.res.rr.com ([45.48.239.195]:52743 helo=server.local) by gator3053.hostgator.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.91) (envelope-from ) id 1hANGR-002Oqh-JG for emacs-devel@gnu.org; Sat, 30 Mar 2019 18:19:51 -0500 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator3053.hostgator.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lawlist.com X-BWhitelist: no X-Source-IP: 45.48.239.195 X-Source-L: No X-Exim-ID: 1hANGR-002Oqh-JG X-Source-Sender: cpe-45-48-239-195.socal.res.rr.com (server.local) [45.48.239.195]:52743 X-Source-Auth: lawlist X-Email-Count: 1 X-Source-Cap: bGF3bGlzdDtsYXdsaXN0O2dhdG9yMzA1My5ob3N0Z2F0b3IuY29t X-Local-Domain: yes X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 192.185.50.107 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:234830 Archived-At: --Multipart_Sat_Mar_30_16:19:50_2019-1 Content-Type: text/plain; charset=US-ASCII I am working on feature requests #22873 (multiple fake cursors) and #17684 (crosshairs that track the cursor position). In an earlier version of the Emacs master branch from a few months ago, I was able to increase the number of buffer-local variables in buffer.c/buffer.h by changing the value of MAX_PER_BUFFER_VARS from 50 to 60. That approach does not permit me to build a current version of the Emacs master branch, which fails with the following error: Dumping under the name bootstrap-emacs.pdmp dumping fingerprint: 50894efcc2cdb17747a4536c9f53c4d093895712c3604daa88d068c383ea4780 pdumper.c:1786: Emacs fatal error: assertion failed: relpos < 1024 Fatal error 6: Abort trapmake[1]: *** [bootstrap-emacs.pdmp] Abort trap make[1]: *** Deleting file `bootstrap-emacs.pdmp' make: *** [src] Error 2 Compilation exited abnormally with code 2 at Sat Mar 30 15:53:18 I have narrowed the issue down to adding just one (1) more buffer local variable, which breaks the camel's back. Attached are git diffs for a working build and a broken build. I am using Emacs master branch from 03/28/2019: 2da9f8bf4222fda504f43b4757e154999cdbbf2c My config options are as follows: CFLAGS='-Wall -O0 -g3' ./configure \ --with-ns \ --enable-checking='yes,glyphs' \ --enable-check-lisp-object-type \ --without-compress-install \ --without-makeinfo \ --with-gnutls=no \ --with-mailutils \ --without-makeinfo How can I increase the number of buffer local variables in buffer.c/buffer.h without breaking the ability to build Emacs? Keith --Multipart_Sat_Mar_30_16:19:50_2019-1 Content-Type: application/diff; type=patch Content-Disposition: attachment; filename="patch_working.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9idWZmZXIuYyBiL3NyYy9idWZmZXIuYwppbmRleCA1ZmFiYmMyLi41 ODYwZTAwIDEwMDY0NAotLS0gYS9zcmMvYnVmZmVyLmMKKysrIGIvc3JjL2J1ZmZlci5jCkBAIC01 MCw2ICs1MCw2OCBAQCBhbG9uZyB3aXRoIEdOVSBFbWFjcy4gIElmIG5vdCwgc2VlIDxodHRwczov L3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uICAqLwogI2luY2x1ZGUgInczMmhlYXAuaCIJCS8qIGZv ciBtbWFwXyogKi8KICNlbmRpZgogCisKKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworLyogYmVn aW4gTVVMVElQTEUtQ1VSU09SUyAqLworCitzdGF0aWMgdm9pZAorYnNldF9tY19yZWFsX2Zha2Vf Y3Vyc29yIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7CisgIGItPm1jX3Jl YWxfZmFrZV9jdXJzb3JfID0gdmFsOworfQorCitzdGF0aWMgdm9pZAorYnNldF9tY19jb25mIChz dHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7CisgIGItPm1jX2NvbmZfID0gdmFs OworfQorCitzdGF0aWMgdm9pZAorYnNldF9tY19pbmFjdGl2ZV93aW5kb3dzIChzdHJ1Y3QgYnVm ZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7CisgIGItPm1jX2luYWN0aXZlX3dpbmRvd3NfID0g dmFsOworfQorCitzdGF0aWMgdm9pZAorYnNldF9jcm9zc2hhaXJzIChzdHJ1Y3QgYnVmZmVyICpi LCBMaXNwX09iamVjdCB2YWwpCit7CisgIGItPmNyb3NzaGFpcnNfID0gdmFsOworfQorCisvLyAg c3RhdGljIHZvaWQKKy8vICBic2V0X2NoX2hvcml6b250YWxfcnVsZXIgKHN0cnVjdCBidWZmZXIg KmIsIExpc3BfT2JqZWN0IHZhbCkKKy8vICB7CisvLyAgICBiLT5jaF9ob3Jpem9udGFsX3J1bGVy XyA9IHZhbDsKKy8vICB9CisvLyAgCisvLyAgc3RhdGljIHZvaWQKKy8vICBic2V0X2NoX3ZlcnRp Y2FsX3J1bGVyIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCisvLyAgeworLy8g ICAgYi0+Y2hfdmVydGljYWxfcnVsZXJfID0gdmFsOworLy8gIH0KKy8vICAKKy8vICBzdGF0aWMg dm9pZAorLy8gIGJzZXRfY2hfaW5hY3RpdmVfd2luZG93cyAoc3RydWN0IGJ1ZmZlciAqYiwgTGlz cF9PYmplY3QgdmFsKQorLy8gIHsKKy8vICAgIGItPmNoX2luYWN0aXZlX3dpbmRvd3NfID0gdmFs OworLy8gIH0KKy8vICAKKy8vICBzdGF0aWMgdm9pZAorLy8gIGJzZXRfZmNfdmlzaWJsZSAoc3Ry dWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQorLy8gIHsKKy8vICAgIGItPmZjX3Zpc2li bGVfID0gdmFsOworLy8gIH0KKy8vICAKKy8vICBzdGF0aWMgdm9pZAorLy8gIGJzZXRfZmNfaW5h Y3RpdmVfd2luZG93cyAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQorLy8gIHsK Ky8vICAgIGItPmZjX2luYWN0aXZlX3dpbmRvd3NfID0gdmFsOworLy8gIH0KKworLyogZW5kIE1V TFRJUExFLUNVUlNPUlMgKi8KKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworCisKIC8qIEZpcnN0 IGJ1ZmZlciBpbiBjaGFpbiBvZiBhbGwgYnVmZmVycyAoaW4gcmV2ZXJzZSBvcmRlciBvZiBjcmVh dGlvbikuCiAgICBUaHJlYWRlZCB0aHJvdWdoIC0+aGVhZGVyLm5leHQuYnVmZmVyLiAgKi8KIApA QCAtNTEzMiw2ICs1MTk0LDI0IEBAIGluaXRfYnVmZmVyX29uY2UgKHZvaWQpCiAgIGJzZXRfbGFz dF9zZWxlY3RlZF93aW5kb3cgKCZidWZmZXJfbG9jYWxfZmxhZ3MsIG1ha2VfZml4bnVtICgwKSk7 CiAKICAgaWR4ID0gMTsKKworCisvKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogKi8KKy8qIE1VTFRJUExF LUNVUlNPUlMgKi8KKworICBYU0VURkFTVElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywg bWNfcmVhbF9mYWtlX2N1cnNvciksIGlkeCk7ICsraWR4OworICBYU0VURkFTVElOVCAoQlZBUiAo JmJ1ZmZlcl9sb2NhbF9mbGFncywgbWNfY29uZiksIGlkeCk7ICsraWR4OworICBYU0VURkFTVElO VCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgbWNfaW5hY3RpdmVfd2luZG93cyksIGlkeCk7 ICsraWR4OworICBYU0VURkFTVElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgY3Jvc3No YWlycyksIGlkeCk7ICsraWR4OworLy8gIFhTRVRGQVNUSU5UIChCVkFSICgmYnVmZmVyX2xvY2Fs X2ZsYWdzLCBjaF9ob3Jpem9udGFsX3J1bGVyKSwgaWR4KTsgKytpZHg7CisvLyAgWFNFVEZBU1RJ TlQgKEJWQVIgKCZidWZmZXJfbG9jYWxfZmxhZ3MsIGNoX3ZlcnRpY2FsX3J1bGVyKSwgaWR4KTsg KytpZHg7CisvLyAgWFNFVEZBU1RJTlQgKEJWQVIgKCZidWZmZXJfbG9jYWxfZmxhZ3MsIGNoX2lu YWN0aXZlX3dpbmRvd3MpLCBpZHgpOyArK2lkeDsKKy8vICBYU0VURkFTVElOVCAoQlZBUiAoJmJ1 ZmZlcl9sb2NhbF9mbGFncywgZmNfdmlzaWJsZSksIGlkeCk7ICsraWR4OworLy8gIFhTRVRGQVNU SU5UIChCVkFSICgmYnVmZmVyX2xvY2FsX2ZsYWdzLCBmY19pbmFjdGl2ZV93aW5kb3dzKSwgaWR4 KTsgKytpZHg7CisKKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworCisKICAgWFNFVEZBU1RJTlQg KEJWQVIgKCZidWZmZXJfbG9jYWxfZmxhZ3MsIG1vZGVfbGluZV9mb3JtYXQpLCBpZHgpOyArK2lk eDsKICAgWFNFVEZBU1RJTlQgKEJWQVIgKCZidWZmZXJfbG9jYWxfZmxhZ3MsIGFiYnJldl9tb2Rl KSwgaWR4KTsgKytpZHg7CiAgIFhTRVRGQVNUSU5UIChCVkFSICgmYnVmZmVyX2xvY2FsX2ZsYWdz LCBvdmVyd3JpdGVfbW9kZSksIGlkeCk7ICsraWR4OwpAQCAtNTIxOCw2ICs1Mjk4LDI0IEBAIGlu aXRfYnVmZmVyX29uY2UgKHZvaWQpCiAgIC8qIE11c3QgZG8gdGhlc2UgYmVmb3JlIG1ha2luZyB0 aGUgZmlyc3QgYnVmZmVyISAqLwogCiAgIC8qIHJlYWwgc2V0dXAgaXMgZG9uZSBpbiBiaW5kaW5n cy5lbCAqLworCisKKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworLyogTVVMVElQTEUtQ1VSU09S UyAqLworCisgIGJzZXRfbWNfcmVhbF9mYWtlX2N1cnNvciAoJmJ1ZmZlcl9kZWZhdWx0cywgUWhv bGxvdyk7CisgIGJzZXRfbWNfY29uZiAoJmJ1ZmZlcl9kZWZhdWx0cywgUW5pbCk7CisgIGJzZXRf bWNfaW5hY3RpdmVfd2luZG93cyAoJmJ1ZmZlcl9kZWZhdWx0cywgUXQpOworICBic2V0X2Nyb3Nz aGFpcnMgKCZidWZmZXJfZGVmYXVsdHMsIFFuaWwpOworLy8gIGJzZXRfY2hfaG9yaXpvbnRhbF9y dWxlciAoJmJ1ZmZlcl9kZWZhdWx0cywgUXQpOworLy8gIGJzZXRfY2hfdmVydGljYWxfcnVsZXIg KCZidWZmZXJfZGVmYXVsdHMsIFF0KTsKKy8vICBic2V0X2NoX2luYWN0aXZlX3dpbmRvd3MgKCZi dWZmZXJfZGVmYXVsdHMsIFF0KTsKKy8vICBic2V0X2ZjX3Zpc2libGUgKCZidWZmZXJfZGVmYXVs dHMsIFFuaWwpOworLy8gIGJzZXRfZmNfaW5hY3RpdmVfd2luZG93cyAoJmJ1ZmZlcl9kZWZhdWx0 cywgUXQpOworCisvKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogKi8KKworCiAgIGJzZXRfbW9kZV9saW5l X2Zvcm1hdCAoJmJ1ZmZlcl9kZWZhdWx0cywgYnVpbGRfcHVyZV9jX3N0cmluZyAoIiUtIikpOwog ICBic2V0X2hlYWRlcl9saW5lX2Zvcm1hdCAoJmJ1ZmZlcl9kZWZhdWx0cywgUW5pbCk7CiAgIGJz ZXRfYWJicmV2X21vZGUgKCZidWZmZXJfZGVmYXVsdHMsIFFuaWwpOwpAQCAtNTQ1NCw2ICs1NTUy LDIzIEBAIHN5bXNfb2ZfYnVmZmVyICh2b2lkKQogICBzdGF0aWNwcm8gKCZRU0Z1bmRhbWVudGFs KTsKICAgc3RhdGljcHJvICgmVmJ1ZmZlcl9hbGlzdCk7CiAKKworLyogKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqICovCisvKiBNVUxUSVBMRS1DVVJTT1JTICovCisKKyAgREVGU1lNIChRbWNfcmVhbF9mYWtl X2N1cnNvciwgIm1jLXJlYWwtZmFrZS1jdXJzb3IiKTsKKyAgREVGU1lNIChRbWNfY29uZiwgIm1j LWNvbmYiKTsKKyAgREVGU1lNIChRbWNfaW5hY3RpdmVfd2luZG93cywgIm1jLWluYWN0aXZlLXdp bmRvd3MiKTsKKyAgREVGU1lNIChRY3Jvc3NoYWlycywgImNyb3NzaGFpcnMiKTsKKy8vICBERUZT WU0gKFFjaF9ob3Jpem9udGFsX3J1bGVyLCAiY2gtaG9yaXpvbnRhbC1ydWxlciIpOworLy8gIERF RlNZTSAoUWNoX3ZlcnRpY2FsX3J1bGVyLCAiY2gtdmVydGljYWwtcnVsZXIiKTsKKy8vICBERUZT WU0gKFFjaF9pbmFjdGl2ZV93aW5kb3dzLCAiY2gtaW5hY3RpdmUtd2luZG93cyIpOworLy8gIERF RlNZTSAoUWZjX3Zpc2libGUsICJmYy12aXNpYmxlIik7CisvLyAgREVGU1lNIChRZmNfdmlzaWJs ZV9pbmFjdGl2ZV93aW5kb3csICJmYy1pbmFjdGl2ZS13aW5kb3ciKTsKKworLyogKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqICovCisKKwogICBERUZTWU0gKFFjaG9pY2UsICJjaG9pY2UiKTsKICAgREVGU1lN IChRbGVmdCwgImxlZnQiKTsKICAgREVGU1lNIChRcmlnaHQsICJyaWdodCIpOwpAQCAtNTQ5MSw2 ICs1NjA2LDQxIEBAIHN5bXNfb2ZfYnVmZmVyICh2b2lkKQogICBGcHV0IChRcHJvdGVjdGVkX2Zp ZWxkLCBRZXJyb3JfbWVzc2FnZSwKIAlidWlsZF9wdXJlX2Nfc3RyaW5nICgiQXR0ZW1wdCB0byBt b2RpZnkgYSBwcm90ZWN0ZWQgZmllbGQiKSk7CiAKKworLyogKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqICov CisvKiBNVUxUSVBMRS1DVVJTT1JTICovCisKKyAgREVGVkFSX1BFUl9CVUZGRVIgKCJtYy1yZWFs LWZha2UtY3Vyc29yIiwgJkJWQVIgKGN1cnJlbnRfYnVmZmVyLCBtY19yZWFsX2Zha2VfY3Vyc29y KSwgUW5pbCwKKyAgICBkb2M6IC8qIEEgYnVmZXItbG9jYWwgdmFyaWFibGUgdG8gc2V0IHRoZSBj dXJzb3IgdHlwZSBvZiB0aGUgcmVhbCBmYWtlIGN1cnNvci4gKi8pOworCisgIERFRlZBUl9QRVJf QlVGRkVSICgibWMtY29uZiIsICZCVkFSIChjdXJyZW50X2J1ZmZlciwgbWNfY29uZiksIFFuaWws CisgICAgZG9jOiAvKiBBIGJ1ZmVyLWxvY2FsIHZhcmlhYmxlIHRvIHN0b3JlIHRoZSB2YWx1ZSBv ZiB0aGUgbXVsdGlwbGUgY3Vyc29ycyB0byBiZSBkaXNwbGF5ZWQKK2R1cmluZyB0aGUgbmV4dCBy ZWRpc3BsYXkuICovKTsKKworICBERUZWQVJfUEVSX0JVRkZFUiAoIm1jLWluYWN0aXZlLXdpbmRv d3MiLCAmQlZBUiAoY3VycmVudF9idWZmZXIsIG1jX2luYWN0aXZlX3dpbmRvd3MpLCBRbmlsLAor ICAgIGRvYzogLyogV2hlbiBub24tbmlsLCBkcmF3IG11bHRpcGxlIGN1cnNvcnMgaW4gaW5hY3Rp dmUgd2luZG93cy4gKi8pOworCisgIERFRlZBUl9QRVJfQlVGRkVSICgiY3Jvc3NoYWlycyIsICZC VkFSIChjdXJyZW50X2J1ZmZlciwgY3Jvc3NoYWlycyksIFFuaWwsCisgICAgZG9jOiAvKiBBIGJ1 ZmVyLWxvY2FsIHZhcmlhYmxlIHRvIGFjdGl2YXRlL2RlYWN0aXZhdGUgY3Jvc3NoYWlycy4gKi8p OworCisvLyAgREVGVkFSX1BFUl9CVUZGRVIgKCJjaC1ob3Jpem9udGFsLXJ1bGVyIiwgJkJWQVIg KGN1cnJlbnRfYnVmZmVyLCBjaF9ob3Jpem9udGFsX3J1bGVyKSwgUW5pbCwKKy8vICAgIGRvYzog LyogQSBidWZlci1sb2NhbCB2YXJpYWJsZSB0byBhY3RpdmF0ZS9kZWFjdGl2YXRlIHRoZSBjcm9z c2hhaXJzIGhvcml6b250YWwgcnVsZXIuICovKTsKKy8vCisvLyAgREVGVkFSX1BFUl9CVUZGRVIg KCJjaC12ZXJ0aWNhbC1ydWxlciIsICZCVkFSIChjdXJyZW50X2J1ZmZlciwgY2hfdmVydGljYWxf cnVsZXIpLCBRbmlsLAorLy8gICAgZG9jOiAvKiBBIGJ1ZmVyLWxvY2FsIHZhcmlhYmxlIHRvIGFj dGl2YXRlL2RlYWN0aXZhdGUgdGhlIGNyb3NzaGFpcnMgdmVydGljYWwgcnVsZXIuICovKTsKKy8v CisvLyAgREVGVkFSX1BFUl9CVUZGRVIgKCJjaC1pbmFjdGl2ZS13aW5kb3dzIiwgJkJWQVIgKGN1 cnJlbnRfYnVmZmVyLCBjaF9pbmFjdGl2ZV93aW5kb3dzKSwgUW5pbCwKKy8vICAgIGRvYzogLyog V2hlbiBub24tbmlsLCBkcmF3IGNyb3NzaGFpcnMgaW4gaW5hY3RpdmUgd2luZG93cy4gKi8pOwor Ly8KKy8vICBERUZWQVJfUEVSX0JVRkZFUiAoImZjLXZpc2libGUiLCAmQlZBUiAoY3VycmVudF9i dWZmZXIsIGZjX3Zpc2libGUpLCBRbmlsLAorLy8gICAgZG9jOiAvKiBBIGJ1ZmVyLWxvY2FsIHZh cmlhYmxlIHRvIHR1cm4gb24vb2ZmIHRoZSBtdWx0aXBsZSBjdXJzb3JzIGZpbGwgY29sdW1uLiAq Lyk7CisvLworLy8gIERFRlZBUl9QRVJfQlVGRkVSICgiZmMtaW5hY3RpdmUtd2luZG93cyIsICZC VkFSIChjdXJyZW50X2J1ZmZlciwgZmNfaW5hY3RpdmVfd2luZG93cyksIFFuaWwsCisvLyAgICBk b2M6IC8qIFdoZW4gbm9uLW5pbCwgZHJhdyBtdWx0aXBsZSBjdXJzb3JzIGZpbGwgY29sdW1uIGlu IGluYWN0aXZlIHdpbmRvd3MuICovKTsKKworLyogKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqICovCisKKwog ICBERUZWQVJfUEVSX0JVRkZFUiAoImhlYWRlci1saW5lLWZvcm1hdCIsCiAJCSAgICAgJkJWQVIg KGN1cnJlbnRfYnVmZmVyLCBoZWFkZXJfbGluZV9mb3JtYXQpLAogCQkgICAgIFFuaWwsCmRpZmYg LS1naXQgYS9zcmMvYnVmZmVyLmggYi9zcmMvYnVmZmVyLmgKaW5kZXggZDM1MjhhYy4uYmJjYTk2 MSAxMDA2NDQKLS0tIGEvc3JjL2J1ZmZlci5oCisrKyBiL3NyYy9idWZmZXIuaApAQCAtNjM2LDYg KzYzNiw0MCBAQCBzdHJ1Y3QgYnVmZmVyCiAgICAgIGNhY2hlIGFyZSBlbmFibGVkLiAgU2VlIHNl YXJjaC5jLCBpbmRlbnQuYyBhbmQgYmlkaS5jIGZvciBkZXRhaWxzLiAgKi8KICAgTGlzcF9PYmpl Y3QgY2FjaGVfbG9uZ19zY2Fuc187CiAKKworLyogKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqICovCisvKiBN VUxUSVBMRS1DVVJTT1JTICovCisKKyAgLyogVGhlIGN1cnNvciB0eXBlIG9mIHRoZSByZWFsIGZh a2UgY3Vyc29yLiAqLworICBMaXNwX09iamVjdCBtY19yZWFsX2Zha2VfY3Vyc29yXzsKKworICAv KiBUaGUgbmFtZSBvZiBsaXN0IHVzZWQgYnkgbXVsdGlwbGUgY3Vyc29ycyBmb3IgbmV4dCByZWRp c3BsYXkuICovCisgIExpc3BfT2JqZWN0IG1jX2NvbmZfOworCisgIC8qIFdoZXRoZXIgdG8gZHJh dyBtdWx0aXBsZSBjdXJzb3JzIGluIGluYWN0aXZlIHdpbmRvd3MuICovCisgIExpc3BfT2JqZWN0 IG1jX2luYWN0aXZlX3dpbmRvd3NfOworCisgIC8qIFRoZSBuYW1lIG9mIHRoZSBidWZmZXItbG9j YWwgdmFyaWFibGUuICovCisgIExpc3BfT2JqZWN0IGNyb3NzaGFpcnNfOworCisvLyAgLyogVGhl IG5hbWUgb2YgdGhlIGNyb3NzaGFpcnMgaG9yaXpvbnRhbCBydWxlci4gKi8KKy8vICBMaXNwX09i amVjdCBjaF9ob3Jpem9udGFsX3J1bGVyXzsKKy8vCisvLyAgLyogVGhlIG5hbWUgb2YgdGhlIGNy b3NzaGFpcnMgdmVydGljYWwgcnVsZXIuICovCisvLyAgTGlzcF9PYmplY3QgY2hfdmVydGljYWxf cnVsZXJfOworLy8KKy8vICAvKiBXaGV0aGVyIHRvIGRyYXcgY3Jvc3NoYWlycyBpbiBpbmFjdGl2 ZSB3aW5kb3dzLiAqLworLy8gIExpc3BfT2JqZWN0IGNoX2luYWN0aXZlX3dpbmRvd3NfOworLy8K Ky8vICAvKiBUaGUgbmFtZSBvZiB0aGUgYnVmZmVyLWxvY2FsIHZhcmlhYmxlLiAqLworLy8gIExp c3BfT2JqZWN0IGZjX3Zpc2libGVfOworLy8KKy8vICAvKiBXaGV0aGVyIHRvIGRyYXcgbXVsdGlw bGUgY3Vyc29ycyBmaWxsIGNvbHVtbiBpbiBpbmFjdGl2ZSB3aW5kb3dzLiAqLworLy8gIExpc3Bf T2JqZWN0IGZjX2luYWN0aXZlX3dpbmRvd3NfOworCisvKiAqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogKi8K KworCiAgIC8qIElmIHRoZSB3aWR0aCBydW4gY2FjaGUgaXMgZW5hYmxlZCwgdGhpcyB0YWJsZSBj b250YWlucyB0aGUKICAgICAgY2hhcmFjdGVyIHdpZHRocyB3aWR0aF9ydW5fY2FjaGUgKHNlZSBh Ym92ZSkgYXNzdW1lcy4gIFdoZW4gd2UKICAgICAgZG8gYSB0aG9yb3VnaCByZWRpc3BsYXksIHdl IGNvbXBhcmUgdGhpcyBhZ2FpbnN0IHRoZSBidWZmZXIncwpAQCAtODk2LDYgKzkzMCw2OSBAQCBY QlVGRkVSIChMaXNwX09iamVjdCBhKQogLyogTW9zdCBjb2RlIHNob3VsZCB1c2UgdGhlc2UgZnVu Y3Rpb25zIHRvIHNldCBMaXNwIGZpZWxkcyBpbiBzdHJ1Y3QKICAgIGJ1ZmZlci4gIChTb21lIHNl dHRlcnMgdGhhdCBhcmUgcHJpdmF0ZSB0byBhIHNpbmdsZSAuYyBmaWxlIGFyZQogICAgZGVmaW5l ZCBhcyBzdGF0aWMgaW4gdGhvc2UgZmlsZXMuKSAgKi8KKworCisvKiAqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KiogKi8KKy8qIGJlZ2luIE1VTFRJUExFLUNVUlNPUlMgKi8KKworSU5MSU5FIHZvaWQKK2JzZXRf Ymx2X21jX3JlYWxfZmFrZV9jdXJzb3IgKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZh bCkKK3sKKyAgYi0+bWNfcmVhbF9mYWtlX2N1cnNvcl8gPSB2YWw7Cit9CisKK0lOTElORSB2b2lk Citic2V0X2Jsdl9tY19jb25mIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7 CisgIGItPm1jX2NvbmZfID0gdmFsOworfQorCitJTkxJTkUgdm9pZAorYnNldF9ibHZfbWNfaW5h Y3RpdmVfd2luZG93cyAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQoreworICBi LT5tY19pbmFjdGl2ZV93aW5kb3dzXyA9IHZhbDsKK30KKworSU5MSU5FIHZvaWQKK2JzZXRfYmx2 X2Nyb3NzaGFpcnMgKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZhbCkKK3sKKyAgYi0+ Y3Jvc3NoYWlyc18gPSB2YWw7Cit9CisKKy8vICBJTkxJTkUgdm9pZAorLy8gIGJzZXRfYmx2X2No X2hvcml6b250YWxfcnVsZXIgKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZhbCkKKy8v ICB7CisvLyAgICBiLT5jaF9ob3Jpem9udGFsX3J1bGVyXyA9IHZhbDsKKy8vICB9CisvLyAgCisv LyAgSU5MSU5FIHZvaWQKKy8vICBic2V0X2Jsdl9jaF92ZXJ0aWNhbF9ydWxlciAoc3RydWN0IGJ1 ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQorLy8gIHsKKy8vICAgIGItPmNoX3ZlcnRpY2FsX3J1 bGVyXyA9IHZhbDsKKy8vICB9CisvLyAgCisvLyAgSU5MSU5FIHZvaWQKKy8vICBic2V0X2Jsdl9j aF9pbmFjdGl2ZV93aW5kb3dzIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCisv LyAgeworLy8gICAgYi0+Y2hfaW5hY3RpdmVfd2luZG93c18gPSB2YWw7CisvLyAgfQorLy8gIAor Ly8gIElOTElORSB2b2lkCisvLyAgYnNldF9ibHZfZmNfdmlzaWJsZSAoc3RydWN0IGJ1ZmZlciAq YiwgTGlzcF9PYmplY3QgdmFsKQorLy8gIHsKKy8vICAgIGItPmZjX3Zpc2libGVfID0gdmFsOwor Ly8gIH0KKy8vICAKKy8vICBJTkxJTkUgdm9pZAorLy8gIGJzZXRfYmx2X2ZjX2luYWN0aXZlX3dp bmRvd3MgKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZhbCkKKy8vICB7CisvLyAgICBi LT5mY19pbmFjdGl2ZV93aW5kb3dzXyA9IHZhbDsKKy8vICB9CisKKy8qIGVuZCBNVUxUSVBMRS1D VVJTT1JTICovCisvKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogKi8KKworCiBJTkxJTkUgdm9pZAogYnNl dF9iaWRpX3BhcmFncmFwaF9kaXJlY3Rpb24gKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0 IHZhbCkKIHsKZGlmZiAtLWdpdCBhL3NyYy9wZHVtcGVyLmMgYi9zcmMvcGR1bXBlci5jCmluZGV4 IDgxMTZjNzUuLjIyMDFhYzkgMTAwNjQ0Ci0tLSBhL3NyYy9wZHVtcGVyLmMKKysrIGIvc3JjL3Bk dW1wZXIuYwpAQCAtMjc2MSw3ICsyNzYxLDcgQEAgZHVtcF9oYXNoX3RhYmxlIChzdHJ1Y3QgZHVt cF9jb250ZXh0ICpjdHgsCiBzdGF0aWMgZHVtcF9vZmYKIGR1bXBfYnVmZmVyIChzdHJ1Y3QgZHVt cF9jb250ZXh0ICpjdHgsIGNvbnN0IHN0cnVjdCBidWZmZXIgKmluX2J1ZmZlcikKIHsKLSNpZiBD SEVDS19TVFJVQ1RTICYmICFkZWZpbmVkIEhBU0hfYnVmZmVyX0FFMkM4Q0UzNTcKKyNpZiBDSEVD S19TVFJVQ1RTICYmICFkZWZpbmVkIEhBU0hfYnVmZmVyX0Y4M0QzQkNGMzUKICMgZXJyb3IgImJ1 ZmZlciBjaGFuZ2VkLiBTZWUgQ0hFQ0tfU1RSVUNUUyBjb21tZW50LiIKICNlbmRpZgogICBzdHJ1 Y3QgYnVmZmVyIG11bmdlZF9idWZmZXIgPSAqaW5fYnVmZmVyOwo= --Multipart_Sat_Mar_30_16:19:50_2019-1 Content-Type: application/diff; type=patch Content-Disposition: attachment; filename="patch_broken.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9idWZmZXIuYyBiL3NyYy9idWZmZXIuYwppbmRleCA1ZmFiYmMyLi5h Mjk1MmZjIDEwMDY0NAotLS0gYS9zcmMvYnVmZmVyLmMKKysrIGIvc3JjL2J1ZmZlci5jCkBAIC01 MCw2ICs1MCw2OCBAQCBhbG9uZyB3aXRoIEdOVSBFbWFjcy4gIElmIG5vdCwgc2VlIDxodHRwczov L3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uICAqLwogI2luY2x1ZGUgInczMmhlYXAuaCIJCS8qIGZv ciBtbWFwXyogKi8KICNlbmRpZgogCisKKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworLyogYmVn aW4gTVVMVElQTEUtQ1VSU09SUyAqLworCitzdGF0aWMgdm9pZAorYnNldF9tY19yZWFsX2Zha2Vf Y3Vyc29yIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7CisgIGItPm1jX3Jl YWxfZmFrZV9jdXJzb3JfID0gdmFsOworfQorCitzdGF0aWMgdm9pZAorYnNldF9tY19jb25mIChz dHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7CisgIGItPm1jX2NvbmZfID0gdmFs OworfQorCitzdGF0aWMgdm9pZAorYnNldF9tY19pbmFjdGl2ZV93aW5kb3dzIChzdHJ1Y3QgYnVm ZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7CisgIGItPm1jX2luYWN0aXZlX3dpbmRvd3NfID0g dmFsOworfQorCitzdGF0aWMgdm9pZAorYnNldF9jcm9zc2hhaXJzIChzdHJ1Y3QgYnVmZmVyICpi LCBMaXNwX09iamVjdCB2YWwpCit7CisgIGItPmNyb3NzaGFpcnNfID0gdmFsOworfQorCitzdGF0 aWMgdm9pZAorYnNldF9jaF9ob3Jpem9udGFsX3J1bGVyIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNw X09iamVjdCB2YWwpCit7CisgIGItPmNoX2hvcml6b250YWxfcnVsZXJfID0gdmFsOworfQorCisv LyAgc3RhdGljIHZvaWQKKy8vICBic2V0X2NoX3ZlcnRpY2FsX3J1bGVyIChzdHJ1Y3QgYnVmZmVy ICpiLCBMaXNwX09iamVjdCB2YWwpCisvLyAgeworLy8gICAgYi0+Y2hfdmVydGljYWxfcnVsZXJf ID0gdmFsOworLy8gIH0KKy8vICAKKy8vICBzdGF0aWMgdm9pZAorLy8gIGJzZXRfY2hfaW5hY3Rp dmVfd2luZG93cyAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQorLy8gIHsKKy8v ICAgIGItPmNoX2luYWN0aXZlX3dpbmRvd3NfID0gdmFsOworLy8gIH0KKy8vICAKKy8vICBzdGF0 aWMgdm9pZAorLy8gIGJzZXRfZmNfdmlzaWJsZSAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmpl Y3QgdmFsKQorLy8gIHsKKy8vICAgIGItPmZjX3Zpc2libGVfID0gdmFsOworLy8gIH0KKy8vICAK Ky8vICBzdGF0aWMgdm9pZAorLy8gIGJzZXRfZmNfaW5hY3RpdmVfd2luZG93cyAoc3RydWN0IGJ1 ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQorLy8gIHsKKy8vICAgIGItPmZjX2luYWN0aXZlX3dp bmRvd3NfID0gdmFsOworLy8gIH0KKworLyogZW5kIE1VTFRJUExFLUNVUlNPUlMgKi8KKy8qICoq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKiAqLworCisKIC8qIEZpcnN0IGJ1ZmZlciBpbiBjaGFpbiBvZiBhbGwg YnVmZmVycyAoaW4gcmV2ZXJzZSBvcmRlciBvZiBjcmVhdGlvbikuCiAgICBUaHJlYWRlZCB0aHJv dWdoIC0+aGVhZGVyLm5leHQuYnVmZmVyLiAgKi8KIApAQCAtNTEzMiw2ICs1MTk0LDI0IEBAIGlu aXRfYnVmZmVyX29uY2UgKHZvaWQpCiAgIGJzZXRfbGFzdF9zZWxlY3RlZF93aW5kb3cgKCZidWZm ZXJfbG9jYWxfZmxhZ3MsIG1ha2VfZml4bnVtICgwKSk7CiAKICAgaWR4ID0gMTsKKworCisvKiAq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKiogKi8KKy8qIE1VTFRJUExFLUNVUlNPUlMgKi8KKworICBYU0VURkFT VElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgbWNfcmVhbF9mYWtlX2N1cnNvciksIGlk eCk7ICsraWR4OworICBYU0VURkFTVElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgbWNf Y29uZiksIGlkeCk7ICsraWR4OworICBYU0VURkFTVElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9m bGFncywgbWNfaW5hY3RpdmVfd2luZG93cyksIGlkeCk7ICsraWR4OworICBYU0VURkFTVElOVCAo QlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgY3Jvc3NoYWlycyksIGlkeCk7ICsraWR4OworICBY U0VURkFTVElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgY2hfaG9yaXpvbnRhbF9ydWxl ciksIGlkeCk7ICsraWR4OworLy8gIFhTRVRGQVNUSU5UIChCVkFSICgmYnVmZmVyX2xvY2FsX2Zs YWdzLCBjaF92ZXJ0aWNhbF9ydWxlciksIGlkeCk7ICsraWR4OworLy8gIFhTRVRGQVNUSU5UIChC VkFSICgmYnVmZmVyX2xvY2FsX2ZsYWdzLCBjaF9pbmFjdGl2ZV93aW5kb3dzKSwgaWR4KTsgKytp ZHg7CisvLyAgWFNFVEZBU1RJTlQgKEJWQVIgKCZidWZmZXJfbG9jYWxfZmxhZ3MsIGZjX3Zpc2li bGUpLCBpZHgpOyArK2lkeDsKKy8vICBYU0VURkFTVElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9m bGFncywgZmNfaW5hY3RpdmVfd2luZG93cyksIGlkeCk7ICsraWR4OworCisvKiAqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKiogKi8KKworCiAgIFhTRVRGQVNUSU5UIChCVkFSICgmYnVmZmVyX2xvY2FsX2ZsYWdz LCBtb2RlX2xpbmVfZm9ybWF0KSwgaWR4KTsgKytpZHg7CiAgIFhTRVRGQVNUSU5UIChCVkFSICgm YnVmZmVyX2xvY2FsX2ZsYWdzLCBhYmJyZXZfbW9kZSksIGlkeCk7ICsraWR4OwogICBYU0VURkFT VElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgb3ZlcndyaXRlX21vZGUpLCBpZHgpOyAr K2lkeDsKQEAgLTUyMTgsNiArNTI5OCwyNCBAQCBpbml0X2J1ZmZlcl9vbmNlICh2b2lkKQogICAv KiBNdXN0IGRvIHRoZXNlIGJlZm9yZSBtYWtpbmcgdGhlIGZpcnN0IGJ1ZmZlciEgKi8KIAogICAv KiByZWFsIHNldHVwIGlzIGRvbmUgaW4gYmluZGluZ3MuZWwgKi8KKworCisvKiAqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKiogKi8KKy8qIE1VTFRJUExFLUNVUlNPUlMgKi8KKworICBic2V0X21jX3JlYWxfZmFr ZV9jdXJzb3IgKCZidWZmZXJfZGVmYXVsdHMsIFFob2xsb3cpOworICBic2V0X21jX2NvbmYgKCZi dWZmZXJfZGVmYXVsdHMsIFFuaWwpOworICBic2V0X21jX2luYWN0aXZlX3dpbmRvd3MgKCZidWZm ZXJfZGVmYXVsdHMsIFF0KTsKKyAgYnNldF9jcm9zc2hhaXJzICgmYnVmZmVyX2RlZmF1bHRzLCBR bmlsKTsKKyAgYnNldF9jaF9ob3Jpem9udGFsX3J1bGVyICgmYnVmZmVyX2RlZmF1bHRzLCBRdCk7 CisvLyAgYnNldF9jaF92ZXJ0aWNhbF9ydWxlciAoJmJ1ZmZlcl9kZWZhdWx0cywgUXQpOworLy8g IGJzZXRfY2hfaW5hY3RpdmVfd2luZG93cyAoJmJ1ZmZlcl9kZWZhdWx0cywgUXQpOworLy8gIGJz ZXRfZmNfdmlzaWJsZSAoJmJ1ZmZlcl9kZWZhdWx0cywgUW5pbCk7CisvLyAgYnNldF9mY19pbmFj dGl2ZV93aW5kb3dzICgmYnVmZmVyX2RlZmF1bHRzLCBRdCk7CisKKy8qICoqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKiAqLworCisKICAgYnNldF9tb2RlX2xpbmVfZm9ybWF0ICgmYnVmZmVyX2RlZmF1bHRzLCBi dWlsZF9wdXJlX2Nfc3RyaW5nICgiJS0iKSk7CiAgIGJzZXRfaGVhZGVyX2xpbmVfZm9ybWF0ICgm YnVmZmVyX2RlZmF1bHRzLCBRbmlsKTsKICAgYnNldF9hYmJyZXZfbW9kZSAoJmJ1ZmZlcl9kZWZh dWx0cywgUW5pbCk7CkBAIC01NDU0LDYgKzU1NTIsMjMgQEAgc3ltc19vZl9idWZmZXIgKHZvaWQp CiAgIHN0YXRpY3BybyAoJlFTRnVuZGFtZW50YWwpOwogICBzdGF0aWNwcm8gKCZWYnVmZmVyX2Fs aXN0KTsKIAorCisvKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogKi8KKy8qIE1VTFRJUExFLUNVUlNPUlMg Ki8KKworICBERUZTWU0gKFFtY19yZWFsX2Zha2VfY3Vyc29yLCAibWMtcmVhbC1mYWtlLWN1cnNv ciIpOworICBERUZTWU0gKFFtY19jb25mLCAibWMtY29uZiIpOworICBERUZTWU0gKFFtY19pbmFj dGl2ZV93aW5kb3dzLCAibWMtaW5hY3RpdmUtd2luZG93cyIpOworICBERUZTWU0gKFFjcm9zc2hh aXJzLCAiY3Jvc3NoYWlycyIpOworICBERUZTWU0gKFFjaF9ob3Jpem9udGFsX3J1bGVyLCAiY2gt aG9yaXpvbnRhbC1ydWxlciIpOworLy8gIERFRlNZTSAoUWNoX3ZlcnRpY2FsX3J1bGVyLCAiY2gt dmVydGljYWwtcnVsZXIiKTsKKy8vICBERUZTWU0gKFFjaF9pbmFjdGl2ZV93aW5kb3dzLCAiY2gt aW5hY3RpdmUtd2luZG93cyIpOworLy8gIERFRlNZTSAoUWZjX3Zpc2libGUsICJmYy12aXNpYmxl Iik7CisvLyAgREVGU1lNIChRZmNfdmlzaWJsZV9pbmFjdGl2ZV93aW5kb3csICJmYy1pbmFjdGl2 ZS13aW5kb3ciKTsKKworLyogKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqICovCisKKwogICBERUZTWU0gKFFj aG9pY2UsICJjaG9pY2UiKTsKICAgREVGU1lNIChRbGVmdCwgImxlZnQiKTsKICAgREVGU1lNIChR cmlnaHQsICJyaWdodCIpOwpAQCAtNTQ5MSw2ICs1NjA2LDQxIEBAIHN5bXNfb2ZfYnVmZmVyICh2 b2lkKQogICBGcHV0IChRcHJvdGVjdGVkX2ZpZWxkLCBRZXJyb3JfbWVzc2FnZSwKIAlidWlsZF9w dXJlX2Nfc3RyaW5nICgiQXR0ZW1wdCB0byBtb2RpZnkgYSBwcm90ZWN0ZWQgZmllbGQiKSk7CiAK KworLyogKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqICovCisvKiBNVUxUSVBMRS1DVVJTT1JTICovCisKKyAg REVGVkFSX1BFUl9CVUZGRVIgKCJtYy1yZWFsLWZha2UtY3Vyc29yIiwgJkJWQVIgKGN1cnJlbnRf YnVmZmVyLCBtY19yZWFsX2Zha2VfY3Vyc29yKSwgUW5pbCwKKyAgICBkb2M6IC8qIEEgYnVmZXIt bG9jYWwgdmFyaWFibGUgdG8gc2V0IHRoZSBjdXJzb3IgdHlwZSBvZiB0aGUgcmVhbCBmYWtlIGN1 cnNvci4gKi8pOworCisgIERFRlZBUl9QRVJfQlVGRkVSICgibWMtY29uZiIsICZCVkFSIChjdXJy ZW50X2J1ZmZlciwgbWNfY29uZiksIFFuaWwsCisgICAgZG9jOiAvKiBBIGJ1ZmVyLWxvY2FsIHZh cmlhYmxlIHRvIHN0b3JlIHRoZSB2YWx1ZSBvZiB0aGUgbXVsdGlwbGUgY3Vyc29ycyB0byBiZSBk aXNwbGF5ZWQKK2R1cmluZyB0aGUgbmV4dCByZWRpc3BsYXkuICovKTsKKworICBERUZWQVJfUEVS X0JVRkZFUiAoIm1jLWluYWN0aXZlLXdpbmRvd3MiLCAmQlZBUiAoY3VycmVudF9idWZmZXIsIG1j X2luYWN0aXZlX3dpbmRvd3MpLCBRbmlsLAorICAgIGRvYzogLyogV2hlbiBub24tbmlsLCBkcmF3 IG11bHRpcGxlIGN1cnNvcnMgaW4gaW5hY3RpdmUgd2luZG93cy4gKi8pOworCisgIERFRlZBUl9Q RVJfQlVGRkVSICgiY3Jvc3NoYWlycyIsICZCVkFSIChjdXJyZW50X2J1ZmZlciwgY3Jvc3NoYWly cyksIFFuaWwsCisgICAgZG9jOiAvKiBBIGJ1ZmVyLWxvY2FsIHZhcmlhYmxlIHRvIGFjdGl2YXRl L2RlYWN0aXZhdGUgY3Jvc3NoYWlycy4gKi8pOworCisgIERFRlZBUl9QRVJfQlVGRkVSICgiY2gt aG9yaXpvbnRhbC1ydWxlciIsICZCVkFSIChjdXJyZW50X2J1ZmZlciwgY2hfaG9yaXpvbnRhbF9y dWxlciksIFFuaWwsCisgICAgZG9jOiAvKiBBIGJ1ZmVyLWxvY2FsIHZhcmlhYmxlIHRvIGFjdGl2 YXRlL2RlYWN0aXZhdGUgdGhlIGNyb3NzaGFpcnMgaG9yaXpvbnRhbCBydWxlci4gKi8pOworCisv LyAgREVGVkFSX1BFUl9CVUZGRVIgKCJjaC12ZXJ0aWNhbC1ydWxlciIsICZCVkFSIChjdXJyZW50 X2J1ZmZlciwgY2hfdmVydGljYWxfcnVsZXIpLCBRbmlsLAorLy8gICAgZG9jOiAvKiBBIGJ1ZmVy LWxvY2FsIHZhcmlhYmxlIHRvIGFjdGl2YXRlL2RlYWN0aXZhdGUgdGhlIGNyb3NzaGFpcnMgdmVy dGljYWwgcnVsZXIuICovKTsKKy8vCisvLyAgREVGVkFSX1BFUl9CVUZGRVIgKCJjaC1pbmFjdGl2 ZS13aW5kb3dzIiwgJkJWQVIgKGN1cnJlbnRfYnVmZmVyLCBjaF9pbmFjdGl2ZV93aW5kb3dzKSwg UW5pbCwKKy8vICAgIGRvYzogLyogV2hlbiBub24tbmlsLCBkcmF3IGNyb3NzaGFpcnMgaW4gaW5h Y3RpdmUgd2luZG93cy4gKi8pOworLy8KKy8vICBERUZWQVJfUEVSX0JVRkZFUiAoImZjLXZpc2li bGUiLCAmQlZBUiAoY3VycmVudF9idWZmZXIsIGZjX3Zpc2libGUpLCBRbmlsLAorLy8gICAgZG9j OiAvKiBBIGJ1ZmVyLWxvY2FsIHZhcmlhYmxlIHRvIHR1cm4gb24vb2ZmIHRoZSBtdWx0aXBsZSBj dXJzb3JzIGZpbGwgY29sdW1uLiAqLyk7CisvLworLy8gIERFRlZBUl9QRVJfQlVGRkVSICgiZmMt aW5hY3RpdmUtd2luZG93cyIsICZCVkFSIChjdXJyZW50X2J1ZmZlciwgZmNfaW5hY3RpdmVfd2lu ZG93cyksIFFuaWwsCisvLyAgICBkb2M6IC8qIFdoZW4gbm9uLW5pbCwgZHJhdyBtdWx0aXBsZSBj dXJzb3JzIGZpbGwgY29sdW1uIGluIGluYWN0aXZlIHdpbmRvd3MuICovKTsKKworLyogKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqICovCisKKwogICBERUZWQVJfUEVSX0JVRkZFUiAoImhlYWRlci1saW5lLWZv cm1hdCIsCiAJCSAgICAgJkJWQVIgKGN1cnJlbnRfYnVmZmVyLCBoZWFkZXJfbGluZV9mb3JtYXQp LAogCQkgICAgIFFuaWwsCmRpZmYgLS1naXQgYS9zcmMvYnVmZmVyLmggYi9zcmMvYnVmZmVyLmgK aW5kZXggZDM1MjhhYy4uZDVhYzdhYSAxMDA2NDQKLS0tIGEvc3JjL2J1ZmZlci5oCisrKyBiL3Ny Yy9idWZmZXIuaApAQCAtNjM2LDYgKzYzNiw0MCBAQCBzdHJ1Y3QgYnVmZmVyCiAgICAgIGNhY2hl IGFyZSBlbmFibGVkLiAgU2VlIHNlYXJjaC5jLCBpbmRlbnQuYyBhbmQgYmlkaS5jIGZvciBkZXRh aWxzLiAgKi8KICAgTGlzcF9PYmplY3QgY2FjaGVfbG9uZ19zY2Fuc187CiAKKworLyogKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqICovCisvKiBNVUxUSVBMRS1DVVJTT1JTICovCisKKyAgLyogVGhlIGN1cnNv ciB0eXBlIG9mIHRoZSByZWFsIGZha2UgY3Vyc29yLiAqLworICBMaXNwX09iamVjdCBtY19yZWFs X2Zha2VfY3Vyc29yXzsKKworICAvKiBUaGUgbmFtZSBvZiBsaXN0IHVzZWQgYnkgbXVsdGlwbGUg Y3Vyc29ycyBmb3IgbmV4dCByZWRpc3BsYXkuICovCisgIExpc3BfT2JqZWN0IG1jX2NvbmZfOwor CisgIC8qIFdoZXRoZXIgdG8gZHJhdyBtdWx0aXBsZSBjdXJzb3JzIGluIGluYWN0aXZlIHdpbmRv d3MuICovCisgIExpc3BfT2JqZWN0IG1jX2luYWN0aXZlX3dpbmRvd3NfOworCisgIC8qIFRoZSBu YW1lIG9mIHRoZSBidWZmZXItbG9jYWwgdmFyaWFibGUuICovCisgIExpc3BfT2JqZWN0IGNyb3Nz aGFpcnNfOworCisgIC8qIFRoZSBuYW1lIG9mIHRoZSBjcm9zc2hhaXJzIGhvcml6b250YWwgcnVs ZXIuICovCisgIExpc3BfT2JqZWN0IGNoX2hvcml6b250YWxfcnVsZXJfOworCisvLyAgLyogVGhl IG5hbWUgb2YgdGhlIGNyb3NzaGFpcnMgdmVydGljYWwgcnVsZXIuICovCisvLyAgTGlzcF9PYmpl Y3QgY2hfdmVydGljYWxfcnVsZXJfOworLy8KKy8vICAvKiBXaGV0aGVyIHRvIGRyYXcgY3Jvc3No YWlycyBpbiBpbmFjdGl2ZSB3aW5kb3dzLiAqLworLy8gIExpc3BfT2JqZWN0IGNoX2luYWN0aXZl X3dpbmRvd3NfOworLy8KKy8vICAvKiBUaGUgbmFtZSBvZiB0aGUgYnVmZmVyLWxvY2FsIHZhcmlh YmxlLiAqLworLy8gIExpc3BfT2JqZWN0IGZjX3Zpc2libGVfOworLy8KKy8vICAvKiBXaGV0aGVy IHRvIGRyYXcgbXVsdGlwbGUgY3Vyc29ycyBmaWxsIGNvbHVtbiBpbiBpbmFjdGl2ZSB3aW5kb3dz LiAqLworLy8gIExpc3BfT2JqZWN0IGZjX2luYWN0aXZlX3dpbmRvd3NfOworCisvKiAqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKiogKi8KKworCiAgIC8qIElmIHRoZSB3aWR0aCBydW4gY2FjaGUgaXMgZW5hYmxl ZCwgdGhpcyB0YWJsZSBjb250YWlucyB0aGUKICAgICAgY2hhcmFjdGVyIHdpZHRocyB3aWR0aF9y dW5fY2FjaGUgKHNlZSBhYm92ZSkgYXNzdW1lcy4gIFdoZW4gd2UKICAgICAgZG8gYSB0aG9yb3Vn aCByZWRpc3BsYXksIHdlIGNvbXBhcmUgdGhpcyBhZ2FpbnN0IHRoZSBidWZmZXIncwpAQCAtODk2 LDYgKzkzMCw2OSBAQCBYQlVGRkVSIChMaXNwX09iamVjdCBhKQogLyogTW9zdCBjb2RlIHNob3Vs ZCB1c2UgdGhlc2UgZnVuY3Rpb25zIHRvIHNldCBMaXNwIGZpZWxkcyBpbiBzdHJ1Y3QKICAgIGJ1 ZmZlci4gIChTb21lIHNldHRlcnMgdGhhdCBhcmUgcHJpdmF0ZSB0byBhIHNpbmdsZSAuYyBmaWxl IGFyZQogICAgZGVmaW5lZCBhcyBzdGF0aWMgaW4gdGhvc2UgZmlsZXMuKSAgKi8KKworCisvKiAq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKiogKi8KKy8qIGJlZ2luIE1VTFRJUExFLUNVUlNPUlMgKi8KKworSU5M SU5FIHZvaWQKK2JzZXRfYmx2X21jX3JlYWxfZmFrZV9jdXJzb3IgKHN0cnVjdCBidWZmZXIgKmIs IExpc3BfT2JqZWN0IHZhbCkKK3sKKyAgYi0+bWNfcmVhbF9mYWtlX2N1cnNvcl8gPSB2YWw7Cit9 CisKK0lOTElORSB2b2lkCitic2V0X2Jsdl9tY19jb25mIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNw X09iamVjdCB2YWwpCit7CisgIGItPm1jX2NvbmZfID0gdmFsOworfQorCitJTkxJTkUgdm9pZAor YnNldF9ibHZfbWNfaW5hY3RpdmVfd2luZG93cyAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmpl Y3QgdmFsKQoreworICBiLT5tY19pbmFjdGl2ZV93aW5kb3dzXyA9IHZhbDsKK30KKworSU5MSU5F IHZvaWQKK2JzZXRfYmx2X2Nyb3NzaGFpcnMgKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0 IHZhbCkKK3sKKyAgYi0+Y3Jvc3NoYWlyc18gPSB2YWw7Cit9CisKK0lOTElORSB2b2lkCitic2V0 X2Jsdl9jaF9ob3Jpem9udGFsX3J1bGVyIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2 YWwpCit7CisgIGItPmNoX2hvcml6b250YWxfcnVsZXJfID0gdmFsOworfQorCisvLyAgSU5MSU5F IHZvaWQKKy8vICBic2V0X2Jsdl9jaF92ZXJ0aWNhbF9ydWxlciAoc3RydWN0IGJ1ZmZlciAqYiwg TGlzcF9PYmplY3QgdmFsKQorLy8gIHsKKy8vICAgIGItPmNoX3ZlcnRpY2FsX3J1bGVyXyA9IHZh bDsKKy8vICB9CisvLyAgCisvLyAgSU5MSU5FIHZvaWQKKy8vICBic2V0X2Jsdl9jaF9pbmFjdGl2 ZV93aW5kb3dzIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCisvLyAgeworLy8g ICAgYi0+Y2hfaW5hY3RpdmVfd2luZG93c18gPSB2YWw7CisvLyAgfQorLy8gIAorLy8gIElOTElO RSB2b2lkCisvLyAgYnNldF9ibHZfZmNfdmlzaWJsZSAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9P YmplY3QgdmFsKQorLy8gIHsKKy8vICAgIGItPmZjX3Zpc2libGVfID0gdmFsOworLy8gIH0KKy8v ICAKKy8vICBJTkxJTkUgdm9pZAorLy8gIGJzZXRfYmx2X2ZjX2luYWN0aXZlX3dpbmRvd3MgKHN0 cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZhbCkKKy8vICB7CisvLyAgICBiLT5mY19pbmFj dGl2ZV93aW5kb3dzXyA9IHZhbDsKKy8vICB9CisKKy8qIGVuZCBNVUxUSVBMRS1DVVJTT1JTICov CisvKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKiogKi8KKworCiBJTkxJTkUgdm9pZAogYnNldF9iaWRpX3Bh cmFncmFwaF9kaXJlY3Rpb24gKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZhbCkKIHsK ZGlmZiAtLWdpdCBhL3NyYy9wZHVtcGVyLmMgYi9zcmMvcGR1bXBlci5jCmluZGV4IDgxMTZjNzUu LmYzZGM5MTkgMTAwNjQ0Ci0tLSBhL3NyYy9wZHVtcGVyLmMKKysrIGIvc3JjL3BkdW1wZXIuYwpA QCAtMjc2MSw3ICsyNzYxLDcgQEAgZHVtcF9oYXNoX3RhYmxlIChzdHJ1Y3QgZHVtcF9jb250ZXh0 ICpjdHgsCiBzdGF0aWMgZHVtcF9vZmYKIGR1bXBfYnVmZmVyIChzdHJ1Y3QgZHVtcF9jb250ZXh0 ICpjdHgsIGNvbnN0IHN0cnVjdCBidWZmZXIgKmluX2J1ZmZlcikKIHsKLSNpZiBDSEVDS19TVFJV Q1RTICYmICFkZWZpbmVkIEhBU0hfYnVmZmVyX0FFMkM4Q0UzNTcKKyNpZiBDSEVDS19TVFJVQ1RT ICYmICFkZWZpbmVkIEhBU0hfYnVmZmVyXzNBRThDQjM5NjgKICMgZXJyb3IgImJ1ZmZlciBjaGFu Z2VkLiBTZWUgQ0hFQ0tfU1RSVUNUUyBjb21tZW50LiIKICNlbmRpZgogICBzdHJ1Y3QgYnVmZmVy IG11bmdlZF9idWZmZXIgPSAqaW5fYnVmZmVyOwo= --Multipart_Sat_Mar_30_16:19:50_2019-1--