From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yi Sun Subject: [PATCH v8 03/16] x86: rename 'cbm_type' to 'psr_type' to make it general Date: Mon, 16 Oct 2017 11:04:08 +0800 Message-ID: <1508123061-6600-4-git-send-email-yi.y.sun@linux.intel.com> References: <1508123061-6600-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.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e3w1v-0002P0-FF for xen-devel@lists.xenproject.org; Mon, 16 Oct 2017 03:25:27 +0000 In-Reply-To: <1508123061-6600-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: Wei Liu , Yi Sun , Andrew Cooper , Jan Beulich , Chao Peng , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCByZW5hbWVzICdjYm1fdHlwZScgdG8gJ3Bzcl90eXBlJyB0byBnZW5lcmFsaXpl IGl0LgpUaGVuLCB3ZSBjYW4gcmV1c2UgdGhpcyBmb3IgYWxsIHBzciBhbGxvY2F0aW9uIGZlYXR1 cmVzLgoKU2lnbmVkLW9mZi1ieTogWWkgU3VuIDx5aS55LnN1bkBsaW51eC5pbnRlbC5jb20+ClJl dmlld2VkLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgpSZXZpZXdlZC1ieTogUm9n ZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+CkFja2VkLWJ5OiBKYW4gQmV1bGlj aCA8amJldWxpY2hAc3VzZS5jb20+Ci0tLQpDQzogSmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2Uu Y29tPgpDQzogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KQ0M6IFdl aSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNDOiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5w YXVAY2l0cml4LmNvbT4KQ0M6IENoYW8gUGVuZyA8Y2hhby5wLnBlbmdAbGludXguaW50ZWwuY29t PgoKdjU6CiAgICAtIGNvcnJlY3QgY2hhcmFjdGVyIG9mIHJldmlld2VyJ3MgbmFtZS4KICAgICAg KHN1Z2dlc3RlZCBieSBKYW4gQmV1bGljaCkKdjQ6CiAgICAtIGZpeCB3b3JkcyBpbiBjb21taXQg bWVzc2FnZS4KICAgICAgKHN1Z2dlc3RlZCBieSBSb2dlciBQYXUgTW9ubsOpKQp2MzoKICAgIC0g cmVwbGFjZSAncHNyX3ZhbF90eXBlJyB0byAncHNyX3R5cGUnIGFuZCByZW1vdmUgJ19WQUwnIGZy b20gdGhlIGVudW0KICAgICAgaXRlbXMuCiAgICAgIChzdWdnZXN0ZWQgYnkgUm9nZXIgUGF1IE1v bm7DqSkKdjI6CiAgICAtIHJlcGxhY2UgJ1BTUl9WQUxfVFlQRV97TDMsIEwyfScgdG8gJ1BTUl9W QUxfVFlQRV97TDMsIEwyfV9DQk0nLgogICAgICAoc3VnZ2VzdGVkIGJ5IENoYW8gUGVuZykKLS0t CiB4ZW4vYXJjaC94ODYvZG9tY3RsLmMgICAgIHwgMTYgKysrKysrLS0tLS0tCiB4ZW4vYXJjaC94 ODYvcHNyLmMgICAgICAgIHwgNjIgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9zeXNjdGwuYyAgICAgfCAgNCArLS0KIHhlbi9pbmNs dWRlL2FzbS14ODYvcHNyLmggfCAxOCArKysrKysrLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA1 MiBpbnNlcnRpb25zKCspLCA0OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94 ODYvZG9tY3RsLmMgYi94ZW4vYXJjaC94ODYvZG9tY3RsLmMKaW5kZXggMWNmZmU5My4uYmMwMjVj ZSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2RvbWN0bC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9k b21jdGwuYwpAQCAtMTQ0NCwyNSArMTQ0NCwyNSBAQCBsb25nIGFyY2hfZG9fZG9tY3RsKAogICAg ICAgICBjYXNlIFhFTl9ET01DVExfUFNSX1NFVF9MM19DQk06CiAgICAgICAgICAgICByZXQgPSBw c3Jfc2V0X3ZhbChkLCBkb21jdGwtPnUucHNyX2FsbG9jLnRhcmdldCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRvbWN0bC0+dS5wc3JfYWxsb2MuZGF0YSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFBTUl9DQk1fVFlQRV9MMyk7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBQU1JfVFlQRV9MM19DQk0pOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAg Y2FzZSBYRU5fRE9NQ1RMX1BTUl9TRVRfTDNfQ09ERToKICAgICAgICAgICAgIHJldCA9IHBzcl9z ZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2MudGFyZ2V0LAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxvYy5kYXRhLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wzX0NPREUpOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgUFNSX1RZUEVfTDNfQ09ERSk7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAg ICBjYXNlIFhFTl9ET01DVExfUFNSX1NFVF9MM19EQVRBOgogICAgICAgICAgICAgcmV0ID0gcHNy X3NldF92YWwoZCwgZG9tY3RsLT51LnBzcl9hbGxvYy50YXJnZXQsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBkb21jdGwtPnUucHNyX2FsbG9jLmRhdGEsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBQU1JfQ0JNX1RZUEVfTDNfREFUQSk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBQU1JfVFlQRV9MM19EQVRBKTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAg ICAgIGNhc2UgWEVOX0RPTUNUTF9QU1JfU0VUX0wyX0NCTToKICAgICAgICAgICAgIHJldCA9IHBz cl9zZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2MudGFyZ2V0LAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxvYy5kYXRhLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wyKTsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFBTUl9UWVBFX0wyX0NCTSk7CiAgICAgICAgICAgICBicmVhazsKIAogI2RlZmluZSBk b21jdGxfcHNyX2dldF92YWwoZCwgZG9tY3RsLCB0eXBlLCBjb3B5YmFjaykgKHsgICAgXApAQCAt MTQ3NiwxOSArMTQ3NiwxOSBAQCBsb25nIGFyY2hfZG9fZG9tY3RsKAogfSkKIAogICAgICAgICBj YXNlIFhFTl9ET01DVExfUFNSX0dFVF9MM19DQk06Ci0gICAgICAgICAgICByZXQgPSBkb21jdGxf cHNyX2dldF92YWwoZCwgZG9tY3RsLCBQU1JfQ0JNX1RZUEVfTDMsIGNvcHliYWNrKTsKKyAgICAg ICAgICAgIHJldCA9IGRvbWN0bF9wc3JfZ2V0X3ZhbChkLCBkb21jdGwsIFBTUl9UWVBFX0wzX0NC TSwgY29weWJhY2spOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBYRU5fRE9N Q1RMX1BTUl9HRVRfTDNfQ09ERToKLSAgICAgICAgICAgIHJldCA9IGRvbWN0bF9wc3JfZ2V0X3Zh bChkLCBkb21jdGwsIFBTUl9DQk1fVFlQRV9MM19DT0RFLCBjb3B5YmFjayk7CisgICAgICAgICAg ICByZXQgPSBkb21jdGxfcHNyX2dldF92YWwoZCwgZG9tY3RsLCBQU1JfVFlQRV9MM19DT0RFLCBj b3B5YmFjayk7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFhFTl9ET01DVExf UFNSX0dFVF9MM19EQVRBOgotICAgICAgICAgICAgcmV0ID0gZG9tY3RsX3Bzcl9nZXRfdmFsKGQs IGRvbWN0bCwgUFNSX0NCTV9UWVBFX0wzX0RBVEEsIGNvcHliYWNrKTsKKyAgICAgICAgICAgIHJl dCA9IGRvbWN0bF9wc3JfZ2V0X3ZhbChkLCBkb21jdGwsIFBTUl9UWVBFX0wzX0RBVEEsIGNvcHli YWNrKTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgWEVOX0RPTUNUTF9QU1Jf R0VUX0wyX0NCTToKLSAgICAgICAgICAgIHJldCA9IGRvbWN0bF9wc3JfZ2V0X3ZhbChkLCBkb21j dGwsIFBTUl9DQk1fVFlQRV9MMiwgY29weWJhY2spOworICAgICAgICAgICAgcmV0ID0gZG9tY3Rs X3Bzcl9nZXRfdmFsKGQsIGRvbWN0bCwgUFNSX1RZUEVfTDJfQ0JNLCBjb3B5YmFjayk7CiAgICAg ICAgICAgICBicmVhazsKIAogI3VuZGVmIGRvbWN0bF9wc3JfZ2V0X3ZhbApkaWZmIC0tZ2l0IGEv eGVuL2FyY2gveDg2L3Bzci5jIGIveGVuL2FyY2gveDg2L3Bzci5jCmluZGV4IDExYzIwNGUuLjZk Y2U4MjMgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wc3IuYworKysgYi94ZW4vYXJjaC94ODYv cHNyLmMKQEAgLTEwMCwyNCArMTAwLDI0IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVhdF9wcm9w cyB7CiAgICAgdW5zaWduZWQgaW50IGNvc19udW07CiAKICAgICAvKgotICAgICAqIEFuIGFycmF5 IHRvIHNhdmUgYWxsICdlbnVtIGNibV90eXBlJyB2YWx1ZXMgb2YgdGhlIGZlYXR1cmUuIEl0IGlz CisgICAgICogQW4gYXJyYXkgdG8gc2F2ZSBhbGwgJ2VudW0gcHNyX3R5cGUnIHZhbHVlcyBvZiB0 aGUgZmVhdHVyZS4gSXQgaXMKICAgICAgKiB1c2VkIHdpdGggY29zX251bSB0b2dldGhlciB0byBn ZXQvd3JpdGUgYSBmZWF0dXJlJ3MgQ09TIHJlZ2lzdGVycwogICAgICAqIHZhbHVlcyBvbmUgYnkg b25lLgogICAgICAqLwotICAgIGVudW0gY2JtX3R5cGUgdHlwZVtNQVhfQ09TX05VTV07CisgICAg ZW51bSBwc3JfdHlwZSB0eXBlW01BWF9DT1NfTlVNXTsKIAogICAgIC8qCiAgICAgICogYWx0X3R5 cGUgaXMgJ2FsdGVybmF0aXZlIHR5cGUnLiBXaGVuIHRoaXMgJ2FsdF90eXBlJyBpcyBpbnB1dCwg dGhlCiAgICAgICogZmVhdHVyZSBkb2VzIHNvbWUgc3BlY2lhbCBvcGVyYXRpb25zLgogICAgICAq LwotICAgIGVudW0gY2JtX3R5cGUgYWx0X3R5cGU7CisgICAgZW51bSBwc3JfdHlwZSBhbHRfdHlw ZTsKIAogICAgIC8qIGdldF9mZWF0X2luZm8gaXMgdXNlZCB0byByZXR1cm4gZmVhdHVyZSBIVyBp bmZvIHRocm91Z2ggc3lzY3RsLiAqLwogICAgIGJvb2wgKCpnZXRfZmVhdF9pbmZvKShjb25zdCBz dHJ1Y3QgZmVhdF9ub2RlICpmZWF0LAogICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJf dCBkYXRhW10sIHVuc2lnbmVkIGludCBhcnJheV9sZW4pOwogCiAgICAgLyogd3JpdGVfbXNyIGlz IHVzZWQgdG8gd3JpdGUgb3V0IGZlYXR1cmUgTVNSIHJlZ2lzdGVyLiAqLwotICAgIHZvaWQgKCp3 cml0ZV9tc3IpKHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwgZW51bSBjYm1fdHlwZSB0 eXBlKTsKKyAgICB2b2lkICgqd3JpdGVfbXNyKSh1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2 YWwsIGVudW0gcHNyX3R5cGUgdHlwZSk7CiB9ICpmZWF0X3Byb3BzW0ZFQVRfVFlQRV9OVU1dOwog CiAvKgpAQCAtMjE1LDEzICsyMTUsMTMgQEAgc3RhdGljIHZvaWQgZnJlZV9zb2NrZXRfcmVzb3Vy Y2VzKHVuc2lnbmVkIGludCBzb2NrZXQpCiAgICAgYml0bWFwX3plcm8oaW5mby0+ZG9tX3NldCwg RE9NSURfSURMRSArIDEpOwogfQogCi1zdGF0aWMgZW51bSBwc3JfZmVhdF90eXBlIHBzcl9jYm1f dHlwZV90b19mZWF0X3R5cGUoZW51bSBjYm1fdHlwZSB0eXBlKQorc3RhdGljIGVudW0gcHNyX2Zl YXRfdHlwZSBwc3JfdHlwZV90b19mZWF0X3R5cGUoZW51bSBwc3JfdHlwZSB0eXBlKQogewogICAg IGVudW0gcHNyX2ZlYXRfdHlwZSBmZWF0X3R5cGUgPSBGRUFUX1RZUEVfVU5LTk9XTjsKIAogICAg IHN3aXRjaCAoIHR5cGUgKQogICAgIHsKLSAgICBjYXNlIFBTUl9DQk1fVFlQRV9MMzoKKyAgICBj YXNlIFBTUl9UWVBFX0wzX0NCTToKICAgICAgICAgZmVhdF90eXBlID0gRkVBVF9UWVBFX0wzX0NB VDsKIAogICAgICAgICAvKgpAQCAtMjMzLDEyICsyMzMsMTIgQEAgc3RhdGljIGVudW0gcHNyX2Zl YXRfdHlwZSBwc3JfY2JtX3R5cGVfdG9fZmVhdF90eXBlKGVudW0gY2JtX3R5cGUgdHlwZSkKIAog ICAgICAgICBicmVhazsKIAotICAgIGNhc2UgUFNSX0NCTV9UWVBFX0wzX0RBVEE6Ci0gICAgY2Fz ZSBQU1JfQ0JNX1RZUEVfTDNfQ09ERToKKyAgICBjYXNlIFBTUl9UWVBFX0wzX0RBVEE6CisgICAg Y2FzZSBQU1JfVFlQRV9MM19DT0RFOgogICAgICAgICBmZWF0X3R5cGUgPSBGRUFUX1RZUEVfTDNf Q0RQOwogICAgICAgICBicmVhazsKIAotICAgIGNhc2UgUFNSX0NCTV9UWVBFX0wyOgorICAgIGNh c2UgUFNSX1RZUEVfTDJfQ0JNOgogICAgICAgICBmZWF0X3R5cGUgPSBGRUFUX1RZUEVfTDJfQ0FU OwogICAgICAgICBicmVhazsKIApAQCAtMzYyLDE1ICszNjIsMTYgQEAgc3RhdGljIGJvb2wgY2F0 X2dldF9mZWF0X2luZm8oY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdCwKIH0KIAogLyogTDMg Q0FUIHByb3BzICovCi1zdGF0aWMgdm9pZCBsM19jYXRfd3JpdGVfbXNyKHVuc2lnbmVkIGludCBj b3MsIHVpbnQzMl90IHZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKQorc3RhdGljIHZvaWQgbDNfY2F0 X3dyaXRlX21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2YWwsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGVudW0gcHNyX3R5cGUgdHlwZSkKIHsKICAgICB3cm1zcmwoTVNSX0lB MzJfUFNSX0wzX01BU0soY29zKSwgdmFsKTsKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBmZWF0 X3Byb3BzIGwzX2NhdF9wcm9wcyA9IHsKICAgICAuY29zX251bSA9IDEsCi0gICAgLnR5cGVbMF0g PSBQU1JfQ0JNX1RZUEVfTDMsCi0gICAgLmFsdF90eXBlID0gUFNSX0NCTV9UWVBFX1VOS05PV04s CisgICAgLnR5cGVbMF0gPSBQU1JfVFlQRV9MM19DQk0sCisgICAgLmFsdF90eXBlID0gUFNSX1RZ UEVfVU5LTk9XTiwKICAgICAuZ2V0X2ZlYXRfaW5mbyA9IGNhdF9nZXRfZmVhdF9pbmZvLAogICAg IC53cml0ZV9tc3IgPSBsM19jYXRfd3JpdGVfbXNyLAogfTsKQEAgLTM4Nyw5ICszODgsMTAgQEAg c3RhdGljIGJvb2wgbDNfY2RwX2dldF9mZWF0X2luZm8oY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAq ZmVhdCwKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIHZvaWQgbDNfY2RwX3dyaXRlX21z cih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSkKK3N0 YXRpYyB2b2lkIGwzX2NkcF93cml0ZV9tc3IodW5zaWduZWQgaW50IGNvcywgdWludDMyX3QgdmFs LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnVtIHBzcl90eXBlIHR5cGUpCiB7Ci0g ICAgd3Jtc3JsKCgodHlwZSA9PSBQU1JfQ0JNX1RZUEVfTDNfREFUQSkgPworICAgIHdybXNybCgo KHR5cGUgPT0gUFNSX1RZUEVfTDNfREFUQSkgPwogICAgICAgICAgICAgTVNSX0lBMzJfUFNSX0wz X01BU0tfREFUQShjb3MpIDoKICAgICAgICAgICAgIE1TUl9JQTMyX1BTUl9MM19NQVNLX0NPREUo Y29zKSksCiAgICAgICAgICAgIHZhbCk7CkBAIC0zOTcsMjMgKzM5OSwyNCBAQCBzdGF0aWMgdm9p ZCBsM19jZHBfd3JpdGVfbXNyKHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwgZW51bSBj Ym1fdHlwZSB0eXBlKQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGZlYXRfcHJvcHMgbDNfY2RwX3By b3BzID0gewogICAgIC5jb3NfbnVtID0gMiwKLSAgICAudHlwZVswXSA9IFBTUl9DQk1fVFlQRV9M M19EQVRBLAotICAgIC50eXBlWzFdID0gUFNSX0NCTV9UWVBFX0wzX0NPREUsCi0gICAgLmFsdF90 eXBlID0gUFNSX0NCTV9UWVBFX0wzLAorICAgIC50eXBlWzBdID0gUFNSX1RZUEVfTDNfREFUQSwK KyAgICAudHlwZVsxXSA9IFBTUl9UWVBFX0wzX0NPREUsCisgICAgLmFsdF90eXBlID0gUFNSX1RZ UEVfTDNfQ0JNLAogICAgIC5nZXRfZmVhdF9pbmZvID0gbDNfY2RwX2dldF9mZWF0X2luZm8sCiAg ICAgLndyaXRlX21zciA9IGwzX2NkcF93cml0ZV9tc3IsCiB9OwogCiAvKiBMMiBDQVQgcHJvcHMg Ki8KLXN0YXRpYyB2b2lkIGwyX2NhdF93cml0ZV9tc3IodW5zaWduZWQgaW50IGNvcywgdWludDMy X3QgdmFsLCBlbnVtIGNibV90eXBlIHR5cGUpCitzdGF0aWMgdm9pZCBsMl9jYXRfd3JpdGVfbXNy KHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZW51bSBwc3JfdHlwZSB0eXBlKQogewogICAgIHdybXNybChNU1JfSUEzMl9QU1JfTDJf TUFTSyhjb3MpLCB2YWwpOwogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGZlYXRfcHJvcHMgbDJf Y2F0X3Byb3BzID0gewogICAgIC5jb3NfbnVtID0gMSwKLSAgICAudHlwZVswXSA9IFBTUl9DQk1f VFlQRV9MMiwKLSAgICAuYWx0X3R5cGUgPSBQU1JfQ0JNX1RZUEVfVU5LTk9XTiwKKyAgICAudHlw ZVswXSA9IFBTUl9UWVBFX0wyX0NCTSwKKyAgICAuYWx0X3R5cGUgPSBQU1JfVFlQRV9VTktOT1dO LAogICAgIC5nZXRfZmVhdF9pbmZvID0gY2F0X2dldF9mZWF0X2luZm8sCiAgICAgLndyaXRlX21z ciA9IGwyX2NhdF93cml0ZV9tc3IsCiB9OwpAQCAtNjc1LDcgKzY3OCw3IEBAIHN0YXRpYyBzdHJ1 Y3QgcHNyX3NvY2tldF9pbmZvICpnZXRfc29ja2V0X2luZm8odW5zaWduZWQgaW50IHNvY2tldCkK ICAgICByZXR1cm4gc29ja2V0X2luZm8gKyBzb2NrZXQ7CiB9CiAKLWludCBwc3JfZ2V0X2luZm8o dW5zaWduZWQgaW50IHNvY2tldCwgZW51bSBjYm1fdHlwZSB0eXBlLAoraW50IHBzcl9nZXRfaW5m byh1bnNpZ25lZCBpbnQgc29ja2V0LCBlbnVtIHBzcl90eXBlIHR5cGUsCiAgICAgICAgICAgICAg ICAgIHVpbnQzMl90IGRhdGFbXSwgdW5zaWduZWQgaW50IGFycmF5X2xlbikKIHsKICAgICBjb25z dCBzdHJ1Y3QgcHNyX3NvY2tldF9pbmZvICppbmZvID0gZ2V0X3NvY2tldF9pbmZvKHNvY2tldCk7 CkBAIC02ODcsNyArNjkwLDcgQEAgaW50IHBzcl9nZXRfaW5mbyh1bnNpZ25lZCBpbnQgc29ja2V0 LCBlbnVtIGNibV90eXBlIHR5cGUsCiAgICAgaWYgKCBJU19FUlIoaW5mbykgKQogICAgICAgICBy ZXR1cm4gUFRSX0VSUihpbmZvKTsKIAotICAgIGZlYXRfdHlwZSA9IHBzcl9jYm1fdHlwZV90b19m ZWF0X3R5cGUodHlwZSk7CisgICAgZmVhdF90eXBlID0gcHNyX3R5cGVfdG9fZmVhdF90eXBlKHR5 cGUpOwogICAgIGlmICggZmVhdF90eXBlID49IEFSUkFZX1NJWkUoaW5mby0+ZmVhdHVyZXMpICkK ICAgICAgICAgcmV0dXJuIC1FTk9FTlQ7CiAKQEAgLTcwOCw3ICs3MTEsNyBAQCBpbnQgcHNyX2dl dF9pbmZvKHVuc2lnbmVkIGludCBzb2NrZXQsIGVudW0gY2JtX3R5cGUgdHlwZSwKIH0KIAogaW50 IHBzcl9nZXRfdmFsKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBzb2NrZXQsCi0gICAg ICAgICAgICAgICAgdWludDMyX3QgKnZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKQorICAgICAgICAg ICAgICAgIHVpbnQzMl90ICp2YWwsIGVudW0gcHNyX3R5cGUgdHlwZSkKIHsKICAgICBjb25zdCBz dHJ1Y3QgcHNyX3NvY2tldF9pbmZvICppbmZvID0gZ2V0X3NvY2tldF9pbmZvKHNvY2tldCk7CiAg ICAgY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdDsKQEAgLTcyMCw3ICs3MjMsNyBAQCBpbnQg cHNyX2dldF92YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHNvY2tldCwKICAgICBp ZiAoIElTX0VSUihpbmZvKSApCiAgICAgICAgIHJldHVybiBQVFJfRVJSKGluZm8pOwogCi0gICAg ZmVhdF90eXBlID0gcHNyX2NibV90eXBlX3RvX2ZlYXRfdHlwZSh0eXBlKTsKKyAgICBmZWF0X3R5 cGUgPSBwc3JfdHlwZV90b19mZWF0X3R5cGUodHlwZSk7CiAgICAgaWYgKCBmZWF0X3R5cGUgPj0g QVJSQVlfU0laRShpbmZvLT5mZWF0dXJlcykgKQogICAgICAgICByZXR1cm4gLUVOT0VOVDsKIApA QCAtODUwLDcgKzg1Myw3IEBAIHN0YXRpYyBpbnQgaW5zZXJ0X3ZhbF9pbnRvX2FycmF5KHVpbnQz Ml90IHZhbFtdLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50 IGFycmF5X2xlbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVj dCBwc3Jfc29ja2V0X2luZm8gKmluZm8sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBlbnVtIHBzcl9mZWF0X3R5cGUgZmVhdF90eXBlLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZW51bSBjYm1fdHlwZSB0eXBlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZW51bSBwc3JfdHlwZSB0eXBlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdWludDMyX3QgbmV3X3ZhbCkKIHsKICAgICBjb25zdCBzdHJ1Y3QgZmVhdF9ub2RlICpmZWF0 OwpAQCAtODg2LDggKzg4OSw5IEBAIHN0YXRpYyBpbnQgaW5zZXJ0X3ZhbF9pbnRvX2FycmF5KHVp bnQzMl90IHZhbFtdLAogICAgIC8qCiAgICAgICogVmFsdWUgc2V0dGluZyBwb3NpdGlvbiBpcyBz YW1lIGFzIGZlYXR1cmUgYXJyYXkuCiAgICAgICogRm9yIENEUCwgdXNlciBtYXkgc2V0IGJvdGgg REFUQSBhbmQgQ09ERSB0byBzYW1lIHZhbHVlLiBGb3Igc3VjaCBjYXNlLAotICAgICAqIHVzZXIg aW5wdXQgJ1BTUl9DQk1fVFlQRV9MMycgYXMgdHlwZS4gVGhlIGFsdGVybmF0aXZlIHR5cGUgb2Yg Q0RQIGlzIHNhbWUKLSAgICAgKiBhcyBpdC4gU28gd2Ugc2hvdWxkIHNldCBuZXdfdmFsIHRvIGJv dGggb2YgREFUQSBhbmQgQ09ERSB1bmRlciBzdWNoIGNhc2UuCisgICAgICogdXNlciBpbnB1dCAn UFNSX1RZUEVfTDNfQ0JNJyBhcyB0eXBlLiBUaGUgYWx0ZXJuYXRpdmUgdHlwZSBvZiBDRFAgaXMK KyAgICAgKiBzYW1lIGFzIGl0LiBTbyB3ZSBzaG91bGQgc2V0IG5ld192YWwgdG8gYm90aCBvZiBE QVRBIGFuZCBDT0RFIHVuZGVyIHN1Y2gKKyAgICAgKiBjYXNlLgogICAgICAqLwogICAgIGZvciAo IGkgPSAwOyBpIDwgcHJvcHMtPmNvc19udW07IGkrKyApCiAgICAgewpAQCAtMTE3OSw3ICsxMTgz LDcgQEAgc3RhdGljIGludCB3cml0ZV9wc3JfbXNycyh1bnNpZ25lZCBpbnQgc29ja2V0LCB1bnNp Z25lZCBpbnQgY29zLAogfQogCiBpbnQgcHNyX3NldF92YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5z aWduZWQgaW50IHNvY2tldCwKLSAgICAgICAgICAgICAgICB1aW50NjRfdCBuZXdfdmFsLCBlbnVt IGNibV90eXBlIHR5cGUpCisgICAgICAgICAgICAgICAgdWludDY0X3QgbmV3X3ZhbCwgZW51bSBw c3JfdHlwZSB0eXBlKQogewogICAgIHVuc2lnbmVkIGludCBvbGRfY29zLCBhcnJheV9sZW47CiAg ICAgaW50IGNvcywgcmV0OwpAQCAtMTE5NSw3ICsxMTk5LDcgQEAgaW50IHBzcl9zZXRfdmFsKHN0 cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBzb2NrZXQsCiAgICAgaWYgKCBuZXdfdmFsICE9 IHZhbCApCiAgICAgICAgIHJldHVybiAtRUlOVkFMOwogCi0gICAgZmVhdF90eXBlID0gcHNyX2Ni bV90eXBlX3RvX2ZlYXRfdHlwZSh0eXBlKTsKKyAgICBmZWF0X3R5cGUgPSBwc3JfdHlwZV90b19m ZWF0X3R5cGUodHlwZSk7CiAgICAgaWYgKCBmZWF0X3R5cGUgPj0gQVJSQVlfU0laRShpbmZvLT5m ZWF0dXJlcykgfHwKICAgICAgICAgICFpbmZvLT5mZWF0dXJlc1tmZWF0X3R5cGVdICkKICAgICAg ICAgcmV0dXJuIC1FTk9FTlQ7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvc3lzY3RsLmMgYi94 ZW4vYXJjaC94ODYvc3lzY3RsLmMKaW5kZXggOGFlNjc0Ny4uNjg2N2VlMSAxMDA2NDQKLS0tIGEv eGVuL2FyY2gveDg2L3N5c2N0bC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9zeXNjdGwuYwpAQCAtMTc5 LDcgKzE3OSw3IEBAIGxvbmcgYXJjaF9kb19zeXNjdGwoCiAgICAgICAgIGNhc2UgWEVOX1NZU0NU TF9QU1JfZ2V0X2wzX2luZm86CiAgICAgICAgIHsKICAgICAgICAgICAgIHJldCA9IHBzcl9nZXRf aW5mbyhzeXNjdGwtPnUucHNyX2FsbG9jLnRhcmdldCwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBQU1JfQ0JNX1RZUEVfTDMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9UWVBFX0wzX0NCTSwgZGF0YSwgQVJSQVlfU0la RShkYXRhKSk7CiAgICAgICAgICAgICBpZiAoIHJldCApCiAgICAgICAgICAgICAgICAgYnJlYWs7 CiAKQEAgLTE5OCw3ICsxOTgsNyBAQCBsb25nIGFyY2hfZG9fc3lzY3RsKAogICAgICAgICBjYXNl IFhFTl9TWVNDVExfUFNSX2dldF9sMl9pbmZvOgogICAgICAgICB7CiAgICAgICAgICAgICByZXQg PSBwc3JfZ2V0X2luZm8oc3lzY3RsLT51LnBzcl9hbGxvYy50YXJnZXQsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wyLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEp KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQU1JfVFlQRV9MMl9DQk0sIGRhdGEs IEFSUkFZX1NJWkUoZGF0YSkpOwogICAgICAgICAgICAgaWYgKCByZXQgKQogICAgICAgICAgICAg ICAgIGJyZWFrOwogCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3Bzci5oIGIveGVu L2luY2x1ZGUvYXNtLXg4Ni9wc3IuaAppbmRleCAxOGE0MmYzLi5jYjNmMDY3IDEwMDY0NAotLS0g YS94ZW4vaW5jbHVkZS9hc20teDg2L3Bzci5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcHNy LmgKQEAgLTUzLDEyICs1MywxMiBAQCBzdHJ1Y3QgcHNyX2NtdCB7CiAgICAgc3RydWN0IHBzcl9j bXRfbDMgbDM7CiB9OwogCi1lbnVtIGNibV90eXBlIHsKLSAgICBQU1JfQ0JNX1RZUEVfTDMsCi0g ICAgUFNSX0NCTV9UWVBFX0wzX0NPREUsCi0gICAgUFNSX0NCTV9UWVBFX0wzX0RBVEEsCi0gICAg UFNSX0NCTV9UWVBFX0wyLAotICAgIFBTUl9DQk1fVFlQRV9VTktOT1dOLAorZW51bSBwc3JfdHlw ZSB7CisgICAgUFNSX1RZUEVfTDNfQ0JNLAorICAgIFBTUl9UWVBFX0wzX0NPREUsCisgICAgUFNS X1RZUEVfTDNfREFUQSwKKyAgICBQU1JfVFlQRV9MMl9DQk0sCisgICAgUFNSX1RZUEVfVU5LTk9X TiwKIH07CiAKIGV4dGVybiBzdHJ1Y3QgcHNyX2NtdCAqcHNyX2NtdDsKQEAgLTcyLDEyICs3Miwx MiBAQCBpbnQgcHNyX2FsbG9jX3JtaWQoc3RydWN0IGRvbWFpbiAqZCk7CiB2b2lkIHBzcl9mcmVl X3JtaWQoc3RydWN0IGRvbWFpbiAqZCk7CiB2b2lkIHBzcl9jdHh0X3N3aXRjaF90byhzdHJ1Y3Qg ZG9tYWluICpkKTsKIAotaW50IHBzcl9nZXRfaW5mbyh1bnNpZ25lZCBpbnQgc29ja2V0LCBlbnVt IGNibV90eXBlIHR5cGUsCitpbnQgcHNyX2dldF9pbmZvKHVuc2lnbmVkIGludCBzb2NrZXQsIGVu dW0gcHNyX3R5cGUgdHlwZSwKICAgICAgICAgICAgICAgICAgdWludDMyX3QgZGF0YVtdLCB1bnNp Z25lZCBpbnQgYXJyYXlfbGVuKTsKIGludCBwc3JfZ2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1 bnNpZ25lZCBpbnQgc29ja2V0LAotICAgICAgICAgICAgICAgIHVpbnQzMl90ICp2YWwsIGVudW0g Y2JtX3R5cGUgdHlwZSk7CisgICAgICAgICAgICAgICAgdWludDMyX3QgKnZhbCwgZW51bSBwc3Jf dHlwZSB0eXBlKTsKIGludCBwc3Jfc2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBp bnQgc29ja2V0LAotICAgICAgICAgICAgICAgIHVpbnQ2NF90IHZhbCwgZW51bSBjYm1fdHlwZSB0 eXBlKTsKKyAgICAgICAgICAgICAgICB1aW50NjRfdCB2YWwsIGVudW0gcHNyX3R5cGUgdHlwZSk7 CiAKIHZvaWQgcHNyX2RvbWFpbl9pbml0KHN0cnVjdCBkb21haW4gKmQpOwogdm9pZCBwc3JfZG9t YWluX2ZyZWUoc3RydWN0IGRvbWFpbiAqZCk7Ci0tIAoxLjkuMQoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=