From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yi Sun Subject: [PATCH v6 03/16] x86: rename 'cbm_type' to 'psr_type' to make it general Date: Sun, 8 Oct 2017 15:23:48 +0800 Message-ID: <1507447441-5422-4-git-send-email-yi.y.sun@linux.intel.com> References: <1507447441-5422-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e16Gt-0002fh-QA for xen-devel@lists.xenproject.org; Sun, 08 Oct 2017 07:45:12 +0000 In-Reply-To: <1507447441-5422-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 ODYvZG9tY3RsLmMgYi94ZW4vYXJjaC94ODYvZG9tY3RsLmMKaW5kZXggOGE2MDA0Yi4uMGNkMThh NiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2RvbWN0bC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9k b21jdGwuYwpAQCAtMTQ1NCw0MSArMTQ1NCw0MSBAQCBsb25nIGFyY2hfZG9fZG9tY3RsKAogICAg ICAgICBjYXNlIFhFTl9ET01DVExfUFNSX1NFVF9MM19DQk06CiAgICAgICAgICAgICByZXQgPSBw c3Jfc2V0X3ZhbChkLCBkb21jdGwtPnUucHNyX2FsbG9jLnRhcmdldCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRvbWN0bC0+dS5wc3JfYWxsb2MuZGF0YSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFBTUl9DQk1fVFlQRV9MMyk7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBQU1JfVFlQRV9MM19DQk0pOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAg Y2FzZSBYRU5fRE9NQ1RMX1BTUl9TRVRfTDNfQ09ERToKICAgICAgICAgICAgIHJldCA9IHBzcl9z ZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2MudGFyZ2V0LAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxvYy5kYXRhLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wzX0NPREUpOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgUFNSX1RZUEVfTDNfQ09ERSk7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAg ICBjYXNlIFhFTl9ET01DVExfUFNSX1NFVF9MM19EQVRBOgogICAgICAgICAgICAgcmV0ID0gcHNy X3NldF92YWwoZCwgZG9tY3RsLT51LnBzcl9hbGxvYy50YXJnZXQsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBkb21jdGwtPnUucHNyX2FsbG9jLmRhdGEsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBQU1JfQ0JNX1RZUEVfTDNfREFUQSk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBQU1JfVFlQRV9MM19EQVRBKTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAg ICAgIGNhc2UgWEVOX0RPTUNUTF9QU1JfU0VUX0wyX0NCTToKICAgICAgICAgICAgIHJldCA9IHBz cl9zZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2MudGFyZ2V0LAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxvYy5kYXRhLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wyKTsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFBTUl9UWVBFX0wyX0NCTSk7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBj YXNlIFhFTl9ET01DVExfUFNSX0dFVF9MM19DQk06Ci0gICAgICAgICAgICByZXQgPSBkb21jdGxf cHNyX2dldF92YWwoZCwgZG9tY3RsLCBQU1JfQ0JNX1RZUEVfTDMsIGNvcHliYWNrKTsKKyAgICAg ICAgICAgIHJldCA9IGRvbWN0bF9wc3JfZ2V0X3ZhbChkLCBkb21jdGwsIFBTUl9UWVBFX0wzX0NC TSwgY29weWJhY2spOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBYRU5fRE9N Q1RMX1BTUl9HRVRfTDNfQ09ERToKLSAgICAgICAgICAgIHJldCA9IGRvbWN0bF9wc3JfZ2V0X3Zh bChkLCBkb21jdGwsIFBTUl9DQk1fVFlQRV9MM19DT0RFLCBjb3B5YmFjayk7CisgICAgICAgICAg ICByZXQgPSBkb21jdGxfcHNyX2dldF92YWwoZCwgZG9tY3RsLCBQU1JfVFlQRV9MM19DT0RFLCBj b3B5YmFjayk7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFhFTl9ET01DVExf UFNSX0dFVF9MM19EQVRBOgotICAgICAgICAgICAgcmV0ID0gZG9tY3RsX3Bzcl9nZXRfdmFsKGQs IGRvbWN0bCwgUFNSX0NCTV9UWVBFX0wzX0RBVEEsIGNvcHliYWNrKTsKKyAgICAgICAgICAgIHJl dCA9IGRvbWN0bF9wc3JfZ2V0X3ZhbChkLCBkb21jdGwsIFBTUl9UWVBFX0wzX0RBVEEsIGNvcHli YWNrKTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgWEVOX0RPTUNUTF9QU1Jf R0VUX0wyX0NCTToKLSAgICAgICAgICAgIHJldCA9IGRvbWN0bF9wc3JfZ2V0X3ZhbChkLCBkb21j dGwsIFBTUl9DQk1fVFlQRV9MMiwgY29weWJhY2spOworICAgICAgICAgICAgcmV0ID0gZG9tY3Rs X3Bzcl9nZXRfdmFsKGQsIGRvbWN0bCwgUFNSX1RZUEVfTDJfQ0JNLCBjb3B5YmFjayk7CiAgICAg ICAgICAgICBicmVhazsKIAogICAgICAgICBkZWZhdWx0OgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gv eDg2L3Bzci5jIGIveGVuL2FyY2gveDg2L3Bzci5jCmluZGV4IGRiZjdhNGMuLjI2M2RkYmUgMTAw NjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wc3IuYworKysgYi94ZW4vYXJjaC94ODYvcHNyLmMKQEAg LTEwMCwyNCArMTAwLDI0IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVhdF9wcm9wcyB7CiAgICAg dW5zaWduZWQgaW50IGNvc19udW07CiAKICAgICAvKgotICAgICAqIEFuIGFycmF5IHRvIHNhdmUg YWxsICdlbnVtIGNibV90eXBlJyB2YWx1ZXMgb2YgdGhlIGZlYXR1cmUuIEl0IGlzCisgICAgICog QW4gYXJyYXkgdG8gc2F2ZSBhbGwgJ2VudW0gcHNyX3R5cGUnIHZhbHVlcyBvZiB0aGUgZmVhdHVy ZS4gSXQgaXMKICAgICAgKiB1c2VkIHdpdGggY29zX251bSB0b2dldGhlciB0byBnZXQvd3JpdGUg YSBmZWF0dXJlJ3MgQ09TIHJlZ2lzdGVycwogICAgICAqIHZhbHVlcyBvbmUgYnkgb25lLgogICAg ICAqLwotICAgIGVudW0gY2JtX3R5cGUgdHlwZVtNQVhfQ09TX05VTV07CisgICAgZW51bSBwc3Jf dHlwZSB0eXBlW01BWF9DT1NfTlVNXTsKIAogICAgIC8qCiAgICAgICogYWx0X3R5cGUgaXMgJ2Fs dGVybmF0aXZlIHR5cGUnLiBXaGVuIHRoaXMgJ2FsdF90eXBlJyBpcyBpbnB1dCwgdGhlCiAgICAg ICogZmVhdHVyZSBkb2VzIHNvbWUgc3BlY2lhbCBvcGVyYXRpb25zLgogICAgICAqLwotICAgIGVu dW0gY2JtX3R5cGUgYWx0X3R5cGU7CisgICAgZW51bSBwc3JfdHlwZSBhbHRfdHlwZTsKIAogICAg IC8qIGdldF9mZWF0X2luZm8gaXMgdXNlZCB0byByZXR1cm4gZmVhdHVyZSBIVyBpbmZvIHRocm91 Z2ggc3lzY3RsLiAqLwogICAgIGJvb2wgKCpnZXRfZmVhdF9pbmZvKShjb25zdCBzdHJ1Y3QgZmVh dF9ub2RlICpmZWF0LAogICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBkYXRhW10s IHVuc2lnbmVkIGludCBhcnJheV9sZW4pOwogCiAgICAgLyogd3JpdGVfbXNyIGlzIHVzZWQgdG8g d3JpdGUgb3V0IGZlYXR1cmUgTVNSIHJlZ2lzdGVyLiAqLwotICAgIHZvaWQgKCp3cml0ZV9tc3Ip KHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKTsKKyAg ICB2b2lkICgqd3JpdGVfbXNyKSh1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2YWwsIGVudW0g cHNyX3R5cGUgdHlwZSk7CiB9ICpmZWF0X3Byb3BzW0ZFQVRfVFlQRV9OVU1dOwogCiAvKgpAQCAt MjE1LDEzICsyMTUsMTMgQEAgc3RhdGljIHZvaWQgZnJlZV9zb2NrZXRfcmVzb3VyY2VzKHVuc2ln bmVkIGludCBzb2NrZXQpCiAgICAgYml0bWFwX3plcm8oaW5mby0+ZG9tX3NldCwgRE9NSURfSURM RSArIDEpOwogfQogCi1zdGF0aWMgZW51bSBwc3JfZmVhdF90eXBlIHBzcl9jYm1fdHlwZV90b19m ZWF0X3R5cGUoZW51bSBjYm1fdHlwZSB0eXBlKQorc3RhdGljIGVudW0gcHNyX2ZlYXRfdHlwZSBw c3JfdHlwZV90b19mZWF0X3R5cGUoZW51bSBwc3JfdHlwZSB0eXBlKQogewogICAgIGVudW0gcHNy X2ZlYXRfdHlwZSBmZWF0X3R5cGUgPSBGRUFUX1RZUEVfVU5LTk9XTjsKIAogICAgIHN3aXRjaCAo IHR5cGUgKQogICAgIHsKLSAgICBjYXNlIFBTUl9DQk1fVFlQRV9MMzoKKyAgICBjYXNlIFBTUl9U WVBFX0wzX0NCTToKICAgICAgICAgZmVhdF90eXBlID0gRkVBVF9UWVBFX0wzX0NBVDsKIAogICAg ICAgICAvKgpAQCAtMjMzLDEyICsyMzMsMTIgQEAgc3RhdGljIGVudW0gcHNyX2ZlYXRfdHlwZSBw c3JfY2JtX3R5cGVfdG9fZmVhdF90eXBlKGVudW0gY2JtX3R5cGUgdHlwZSkKIAogICAgICAgICBi cmVhazsKIAotICAgIGNhc2UgUFNSX0NCTV9UWVBFX0wzX0RBVEE6Ci0gICAgY2FzZSBQU1JfQ0JN X1RZUEVfTDNfQ09ERToKKyAgICBjYXNlIFBTUl9UWVBFX0wzX0RBVEE6CisgICAgY2FzZSBQU1Jf VFlQRV9MM19DT0RFOgogICAgICAgICBmZWF0X3R5cGUgPSBGRUFUX1RZUEVfTDNfQ0RQOwogICAg ICAgICBicmVhazsKIAotICAgIGNhc2UgUFNSX0NCTV9UWVBFX0wyOgorICAgIGNhc2UgUFNSX1RZ UEVfTDJfQ0JNOgogICAgICAgICBmZWF0X3R5cGUgPSBGRUFUX1RZUEVfTDJfQ0FUOwogICAgICAg ICBicmVhazsKIApAQCAtMzYyLDE1ICszNjIsMTYgQEAgc3RhdGljIGJvb2wgY2F0X2dldF9mZWF0 X2luZm8oY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdCwKIH0KIAogLyogTDMgQ0FUIHByb3Bz ICovCi1zdGF0aWMgdm9pZCBsM19jYXRfd3JpdGVfbXNyKHVuc2lnbmVkIGludCBjb3MsIHVpbnQz Ml90IHZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKQorc3RhdGljIHZvaWQgbDNfY2F0X3dyaXRlX21z cih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2YWwsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGVudW0gcHNyX3R5cGUgdHlwZSkKIHsKICAgICB3cm1zcmwoTVNSX0lBMzJfUFNSX0wz X01BU0soY29zKSwgdmFsKTsKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBmZWF0X3Byb3BzIGwz X2NhdF9wcm9wcyA9IHsKICAgICAuY29zX251bSA9IDEsCi0gICAgLnR5cGVbMF0gPSBQU1JfQ0JN X1RZUEVfTDMsCi0gICAgLmFsdF90eXBlID0gUFNSX0NCTV9UWVBFX1VOS05PV04sCisgICAgLnR5 cGVbMF0gPSBQU1JfVFlQRV9MM19DQk0sCisgICAgLmFsdF90eXBlID0gUFNSX1RZUEVfVU5LTk9X TiwKICAgICAuZ2V0X2ZlYXRfaW5mbyA9IGNhdF9nZXRfZmVhdF9pbmZvLAogICAgIC53cml0ZV9t c3IgPSBsM19jYXRfd3JpdGVfbXNyLAogfTsKQEAgLTM4Nyw5ICszODgsMTAgQEAgc3RhdGljIGJv b2wgbDNfY2RwX2dldF9mZWF0X2luZm8oY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdCwKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIHZvaWQgbDNfY2RwX3dyaXRlX21zcih1bnNpZ25l ZCBpbnQgY29zLCB1aW50MzJfdCB2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSkKK3N0YXRpYyB2b2lk IGwzX2NkcF93cml0ZV9tc3IodW5zaWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBlbnVtIHBzcl90eXBlIHR5cGUpCiB7Ci0gICAgd3Jtc3Js KCgodHlwZSA9PSBQU1JfQ0JNX1RZUEVfTDNfREFUQSkgPworICAgIHdybXNybCgoKHR5cGUgPT0g UFNSX1RZUEVfTDNfREFUQSkgPwogICAgICAgICAgICAgTVNSX0lBMzJfUFNSX0wzX01BU0tfREFU QShjb3MpIDoKICAgICAgICAgICAgIE1TUl9JQTMyX1BTUl9MM19NQVNLX0NPREUoY29zKSksCiAg ICAgICAgICAgIHZhbCk7CkBAIC0zOTcsMjMgKzM5OSwyNCBAQCBzdGF0aWMgdm9pZCBsM19jZHBf d3JpdGVfbXNyKHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwgZW51bSBjYm1fdHlwZSB0 eXBlKQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGZlYXRfcHJvcHMgbDNfY2RwX3Byb3BzID0gewog ICAgIC5jb3NfbnVtID0gMiwKLSAgICAudHlwZVswXSA9IFBTUl9DQk1fVFlQRV9MM19EQVRBLAot ICAgIC50eXBlWzFdID0gUFNSX0NCTV9UWVBFX0wzX0NPREUsCi0gICAgLmFsdF90eXBlID0gUFNS X0NCTV9UWVBFX0wzLAorICAgIC50eXBlWzBdID0gUFNSX1RZUEVfTDNfREFUQSwKKyAgICAudHlw ZVsxXSA9IFBTUl9UWVBFX0wzX0NPREUsCisgICAgLmFsdF90eXBlID0gUFNSX1RZUEVfTDNfQ0JN LAogICAgIC5nZXRfZmVhdF9pbmZvID0gbDNfY2RwX2dldF9mZWF0X2luZm8sCiAgICAgLndyaXRl X21zciA9IGwzX2NkcF93cml0ZV9tc3IsCiB9OwogCiAvKiBMMiBDQVQgcHJvcHMgKi8KLXN0YXRp YyB2b2lkIGwyX2NhdF93cml0ZV9tc3IodW5zaWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLCBl bnVtIGNibV90eXBlIHR5cGUpCitzdGF0aWMgdm9pZCBsMl9jYXRfd3JpdGVfbXNyKHVuc2lnbmVk IGludCBjb3MsIHVpbnQzMl90IHZhbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW51 bSBwc3JfdHlwZSB0eXBlKQogewogICAgIHdybXNybChNU1JfSUEzMl9QU1JfTDJfTUFTSyhjb3Mp LCB2YWwpOwogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGZlYXRfcHJvcHMgbDJfY2F0X3Byb3Bz ID0gewogICAgIC5jb3NfbnVtID0gMSwKLSAgICAudHlwZVswXSA9IFBTUl9DQk1fVFlQRV9MMiwK LSAgICAuYWx0X3R5cGUgPSBQU1JfQ0JNX1RZUEVfVU5LTk9XTiwKKyAgICAudHlwZVswXSA9IFBT Ul9UWVBFX0wyX0NCTSwKKyAgICAuYWx0X3R5cGUgPSBQU1JfVFlQRV9VTktOT1dOLAogICAgIC5n ZXRfZmVhdF9pbmZvID0gY2F0X2dldF9mZWF0X2luZm8sCiAgICAgLndyaXRlX21zciA9IGwyX2Nh dF93cml0ZV9tc3IsCiB9OwpAQCAtNjc1LDcgKzY3OCw3IEBAIHN0YXRpYyBzdHJ1Y3QgcHNyX3Nv Y2tldF9pbmZvICpnZXRfc29ja2V0X2luZm8odW5zaWduZWQgaW50IHNvY2tldCkKICAgICByZXR1 cm4gc29ja2V0X2luZm8gKyBzb2NrZXQ7CiB9CiAKLWludCBwc3JfZ2V0X2luZm8odW5zaWduZWQg aW50IHNvY2tldCwgZW51bSBjYm1fdHlwZSB0eXBlLAoraW50IHBzcl9nZXRfaW5mbyh1bnNpZ25l ZCBpbnQgc29ja2V0LCBlbnVtIHBzcl90eXBlIHR5cGUsCiAgICAgICAgICAgICAgICAgIHVpbnQz Ml90IGRhdGFbXSwgdW5zaWduZWQgaW50IGFycmF5X2xlbikKIHsKICAgICBjb25zdCBzdHJ1Y3Qg cHNyX3NvY2tldF9pbmZvICppbmZvID0gZ2V0X3NvY2tldF9pbmZvKHNvY2tldCk7CkBAIC02ODcs NyArNjkwLDcgQEAgaW50IHBzcl9nZXRfaW5mbyh1bnNpZ25lZCBpbnQgc29ja2V0LCBlbnVtIGNi bV90eXBlIHR5cGUsCiAgICAgaWYgKCBJU19FUlIoaW5mbykgKQogICAgICAgICByZXR1cm4gUFRS X0VSUihpbmZvKTsKIAotICAgIGZlYXRfdHlwZSA9IHBzcl9jYm1fdHlwZV90b19mZWF0X3R5cGUo dHlwZSk7CisgICAgZmVhdF90eXBlID0gcHNyX3R5cGVfdG9fZmVhdF90eXBlKHR5cGUpOwogICAg IGlmICggZmVhdF90eXBlID49IEFSUkFZX1NJWkUoaW5mby0+ZmVhdHVyZXMpICkKICAgICAgICAg cmV0dXJuIC1FTk9FTlQ7CiAKQEAgLTcwOCw3ICs3MTEsNyBAQCBpbnQgcHNyX2dldF9pbmZvKHVu c2lnbmVkIGludCBzb2NrZXQsIGVudW0gY2JtX3R5cGUgdHlwZSwKIH0KIAogaW50IHBzcl9nZXRf dmFsKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBzb2NrZXQsCi0gICAgICAgICAgICAg ICAgdWludDMyX3QgKnZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKQorICAgICAgICAgICAgICAgIHVp bnQzMl90ICp2YWwsIGVudW0gcHNyX3R5cGUgdHlwZSkKIHsKICAgICBjb25zdCBzdHJ1Y3QgcHNy X3NvY2tldF9pbmZvICppbmZvID0gZ2V0X3NvY2tldF9pbmZvKHNvY2tldCk7CiAgICAgY29uc3Qg c3RydWN0IGZlYXRfbm9kZSAqZmVhdDsKQEAgLTcyMCw3ICs3MjMsNyBAQCBpbnQgcHNyX2dldF92 YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHNvY2tldCwKICAgICBpZiAoIElTX0VS UihpbmZvKSApCiAgICAgICAgIHJldHVybiBQVFJfRVJSKGluZm8pOwogCi0gICAgZmVhdF90eXBl ID0gcHNyX2NibV90eXBlX3RvX2ZlYXRfdHlwZSh0eXBlKTsKKyAgICBmZWF0X3R5cGUgPSBwc3Jf dHlwZV90b19mZWF0X3R5cGUodHlwZSk7CiAgICAgaWYgKCBmZWF0X3R5cGUgPj0gQVJSQVlfU0la RShpbmZvLT5mZWF0dXJlcykgKQogICAgICAgICByZXR1cm4gLUVOT0VOVDsKIApAQCAtODUwLDcg Kzg1Myw3IEBAIHN0YXRpYyBpbnQgaW5zZXJ0X3ZhbF9pbnRvX2FycmF5KHVpbnQzMl90IHZhbFtd LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGFycmF5X2xl biwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBwc3Jfc29j a2V0X2luZm8gKmluZm8sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnVtIHBz cl9mZWF0X3R5cGUgZmVhdF90eXBlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZW51bSBjYm1fdHlwZSB0eXBlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW51 bSBwc3JfdHlwZSB0eXBlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMy X3QgbmV3X3ZhbCkKIHsKICAgICBjb25zdCBzdHJ1Y3QgZmVhdF9ub2RlICpmZWF0OwpAQCAtODg2 LDggKzg4OSw5IEBAIHN0YXRpYyBpbnQgaW5zZXJ0X3ZhbF9pbnRvX2FycmF5KHVpbnQzMl90IHZh bFtdLAogICAgIC8qCiAgICAgICogVmFsdWUgc2V0dGluZyBwb3NpdGlvbiBpcyBzYW1lIGFzIGZl YXR1cmUgYXJyYXkuCiAgICAgICogRm9yIENEUCwgdXNlciBtYXkgc2V0IGJvdGggREFUQSBhbmQg Q09ERSB0byBzYW1lIHZhbHVlLiBGb3Igc3VjaCBjYXNlLAotICAgICAqIHVzZXIgaW5wdXQgJ1BT Ul9DQk1fVFlQRV9MMycgYXMgdHlwZS4gVGhlIGFsdGVybmF0aXZlIHR5cGUgb2YgQ0RQIGlzIHNh bWUKLSAgICAgKiBhcyBpdC4gU28gd2Ugc2hvdWxkIHNldCBuZXdfdmFsIHRvIGJvdGggb2YgREFU QSBhbmQgQ09ERSB1bmRlciBzdWNoIGNhc2UuCisgICAgICogdXNlciBpbnB1dCAnUFNSX1RZUEVf TDNfQ0JNJyBhcyB0eXBlLiBUaGUgYWx0ZXJuYXRpdmUgdHlwZSBvZiBDRFAgaXMKKyAgICAgKiBz YW1lIGFzIGl0LiBTbyB3ZSBzaG91bGQgc2V0IG5ld192YWwgdG8gYm90aCBvZiBEQVRBIGFuZCBD T0RFIHVuZGVyIHN1Y2gKKyAgICAgKiBjYXNlLgogICAgICAqLwogICAgIGZvciAoIGkgPSAwOyBp IDwgcHJvcHMtPmNvc19udW07IGkrKyApCiAgICAgewpAQCAtMTE4Miw3ICsxMTg2LDcgQEAgc3Rh dGljIGludCB3cml0ZV9wc3JfbXNycyh1bnNpZ25lZCBpbnQgc29ja2V0LCB1bnNpZ25lZCBpbnQg Y29zLAogfQogCiBpbnQgcHNyX3NldF92YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50 IHNvY2tldCwKLSAgICAgICAgICAgICAgICB1aW50NjRfdCBuZXdfdmFsLCBlbnVtIGNibV90eXBl IHR5cGUpCisgICAgICAgICAgICAgICAgdWludDY0X3QgbmV3X3ZhbCwgZW51bSBwc3JfdHlwZSB0 eXBlKQogewogICAgIHVuc2lnbmVkIGludCBvbGRfY29zLCBhcnJheV9sZW47CiAgICAgaW50IGNv cywgcmV0OwpAQCAtMTE5OCw3ICsxMjAyLDcgQEAgaW50IHBzcl9zZXRfdmFsKHN0cnVjdCBkb21h aW4gKmQsIHVuc2lnbmVkIGludCBzb2NrZXQsCiAgICAgaWYgKCBuZXdfdmFsICE9IHZhbCApCiAg ICAgICAgIHJldHVybiAtRUlOVkFMOwogCi0gICAgZmVhdF90eXBlID0gcHNyX2NibV90eXBlX3Rv X2ZlYXRfdHlwZSh0eXBlKTsKKyAgICBmZWF0X3R5cGUgPSBwc3JfdHlwZV90b19mZWF0X3R5cGUo dHlwZSk7CiAgICAgaWYgKCBmZWF0X3R5cGUgPj0gQVJSQVlfU0laRShpbmZvLT5mZWF0dXJlcykg fHwKICAgICAgICAgICFpbmZvLT5mZWF0dXJlc1tmZWF0X3R5cGVdICkKICAgICAgICAgcmV0dXJu IC1FTk9FTlQ7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvc3lzY3RsLmMgYi94ZW4vYXJjaC94 ODYvc3lzY3RsLmMKaW5kZXggOGFlNjc0Ny4uNjg2N2VlMSAxMDA2NDQKLS0tIGEveGVuL2FyY2gv eDg2L3N5c2N0bC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9zeXNjdGwuYwpAQCAtMTc5LDcgKzE3OSw3 IEBAIGxvbmcgYXJjaF9kb19zeXNjdGwoCiAgICAgICAgIGNhc2UgWEVOX1NZU0NUTF9QU1JfZ2V0 X2wzX2luZm86CiAgICAgICAgIHsKICAgICAgICAgICAgIHJldCA9IHBzcl9nZXRfaW5mbyhzeXNj dGwtPnUucHNyX2FsbG9jLnRhcmdldCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQ U1JfQ0JNX1RZUEVfTDMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFBTUl9UWVBFX0wzX0NCTSwgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7 CiAgICAgICAgICAgICBpZiAoIHJldCApCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAKQEAgLTE5 OCw3ICsxOTgsNyBAQCBsb25nIGFyY2hfZG9fc3lzY3RsKAogICAgICAgICBjYXNlIFhFTl9TWVND VExfUFNSX2dldF9sMl9pbmZvOgogICAgICAgICB7CiAgICAgICAgICAgICByZXQgPSBwc3JfZ2V0 X2luZm8oc3lzY3RsLT51LnBzcl9hbGxvYy50YXJnZXQsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgUFNSX0NCTV9UWVBFX0wyLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBQU1JfVFlQRV9MMl9DQk0sIGRhdGEsIEFSUkFZX1NJ WkUoZGF0YSkpOwogICAgICAgICAgICAgaWYgKCByZXQgKQogICAgICAgICAgICAgICAgIGJyZWFr OwogCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3Bzci5oIGIveGVuL2luY2x1ZGUv YXNtLXg4Ni9wc3IuaAppbmRleCAxOGE0MmYzLi5jYjNmMDY3IDEwMDY0NAotLS0gYS94ZW4vaW5j bHVkZS9hc20teDg2L3Bzci5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcHNyLmgKQEAgLTUz LDEyICs1MywxMiBAQCBzdHJ1Y3QgcHNyX2NtdCB7CiAgICAgc3RydWN0IHBzcl9jbXRfbDMgbDM7 CiB9OwogCi1lbnVtIGNibV90eXBlIHsKLSAgICBQU1JfQ0JNX1RZUEVfTDMsCi0gICAgUFNSX0NC TV9UWVBFX0wzX0NPREUsCi0gICAgUFNSX0NCTV9UWVBFX0wzX0RBVEEsCi0gICAgUFNSX0NCTV9U WVBFX0wyLAotICAgIFBTUl9DQk1fVFlQRV9VTktOT1dOLAorZW51bSBwc3JfdHlwZSB7CisgICAg UFNSX1RZUEVfTDNfQ0JNLAorICAgIFBTUl9UWVBFX0wzX0NPREUsCisgICAgUFNSX1RZUEVfTDNf REFUQSwKKyAgICBQU1JfVFlQRV9MMl9DQk0sCisgICAgUFNSX1RZUEVfVU5LTk9XTiwKIH07CiAK IGV4dGVybiBzdHJ1Y3QgcHNyX2NtdCAqcHNyX2NtdDsKQEAgLTcyLDEyICs3MiwxMiBAQCBpbnQg cHNyX2FsbG9jX3JtaWQoc3RydWN0IGRvbWFpbiAqZCk7CiB2b2lkIHBzcl9mcmVlX3JtaWQoc3Ry dWN0IGRvbWFpbiAqZCk7CiB2b2lkIHBzcl9jdHh0X3N3aXRjaF90byhzdHJ1Y3QgZG9tYWluICpk KTsKIAotaW50IHBzcl9nZXRfaW5mbyh1bnNpZ25lZCBpbnQgc29ja2V0LCBlbnVtIGNibV90eXBl IHR5cGUsCitpbnQgcHNyX2dldF9pbmZvKHVuc2lnbmVkIGludCBzb2NrZXQsIGVudW0gcHNyX3R5 cGUgdHlwZSwKICAgICAgICAgICAgICAgICAgdWludDMyX3QgZGF0YVtdLCB1bnNpZ25lZCBpbnQg YXJyYXlfbGVuKTsKIGludCBwc3JfZ2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBp bnQgc29ja2V0LAotICAgICAgICAgICAgICAgIHVpbnQzMl90ICp2YWwsIGVudW0gY2JtX3R5cGUg dHlwZSk7CisgICAgICAgICAgICAgICAgdWludDMyX3QgKnZhbCwgZW51bSBwc3JfdHlwZSB0eXBl KTsKIGludCBwc3Jfc2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgc29ja2V0 LAotICAgICAgICAgICAgICAgIHVpbnQ2NF90IHZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKTsKKyAg ICAgICAgICAgICAgICB1aW50NjRfdCB2YWwsIGVudW0gcHNyX3R5cGUgdHlwZSk7CiAKIHZvaWQg cHNyX2RvbWFpbl9pbml0KHN0cnVjdCBkb21haW4gKmQpOwogdm9pZCBwc3JfZG9tYWluX2ZyZWUo c3RydWN0IGRvbWFpbiAqZCk7Ci0tIAoxLjkuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=