From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yi Sun Subject: [PATCH v3 03/15] x86: rename 'cbm_type' to 'psr_type' to make it general Date: Tue, 5 Sep 2017 17:32:25 +0800 Message-ID: <1504603957-5389-4-git-send-email-yi.y.sun@linux.intel.com> References: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpAVg-0006xJ-4e for xen-devel@lists.xenproject.org; Tue, 05 Sep 2017 09:51:08 +0000 In-Reply-To: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, Yi Sun , julien.grall@arm.com, mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, dgdegra@tycho.nsa.gov, roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCByZW5hbWVzICdjYm1fdHlwZScgdG8gJ3Bzcl90eXBlJyB0byBtYWtlIGl0IGJl IGdlbmVyYWwuClRoZW4sIHdlIGNhbiByZXVzZSB0aGlzIGZvciBhbGwgcHNyIGFsbG9jYXRpb24g ZmVhdHVyZXMuCgpTaWduZWQtb2ZmLWJ5OiBZaSBTdW4gPHlpLnkuc3VuQGxpbnV4LmludGVsLmNv bT4KUmV2aWV3ZWQtYnk6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQp2MzoKICAg IC0gcmVwbGFjZSAncHNyX3ZhbF90eXBlJyB0byAncHNyX3R5cGUnIGFuZCByZW1vdmUgJ19WQUwn IGZyb20gdGhlIGVudW0KICAgICAgaXRlbXMuCiAgICAgIChzdWdnZXN0ZWQgYnkgUm9nZXIgUGF1 IE1vbm7DqSkKdjI6CiAgICAtIHJlcGxhY2UgJ1BTUl9WQUxfVFlQRV97TDMsIEwyfScgdG8gJ1BT Ul9WQUxfVFlQRV97TDMsIEwyfV9DQk0nLgogICAgICAoc3VnZ2VzdGVkIGJ5IENoYW8gUGVuZykK LS0tCiB4ZW4vYXJjaC94ODYvZG9tY3RsLmMgICAgIHwgMTYgKysrKysrLS0tLS0tCiB4ZW4vYXJj aC94ODYvcHNyLmMgICAgICAgIHwgNjIgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9zeXNjdGwuYyAgICAgfCAgNCArLS0KIHhlbi9p bmNsdWRlL2FzbS14ODYvcHNyLmggfCAxOCArKysrKysrLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2Vk LCA1MiBpbnNlcnRpb25zKCspLCA0OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJj aC94ODYvZG9tY3RsLmMgYi94ZW4vYXJjaC94ODYvZG9tY3RsLmMKaW5kZXggMTQyNGM5MC4uNjk2 ZWZmMiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2RvbWN0bC5jCisrKyBiL3hlbi9hcmNoL3g4 Ni9kb21jdGwuYwpAQCAtMTQ0Nyw1MSArMTQ0Nyw1MSBAQCBsb25nIGFyY2hfZG9fZG9tY3RsKAog ICAgICAgICBjYXNlIFhFTl9ET01DVExfUFNSX0FMTE9DX1NFVF9MM19DQk06CiAgICAgICAgICAg ICByZXQgPSBwc3Jfc2V0X3ZhbChkLCBkb21jdGwtPnUucHNyX2FsbG9jLnRhcmdldCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRvbWN0bC0+dS5wc3JfYWxsb2MuZGF0YSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9DQk1fVFlQRV9MMyk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBQU1JfVFlQRV9MM19DQk0pOwogICAgICAgICAgICAgYnJlYWs7CiAK ICAgICAgICAgY2FzZSBYRU5fRE9NQ1RMX1BTUl9BTExPQ19TRVRfTDNfQ09ERToKICAgICAgICAg ICAgIHJldCA9IHBzcl9zZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2MudGFyZ2V0LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxvYy5kYXRhLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wzX0NPREUpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgUFNSX1RZUEVfTDNfQ09ERSk7CiAgICAgICAgICAgICBi cmVhazsKIAogICAgICAgICBjYXNlIFhFTl9ET01DVExfUFNSX0FMTE9DX1NFVF9MM19EQVRBOgog ICAgICAgICAgICAgcmV0ID0gcHNyX3NldF92YWwoZCwgZG9tY3RsLT51LnBzcl9hbGxvYy50YXJn ZXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb21jdGwtPnUucHNyX2FsbG9jLmRh dGEsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQU1JfQ0JNX1RZUEVfTDNfREFUQSk7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQU1JfVFlQRV9MM19EQVRBKTsKICAgICAg ICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgWEVOX0RPTUNUTF9QU1JfQUxMT0NfU0VUX0wy X0NCTToKICAgICAgICAgICAgIHJldCA9IHBzcl9zZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxs b2MudGFyZ2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9h bGxvYy5kYXRhLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wy KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9UWVBFX0wyX0NCTSk7CiAgICAg ICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFhFTl9ET01DVExfUFNSX0FMTE9DX0dFVF9M M19DQk06CiAgICAgICAgICAgICByZXQgPSBwc3JfZ2V0X3ZhbChkLCBkb21jdGwtPnUucHNyX2Fs bG9jLnRhcmdldCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX0NC TV9UWVBFX0wzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX1RZ UEVfTDNfQ0JNKTsKICAgICAgICAgICAgIGRvbWN0bC0+dS5wc3JfYWxsb2MuZGF0YSA9IHZhbDMy OwogICAgICAgICAgICAgY29weWJhY2sgPSB0cnVlOwogICAgICAgICAgICAgYnJlYWs7CiAKICAg ICAgICAgY2FzZSBYRU5fRE9NQ1RMX1BTUl9BTExPQ19HRVRfTDNfQ09ERToKICAgICAgICAgICAg IHJldCA9IHBzcl9nZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2MudGFyZ2V0LAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJnZhbDMyLCBQU1JfQ0JNX1RZUEVfTDNfQ09ERSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmdmFsMzIsIFBTUl9UWVBFX0wzX0NPREUpOwog ICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxvYy5kYXRhID0gdmFsMzI7CiAgICAgICAgICAg ICBjb3B5YmFjayA9IHRydWU7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFhF Tl9ET01DVExfUFNSX0FMTE9DX0dFVF9MM19EQVRBOgogICAgICAgICAgICAgcmV0ID0gcHNyX2dl dF92YWwoZCwgZG9tY3RsLT51LnBzcl9hbGxvYy50YXJnZXQsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAmdmFsMzIsIFBTUl9DQk1fVFlQRV9MM19EQVRBKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX1RZUEVfTDNfREFUQSk7CiAgICAgICAgICAgICBk b21jdGwtPnUucHNyX2FsbG9jLmRhdGEgPSB2YWwzMjsKICAgICAgICAgICAgIGNvcHliYWNrID0g dHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgWEVOX0RPTUNUTF9QU1Jf QUxMT0NfR0VUX0wyX0NCTToKICAgICAgICAgICAgIHJldCA9IHBzcl9nZXRfdmFsKGQsIGRvbWN0 bC0+dS5wc3JfYWxsb2MudGFyZ2V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnZh bDMyLCBQU1JfQ0JNX1RZUEVfTDIpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnZh bDMyLCBQU1JfVFlQRV9MMl9DQk0pOwogICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxvYy5k YXRhID0gdmFsMzI7CiAgICAgICAgICAgICBjb3B5YmFjayA9IHRydWU7CiAgICAgICAgICAgICBi cmVhazsKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9wc3IuYyBiL3hlbi9hcmNoL3g4Ni9wc3Iu YwppbmRleCBjMDEyM2QyLi40MTY2YTFjIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvcHNyLmMK KysrIGIveGVuL2FyY2gveDg2L3Bzci5jCkBAIC0xMDAsMjQgKzEwMCwyNCBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGZlYXRfcHJvcHMgewogICAgIHVuc2lnbmVkIGludCBjb3NfbnVtOwogCiAgICAg LyoKLSAgICAgKiBBbiBhcnJheSB0byBzYXZlIGFsbCAnZW51bSBjYm1fdHlwZScgdmFsdWVzIG9m IHRoZSBmZWF0dXJlLiBJdCBpcworICAgICAqIEFuIGFycmF5IHRvIHNhdmUgYWxsICdlbnVtIHBz cl90eXBlJyB2YWx1ZXMgb2YgdGhlIGZlYXR1cmUuIEl0IGlzCiAgICAgICogdXNlZCB3aXRoIGNv c19udW0gdG9nZXRoZXIgdG8gZ2V0L3dyaXRlIGEgZmVhdHVyZSdzIENPUyByZWdpc3RlcnMKICAg ICAgKiB2YWx1ZXMgb25lIGJ5IG9uZS4KICAgICAgKi8KLSAgICBlbnVtIGNibV90eXBlIHR5cGVb TUFYX0NPU19OVU1dOworICAgIGVudW0gcHNyX3R5cGUgdHlwZVtNQVhfQ09TX05VTV07CiAKICAg ICAvKgogICAgICAqIGFsdF90eXBlIGlzICdhbHRlcm5hdGl2ZSB0eXBlJy4gV2hlbiB0aGlzICdh bHRfdHlwZScgaXMgaW5wdXQsIHRoZQogICAgICAqIGZlYXR1cmUgZG9lcyBzb21lIHNwZWNpYWwg b3BlcmF0aW9ucy4KICAgICAgKi8KLSAgICBlbnVtIGNibV90eXBlIGFsdF90eXBlOworICAgIGVu dW0gcHNyX3R5cGUgYWx0X3R5cGU7CiAKICAgICAvKiBnZXRfZmVhdF9pbmZvIGlzIHVzZWQgdG8g cmV0dXJuIGZlYXR1cmUgSFcgaW5mbyB0aHJvdWdoIHN5c2N0bC4gKi8KICAgICBib29sICgqZ2V0 X2ZlYXRfaW5mbykoY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgdWludDMyX3QgZGF0YVtdLCB1bnNpZ25lZCBpbnQgYXJyYXlfbGVuKTsKIAog ICAgIC8qIHdyaXRlX21zciBpcyB1c2VkIHRvIHdyaXRlIG91dCBmZWF0dXJlIE1TUiByZWdpc3Rl ci4gKi8KLSAgICB2b2lkICgqd3JpdGVfbXNyKSh1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2 YWwsIGVudW0gY2JtX3R5cGUgdHlwZSk7CisgICAgdm9pZCAoKndyaXRlX21zcikodW5zaWduZWQg aW50IGNvcywgdWludDMyX3QgdmFsLCBlbnVtIHBzcl90eXBlIHR5cGUpOwogfSAqZmVhdF9wcm9w c1tGRUFUX1RZUEVfTlVNXTsKIAogLyoKQEAgLTIxNSwxMyArMjE1LDEzIEBAIHN0YXRpYyB2b2lk IGZyZWVfc29ja2V0X3Jlc291cmNlcyh1bnNpZ25lZCBpbnQgc29ja2V0KQogICAgIGJpdG1hcF96 ZXJvKGluZm8tPmRvbV9zZXQsIERPTUlEX0lETEUgKyAxKTsKIH0KIAotc3RhdGljIGVudW0gcHNy X2ZlYXRfdHlwZSBwc3JfY2JtX3R5cGVfdG9fZmVhdF90eXBlKGVudW0gY2JtX3R5cGUgdHlwZSkK K3N0YXRpYyBlbnVtIHBzcl9mZWF0X3R5cGUgcHNyX3R5cGVfdG9fZmVhdF90eXBlKGVudW0gcHNy X3R5cGUgdHlwZSkKIHsKICAgICBlbnVtIHBzcl9mZWF0X3R5cGUgZmVhdF90eXBlID0gRkVBVF9U WVBFX1VOS05PV047CiAKICAgICBzd2l0Y2ggKCB0eXBlICkKICAgICB7Ci0gICAgY2FzZSBQU1Jf Q0JNX1RZUEVfTDM6CisgICAgY2FzZSBQU1JfVFlQRV9MM19DQk06CiAgICAgICAgIGZlYXRfdHlw ZSA9IEZFQVRfVFlQRV9MM19DQVQ7CiAKICAgICAgICAgLyoKQEAgLTIzMywxMiArMjMzLDEyIEBA IHN0YXRpYyBlbnVtIHBzcl9mZWF0X3R5cGUgcHNyX2NibV90eXBlX3RvX2ZlYXRfdHlwZShlbnVt IGNibV90eXBlIHR5cGUpCiAKICAgICAgICAgYnJlYWs7CiAKLSAgICBjYXNlIFBTUl9DQk1fVFlQ RV9MM19EQVRBOgotICAgIGNhc2UgUFNSX0NCTV9UWVBFX0wzX0NPREU6CisgICAgY2FzZSBQU1Jf VFlQRV9MM19EQVRBOgorICAgIGNhc2UgUFNSX1RZUEVfTDNfQ09ERToKICAgICAgICAgZmVhdF90 eXBlID0gRkVBVF9UWVBFX0wzX0NEUDsKICAgICAgICAgYnJlYWs7CiAKLSAgICBjYXNlIFBTUl9D Qk1fVFlQRV9MMjoKKyAgICBjYXNlIFBTUl9UWVBFX0wyX0NCTToKICAgICAgICAgZmVhdF90eXBl ID0gRkVBVF9UWVBFX0wyX0NBVDsKICAgICAgICAgYnJlYWs7CiAKQEAgLTM2MiwxNSArMzYyLDE2 IEBAIHN0YXRpYyBib29sIGNhdF9nZXRfZmVhdF9pbmZvKGNvbnN0IHN0cnVjdCBmZWF0X25vZGUg KmZlYXQsCiB9CiAKIC8qIEwzIENBVCBwcm9wcyAqLwotc3RhdGljIHZvaWQgbDNfY2F0X3dyaXRl X21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSkK K3N0YXRpYyB2b2lkIGwzX2NhdF93cml0ZV9tc3IodW5zaWduZWQgaW50IGNvcywgdWludDMyX3Qg dmFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnVtIHBzcl90eXBlIHR5cGUpCiB7 CiAgICAgd3Jtc3JsKE1TUl9JQTMyX1BTUl9MM19NQVNLKGNvcyksIHZhbCk7CiB9CiAKIHN0YXRp YyBjb25zdCBzdHJ1Y3QgZmVhdF9wcm9wcyBsM19jYXRfcHJvcHMgPSB7CiAgICAgLmNvc19udW0g PSAxLAotICAgIC50eXBlWzBdID0gUFNSX0NCTV9UWVBFX0wzLAotICAgIC5hbHRfdHlwZSA9IFBT Ul9DQk1fVFlQRV9VTktOT1dOLAorICAgIC50eXBlWzBdID0gUFNSX1RZUEVfTDNfQ0JNLAorICAg IC5hbHRfdHlwZSA9IFBTUl9UWVBFX1VOS05PV04sCiAgICAgLmdldF9mZWF0X2luZm8gPSBjYXRf Z2V0X2ZlYXRfaW5mbywKICAgICAud3JpdGVfbXNyID0gbDNfY2F0X3dyaXRlX21zciwKIH07CkBA IC0zODcsOSArMzg4LDEwIEBAIHN0YXRpYyBib29sIGwzX2NkcF9nZXRfZmVhdF9pbmZvKGNvbnN0 IHN0cnVjdCBmZWF0X25vZGUgKmZlYXQsCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyB2 b2lkIGwzX2NkcF93cml0ZV9tc3IodW5zaWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLCBlbnVt IGNibV90eXBlIHR5cGUpCitzdGF0aWMgdm9pZCBsM19jZHBfd3JpdGVfbXNyKHVuc2lnbmVkIGlu dCBjb3MsIHVpbnQzMl90IHZhbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW51bSBw c3JfdHlwZSB0eXBlKQogewotICAgIHdybXNybCgoKHR5cGUgPT0gUFNSX0NCTV9UWVBFX0wzX0RB VEEpID8KKyAgICB3cm1zcmwoKCh0eXBlID09IFBTUl9UWVBFX0wzX0RBVEEpID8KICAgICAgICAg ICAgIE1TUl9JQTMyX1BTUl9MM19NQVNLX0RBVEEoY29zKSA6CiAgICAgICAgICAgICBNU1JfSUEz Ml9QU1JfTDNfTUFTS19DT0RFKGNvcykpLAogICAgICAgICAgICB2YWwpOwpAQCAtMzk3LDIzICsz OTksMjQgQEAgc3RhdGljIHZvaWQgbDNfY2RwX3dyaXRlX21zcih1bnNpZ25lZCBpbnQgY29zLCB1 aW50MzJfdCB2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSkKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBm ZWF0X3Byb3BzIGwzX2NkcF9wcm9wcyA9IHsKICAgICAuY29zX251bSA9IDIsCi0gICAgLnR5cGVb MF0gPSBQU1JfQ0JNX1RZUEVfTDNfREFUQSwKLSAgICAudHlwZVsxXSA9IFBTUl9DQk1fVFlQRV9M M19DT0RFLAotICAgIC5hbHRfdHlwZSA9IFBTUl9DQk1fVFlQRV9MMywKKyAgICAudHlwZVswXSA9 IFBTUl9UWVBFX0wzX0RBVEEsCisgICAgLnR5cGVbMV0gPSBQU1JfVFlQRV9MM19DT0RFLAorICAg IC5hbHRfdHlwZSA9IFBTUl9UWVBFX0wzX0NCTSwKICAgICAuZ2V0X2ZlYXRfaW5mbyA9IGwzX2Nk cF9nZXRfZmVhdF9pbmZvLAogICAgIC53cml0ZV9tc3IgPSBsM19jZHBfd3JpdGVfbXNyLAogfTsK IAogLyogTDIgQ0FUIHByb3BzICovCi1zdGF0aWMgdm9pZCBsMl9jYXRfd3JpdGVfbXNyKHVuc2ln bmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKQorc3RhdGljIHZv aWQgbDJfY2F0X3dyaXRlX21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2YWwsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGVudW0gcHNyX3R5cGUgdHlwZSkKIHsKICAgICB3cm1z cmwoTVNSX0lBMzJfUFNSX0wyX01BU0soY29zKSwgdmFsKTsKIH0KIAogc3RhdGljIGNvbnN0IHN0 cnVjdCBmZWF0X3Byb3BzIGwyX2NhdF9wcm9wcyA9IHsKICAgICAuY29zX251bSA9IDEsCi0gICAg LnR5cGVbMF0gPSBQU1JfQ0JNX1RZUEVfTDIsCi0gICAgLmFsdF90eXBlID0gUFNSX0NCTV9UWVBF X1VOS05PV04sCisgICAgLnR5cGVbMF0gPSBQU1JfVFlQRV9MMl9DQk0sCisgICAgLmFsdF90eXBl ID0gUFNSX1RZUEVfVU5LTk9XTiwKICAgICAuZ2V0X2ZlYXRfaW5mbyA9IGNhdF9nZXRfZmVhdF9p bmZvLAogICAgIC53cml0ZV9tc3IgPSBsMl9jYXRfd3JpdGVfbXNyLAogfTsKQEAgLTY1NCw3ICs2 NTcsNyBAQCBzdGF0aWMgc3RydWN0IHBzcl9zb2NrZXRfaW5mbyAqZ2V0X3NvY2tldF9pbmZvKHVu c2lnbmVkIGludCBzb2NrZXQpCiAgICAgcmV0dXJuIHNvY2tldF9pbmZvICsgc29ja2V0OwogfQog Ci1pbnQgcHNyX2dldF9pbmZvKHVuc2lnbmVkIGludCBzb2NrZXQsIGVudW0gY2JtX3R5cGUgdHlw ZSwKK2ludCBwc3JfZ2V0X2luZm8odW5zaWduZWQgaW50IHNvY2tldCwgZW51bSBwc3JfdHlwZSB0 eXBlLAogICAgICAgICAgICAgICAgICB1aW50MzJfdCBkYXRhW10sIHVuc2lnbmVkIGludCBhcnJh eV9sZW4pCiB7CiAgICAgY29uc3Qgc3RydWN0IHBzcl9zb2NrZXRfaW5mbyAqaW5mbyA9IGdldF9z b2NrZXRfaW5mbyhzb2NrZXQpOwpAQCAtNjY2LDcgKzY2OSw3IEBAIGludCBwc3JfZ2V0X2luZm8o dW5zaWduZWQgaW50IHNvY2tldCwgZW51bSBjYm1fdHlwZSB0eXBlLAogICAgIGlmICggSVNfRVJS KGluZm8pICkKICAgICAgICAgcmV0dXJuIFBUUl9FUlIoaW5mbyk7CiAKLSAgICBmZWF0X3R5cGUg PSBwc3JfY2JtX3R5cGVfdG9fZmVhdF90eXBlKHR5cGUpOworICAgIGZlYXRfdHlwZSA9IHBzcl90 eXBlX3RvX2ZlYXRfdHlwZSh0eXBlKTsKICAgICBpZiAoIGZlYXRfdHlwZSA+PSBBUlJBWV9TSVpF KGluZm8tPmZlYXR1cmVzKSApCiAgICAgICAgIHJldHVybiAtRU5PRU5UOwogCkBAIC02ODcsNyAr NjkwLDcgQEAgaW50IHBzcl9nZXRfaW5mbyh1bnNpZ25lZCBpbnQgc29ja2V0LCBlbnVtIGNibV90 eXBlIHR5cGUsCiB9CiAKIGludCBwc3JfZ2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25l ZCBpbnQgc29ja2V0LAotICAgICAgICAgICAgICAgIHVpbnQzMl90ICp2YWwsIGVudW0gY2JtX3R5 cGUgdHlwZSkKKyAgICAgICAgICAgICAgICB1aW50MzJfdCAqdmFsLCBlbnVtIHBzcl90eXBlIHR5 cGUpCiB7CiAgICAgY29uc3Qgc3RydWN0IHBzcl9zb2NrZXRfaW5mbyAqaW5mbyA9IGdldF9zb2Nr ZXRfaW5mbyhzb2NrZXQpOwogICAgIGNvbnN0IHN0cnVjdCBmZWF0X25vZGUgKmZlYXQ7CkBAIC02 OTksNyArNzAyLDcgQEAgaW50IHBzcl9nZXRfdmFsKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVk IGludCBzb2NrZXQsCiAgICAgaWYgKCBJU19FUlIoaW5mbykgKQogICAgICAgICByZXR1cm4gUFRS X0VSUihpbmZvKTsKIAotICAgIGZlYXRfdHlwZSA9IHBzcl9jYm1fdHlwZV90b19mZWF0X3R5cGUo dHlwZSk7CisgICAgZmVhdF90eXBlID0gcHNyX3R5cGVfdG9fZmVhdF90eXBlKHR5cGUpOwogICAg IGlmICggZmVhdF90eXBlID49IEFSUkFZX1NJWkUoaW5mby0+ZmVhdHVyZXMpICkKICAgICAgICAg cmV0dXJuIC1FTk9FTlQ7CiAKQEAgLTgyOSw3ICs4MzIsNyBAQCBzdGF0aWMgaW50IGluc2VydF92 YWxfaW50b19hcnJheSh1aW50MzJfdCB2YWxbXSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVuc2lnbmVkIGludCBhcnJheV9sZW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBzdHJ1Y3QgcHNyX3NvY2tldF9pbmZvICppbmZvLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZW51bSBwc3JfZmVhdF90eXBlIGZlYXRfdHlwZSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudW0gY2JtX3R5cGUgdHlwZSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGVudW0gcHNyX3R5cGUgdHlwZSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IG5ld192YWwpCiB7CiAgICAgY29uc3Qgc3Ry dWN0IGZlYXRfbm9kZSAqZmVhdDsKQEAgLTg2NSw4ICs4NjgsOSBAQCBzdGF0aWMgaW50IGluc2Vy dF92YWxfaW50b19hcnJheSh1aW50MzJfdCB2YWxbXSwKICAgICAvKgogICAgICAqIFZhbHVlIHNl dHRpbmcgcG9zaXRpb24gaXMgc2FtZSBhcyBmZWF0dXJlIGFycmF5LgogICAgICAqIEZvciBDRFAs IHVzZXIgbWF5IHNldCBib3RoIERBVEEgYW5kIENPREUgdG8gc2FtZSB2YWx1ZS4gRm9yIHN1Y2gg Y2FzZSwKLSAgICAgKiB1c2VyIGlucHV0ICdQU1JfQ0JNX1RZUEVfTDMnIGFzIHR5cGUuIFRoZSBh bHRlcm5hdGl2ZSB0eXBlIG9mIENEUCBpcyBzYW1lCi0gICAgICogYXMgaXQuIFNvIHdlIHNob3Vs ZCBzZXQgbmV3X3ZhbCB0byBib3RoIG9mIERBVEEgYW5kIENPREUgdW5kZXIgc3VjaCBjYXNlLgor ICAgICAqIHVzZXIgaW5wdXQgJ1BTUl9UWVBFX0wzX0NCTScgYXMgdHlwZS4gVGhlIGFsdGVybmF0 aXZlIHR5cGUgb2YgQ0RQIGlzCisgICAgICogc2FtZSBhcyBpdC4gU28gd2Ugc2hvdWxkIHNldCBu ZXdfdmFsIHRvIGJvdGggb2YgREFUQSBhbmQgQ09ERSB1bmRlciBzdWNoCisgICAgICogY2FzZS4K ICAgICAgKi8KICAgICBmb3IgKCBpID0gMDsgaSA8IHByb3BzLT5jb3NfbnVtOyBpKysgKQogICAg IHsKQEAgLTExNTUsNyArMTE1OSw3IEBAIHN0YXRpYyBpbnQgd3JpdGVfcHNyX21zcnModW5zaWdu ZWQgaW50IHNvY2tldCwgdW5zaWduZWQgaW50IGNvcywKIH0KIAogaW50IHBzcl9zZXRfdmFsKHN0 cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBzb2NrZXQsCi0gICAgICAgICAgICAgICAgdWlu dDY0X3QgbmV3X3ZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKQorICAgICAgICAgICAgICAgIHVpbnQ2 NF90IG5ld192YWwsIGVudW0gcHNyX3R5cGUgdHlwZSkKIHsKICAgICB1bnNpZ25lZCBpbnQgb2xk X2NvcywgYXJyYXlfbGVuOwogICAgIGludCBjb3MsIHJldDsKQEAgLTExNzEsNyArMTE3NSw3IEBA IGludCBwc3Jfc2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgc29ja2V0LAog ICAgIGlmICggbmV3X3ZhbCAhPSB2YWwgKQogICAgICAgICByZXR1cm4gLUVJTlZBTDsKIAotICAg IGZlYXRfdHlwZSA9IHBzcl9jYm1fdHlwZV90b19mZWF0X3R5cGUodHlwZSk7CisgICAgZmVhdF90 eXBlID0gcHNyX3R5cGVfdG9fZmVhdF90eXBlKHR5cGUpOwogICAgIGlmICggZmVhdF90eXBlID49 IEFSUkFZX1NJWkUoaW5mby0+ZmVhdHVyZXMpIHx8CiAgICAgICAgICAhaW5mby0+ZmVhdHVyZXNb ZmVhdF90eXBlXSApCiAgICAgICAgIHJldHVybiAtRU5PRU5UOwpkaWZmIC0tZ2l0IGEveGVuL2Fy Y2gveDg2L3N5c2N0bC5jIGIveGVuL2FyY2gveDg2L3N5c2N0bC5jCmluZGV4IDdkY2JlNzQuLjFk M2RiZDAgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9zeXNjdGwuYworKysgYi94ZW4vYXJjaC94 ODYvc3lzY3RsLmMKQEAgLTE3OSw3ICsxNzksNyBAQCBsb25nIGFyY2hfZG9fc3lzY3RsKAogICAg ICAgICBjYXNlIFhFTl9TWVNDVExfUFNSX0FMTE9DX2dldF9sM19pbmZvOgogICAgICAgICB7CiAg ICAgICAgICAgICByZXQgPSBwc3JfZ2V0X2luZm8oc3lzY3RsLT51LnBzcl9hbGxvYy50YXJnZXQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wzLCBkYXRhLCBB UlJBWV9TSVpFKGRhdGEpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQU1JfVFlQ RV9MM19DQk0sIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOwogICAgICAgICAgICAgaWYgKCByZXQg KQogICAgICAgICAgICAgICAgIGJyZWFrOwogCkBAIC0xOTgsNyArMTk4LDcgQEAgbG9uZyBhcmNo X2RvX3N5c2N0bCgKICAgICAgICAgY2FzZSBYRU5fU1lTQ1RMX1BTUl9BTExPQ19nZXRfbDJfaW5m bzoKICAgICAgICAgewogICAgICAgICAgICAgcmV0ID0gcHNyX2dldF9pbmZvKHN5c2N0bC0+dS5w c3JfYWxsb2MudGFyZ2V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9DQk1f VFlQRV9MMiwgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgUFNSX1RZUEVfTDJfQ0JNLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKICAgICAg ICAgICAgIGlmICggcmV0ICkKICAgICAgICAgICAgICAgICBicmVhazsKIApkaWZmIC0tZ2l0IGEv eGVuL2luY2x1ZGUvYXNtLXg4Ni9wc3IuaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcHNyLmgKaW5k ZXggMThhNDJmMy4uY2IzZjA2NyAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9wc3Iu aAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L3Bzci5oCkBAIC01MywxMiArNTMsMTIgQEAgc3Ry dWN0IHBzcl9jbXQgewogICAgIHN0cnVjdCBwc3JfY210X2wzIGwzOwogfTsKIAotZW51bSBjYm1f dHlwZSB7Ci0gICAgUFNSX0NCTV9UWVBFX0wzLAotICAgIFBTUl9DQk1fVFlQRV9MM19DT0RFLAot ICAgIFBTUl9DQk1fVFlQRV9MM19EQVRBLAotICAgIFBTUl9DQk1fVFlQRV9MMiwKLSAgICBQU1Jf Q0JNX1RZUEVfVU5LTk9XTiwKK2VudW0gcHNyX3R5cGUgeworICAgIFBTUl9UWVBFX0wzX0NCTSwK KyAgICBQU1JfVFlQRV9MM19DT0RFLAorICAgIFBTUl9UWVBFX0wzX0RBVEEsCisgICAgUFNSX1RZ UEVfTDJfQ0JNLAorICAgIFBTUl9UWVBFX1VOS05PV04sCiB9OwogCiBleHRlcm4gc3RydWN0IHBz cl9jbXQgKnBzcl9jbXQ7CkBAIC03MiwxMiArNzIsMTIgQEAgaW50IHBzcl9hbGxvY19ybWlkKHN0 cnVjdCBkb21haW4gKmQpOwogdm9pZCBwc3JfZnJlZV9ybWlkKHN0cnVjdCBkb21haW4gKmQpOwog dm9pZCBwc3JfY3R4dF9zd2l0Y2hfdG8oc3RydWN0IGRvbWFpbiAqZCk7CiAKLWludCBwc3JfZ2V0 X2luZm8odW5zaWduZWQgaW50IHNvY2tldCwgZW51bSBjYm1fdHlwZSB0eXBlLAoraW50IHBzcl9n ZXRfaW5mbyh1bnNpZ25lZCBpbnQgc29ja2V0LCBlbnVtIHBzcl90eXBlIHR5cGUsCiAgICAgICAg ICAgICAgICAgIHVpbnQzMl90IGRhdGFbXSwgdW5zaWduZWQgaW50IGFycmF5X2xlbik7CiBpbnQg cHNyX2dldF92YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHNvY2tldCwKLSAgICAg ICAgICAgICAgICB1aW50MzJfdCAqdmFsLCBlbnVtIGNibV90eXBlIHR5cGUpOworICAgICAgICAg ICAgICAgIHVpbnQzMl90ICp2YWwsIGVudW0gcHNyX3R5cGUgdHlwZSk7CiBpbnQgcHNyX3NldF92 YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHNvY2tldCwKLSAgICAgICAgICAgICAg ICB1aW50NjRfdCB2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSk7CisgICAgICAgICAgICAgICAgdWlu dDY0X3QgdmFsLCBlbnVtIHBzcl90eXBlIHR5cGUpOwogCiB2b2lkIHBzcl9kb21haW5faW5pdChz dHJ1Y3QgZG9tYWluICpkKTsKIHZvaWQgcHNyX2RvbWFpbl9mcmVlKHN0cnVjdCBkb21haW4gKmQp OwotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBz Oi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK