From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yi Sun Subject: [PATCH v4 03/15] x86: rename 'cbm_type' to 'psr_type' to make it general Date: Sat, 23 Sep 2017 17:48:12 +0800 Message-ID: <1506160104-5890-4-git-send-email-yi.y.sun@linux.intel.com> References: <1506160104-5890-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 1dvhMD-0004Zd-9z for xen-devel@lists.xenproject.org; Sat, 23 Sep 2017 10:08:21 +0000 In-Reply-To: <1506160104-5890-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 ZXIgUGF1IE1vbm4/IDxyb2dlci5wYXVAY2l0cml4LmNvbT4KLS0tCkNDOiBKYW4gQmV1bGljaCA8 amJldWxpY2hAc3VzZS5jb20+CkNDOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRy aXguY29tPgpDQzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ0M6IFJvZ2VyIFBhdSBN b25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgpDQzogQ2hhbyBQZW5nIDxjaGFvLnAucGVuZ0Bs aW51eC5pbnRlbC5jb20+Cgp2NDoKICAgIC0gZml4IHdvcmRzIGluIGNvbW1pdCBtZXNzYWdlLgog ICAgICAoc3VnZ2VzdGVkIGJ5IFJvZ2VyIFBhdSBNb25uw6kpCnYzOgogICAgLSByZXBsYWNlICdw c3JfdmFsX3R5cGUnIHRvICdwc3JfdHlwZScgYW5kIHJlbW92ZSAnX1ZBTCcgZnJvbSB0aGUgZW51 bQogICAgICBpdGVtcy4KICAgICAgKHN1Z2dlc3RlZCBieSBSb2dlciBQYXUgTW9ubsOpKQp2MjoK ICAgIC0gcmVwbGFjZSAnUFNSX1ZBTF9UWVBFX3tMMywgTDJ9JyB0byAnUFNSX1ZBTF9UWVBFX3tM MywgTDJ9X0NCTScuCiAgICAgIChzdWdnZXN0ZWQgYnkgQ2hhbyBQZW5nKQotLS0KIHhlbi9hcmNo L3g4Ni9kb21jdGwuYyAgICAgfCAxNiArKysrKystLS0tLS0KIHhlbi9hcmNoL3g4Ni9wc3IuYyAg ICAgICAgfCA2MiArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogeGVuL2FyY2gveDg2L3N5c2N0bC5jICAgICB8ICA0ICstLQogeGVuL2luY2x1ZGUvYXNtLXg4 Ni9wc3IuaCB8IDE4ICsrKysrKystLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlv bnMoKyksIDQ4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9kb21jdGwu YyBiL3hlbi9hcmNoL3g4Ni9kb21jdGwuYwppbmRleCBiOWFmZGYzLi4xOGNhZTg4IDEwMDY0NAot LS0gYS94ZW4vYXJjaC94ODYvZG9tY3RsLmMKKysrIGIveGVuL2FyY2gveDg2L2RvbWN0bC5jCkBA IC0xNDQ3LDUxICsxNDQ3LDUxIEBAIGxvbmcgYXJjaF9kb19kb21jdGwoCiAgICAgICAgIGNhc2Ug WEVOX0RPTUNUTF9QU1JfU0VUX0wzX0NCTToKICAgICAgICAgICAgIHJldCA9IHBzcl9zZXRfdmFs KGQsIGRvbWN0bC0+dS5wc3JfYWxsb2MudGFyZ2V0LAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZG9tY3RsLT51LnBzcl9hbGxvYy5kYXRhLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgUFNSX0NCTV9UWVBFX0wzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBT Ul9UWVBFX0wzX0NCTSk7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFhFTl9E T01DVExfUFNSX1NFVF9MM19DT0RFOgogICAgICAgICAgICAgcmV0ID0gcHNyX3NldF92YWwoZCwg ZG9tY3RsLT51LnBzcl9hbGxvYy50YXJnZXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBkb21jdGwtPnUucHNyX2FsbG9jLmRhdGEsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBQU1JfQ0JNX1RZUEVfTDNfQ09ERSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQ U1JfVFlQRV9MM19DT0RFKTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgWEVO X0RPTUNUTF9QU1JfU0VUX0wzX0RBVEE6CiAgICAgICAgICAgICByZXQgPSBwc3Jfc2V0X3ZhbChk LCBkb21jdGwtPnUucHNyX2FsbG9jLnRhcmdldCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGRvbWN0bC0+dS5wc3JfYWxsb2MuZGF0YSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFBTUl9DQk1fVFlQRV9MM19EQVRBKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFBTUl9UWVBFX0wzX0RBVEEpOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBY RU5fRE9NQ1RMX1BTUl9TRVRfTDJfQ0JNOgogICAgICAgICAgICAgcmV0ID0gcHNyX3NldF92YWwo ZCwgZG9tY3RsLT51LnBzcl9hbGxvYy50YXJnZXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBkb21jdGwtPnUucHNyX2FsbG9jLmRhdGEsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBQU1JfQ0JNX1RZUEVfTDIpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNS X1RZUEVfTDJfQ0JNKTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgWEVOX0RP TUNUTF9QU1JfR0VUX0wzX0NCTToKICAgICAgICAgICAgIHJldCA9IHBzcl9nZXRfdmFsKGQsIGRv bWN0bC0+dS5wc3JfYWxsb2MudGFyZ2V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg JnZhbDMyLCBQU1JfQ0JNX1RZUEVfTDMpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg JnZhbDMyLCBQU1JfVFlQRV9MM19DQk0pOwogICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxv Yy5kYXRhID0gdmFsMzI7CiAgICAgICAgICAgICBjb3B5YmFjayA9IHRydWU7CiAgICAgICAgICAg ICBicmVhazsKIAogICAgICAgICBjYXNlIFhFTl9ET01DVExfUFNSX0dFVF9MM19DT0RFOgogICAg ICAgICAgICAgcmV0ID0gcHNyX2dldF92YWwoZCwgZG9tY3RsLT51LnBzcl9hbGxvYy50YXJnZXQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmdmFsMzIsIFBTUl9DQk1fVFlQRV9MM19D T0RFKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX1RZUEVfTDNf Q09ERSk7CiAgICAgICAgICAgICBkb21jdGwtPnUucHNyX2FsbG9jLmRhdGEgPSB2YWwzMjsKICAg ICAgICAgICAgIGNvcHliYWNrID0gdHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAg IGNhc2UgWEVOX0RPTUNUTF9QU1JfR0VUX0wzX0RBVEE6CiAgICAgICAgICAgICByZXQgPSBwc3Jf Z2V0X3ZhbChkLCBkb21jdGwtPnUucHNyX2FsbG9jLnRhcmdldCwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICZ2YWwzMiwgUFNSX0NCTV9UWVBFX0wzX0RBVEEpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJnZhbDMyLCBQU1JfVFlQRV9MM19EQVRBKTsKICAgICAgICAgICAg IGRvbWN0bC0+dS5wc3JfYWxsb2MuZGF0YSA9IHZhbDMyOwogICAgICAgICAgICAgY29weWJhY2sg PSB0cnVlOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBYRU5fRE9NQ1RMX1BT Ul9HRVRfTDJfQ0JNOgogICAgICAgICAgICAgcmV0ID0gcHNyX2dldF92YWwoZCwgZG9tY3RsLT51 LnBzcl9hbGxvYy50YXJnZXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmdmFsMzIs IFBTUl9DQk1fVFlQRV9MMik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmdmFsMzIs IFBTUl9UWVBFX0wyX0NCTSk7CiAgICAgICAgICAgICBkb21jdGwtPnUucHNyX2FsbG9jLmRhdGEg PSB2YWwzMjsKICAgICAgICAgICAgIGNvcHliYWNrID0gdHJ1ZTsKICAgICAgICAgICAgIGJyZWFr OwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L3Bzci5jIGIveGVuL2FyY2gveDg2L3Bzci5jCmlu ZGV4IGM4NTE1MTEuLmFhNWE2MGYgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wc3IuYworKysg Yi94ZW4vYXJjaC94ODYvcHNyLmMKQEAgLTEwMCwyNCArMTAwLDI0IEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3QgZmVhdF9wcm9wcyB7CiAgICAgdW5zaWduZWQgaW50IGNvc19udW07CiAKICAgICAvKgot ICAgICAqIEFuIGFycmF5IHRvIHNhdmUgYWxsICdlbnVtIGNibV90eXBlJyB2YWx1ZXMgb2YgdGhl IGZlYXR1cmUuIEl0IGlzCisgICAgICogQW4gYXJyYXkgdG8gc2F2ZSBhbGwgJ2VudW0gcHNyX3R5 cGUnIHZhbHVlcyBvZiB0aGUgZmVhdHVyZS4gSXQgaXMKICAgICAgKiB1c2VkIHdpdGggY29zX251 bSB0b2dldGhlciB0byBnZXQvd3JpdGUgYSBmZWF0dXJlJ3MgQ09TIHJlZ2lzdGVycwogICAgICAq IHZhbHVlcyBvbmUgYnkgb25lLgogICAgICAqLwotICAgIGVudW0gY2JtX3R5cGUgdHlwZVtNQVhf Q09TX05VTV07CisgICAgZW51bSBwc3JfdHlwZSB0eXBlW01BWF9DT1NfTlVNXTsKIAogICAgIC8q CiAgICAgICogYWx0X3R5cGUgaXMgJ2FsdGVybmF0aXZlIHR5cGUnLiBXaGVuIHRoaXMgJ2FsdF90 eXBlJyBpcyBpbnB1dCwgdGhlCiAgICAgICogZmVhdHVyZSBkb2VzIHNvbWUgc3BlY2lhbCBvcGVy YXRpb25zLgogICAgICAqLwotICAgIGVudW0gY2JtX3R5cGUgYWx0X3R5cGU7CisgICAgZW51bSBw c3JfdHlwZSBhbHRfdHlwZTsKIAogICAgIC8qIGdldF9mZWF0X2luZm8gaXMgdXNlZCB0byByZXR1 cm4gZmVhdHVyZSBIVyBpbmZvIHRocm91Z2ggc3lzY3RsLiAqLwogICAgIGJvb2wgKCpnZXRfZmVh dF9pbmZvKShjb25zdCBzdHJ1Y3QgZmVhdF9ub2RlICpmZWF0LAogICAgICAgICAgICAgICAgICAg ICAgICAgICB1aW50MzJfdCBkYXRhW10sIHVuc2lnbmVkIGludCBhcnJheV9sZW4pOwogCiAgICAg Lyogd3JpdGVfbXNyIGlzIHVzZWQgdG8gd3JpdGUgb3V0IGZlYXR1cmUgTVNSIHJlZ2lzdGVyLiAq LwotICAgIHZvaWQgKCp3cml0ZV9tc3IpKHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwg ZW51bSBjYm1fdHlwZSB0eXBlKTsKKyAgICB2b2lkICgqd3JpdGVfbXNyKSh1bnNpZ25lZCBpbnQg Y29zLCB1aW50MzJfdCB2YWwsIGVudW0gcHNyX3R5cGUgdHlwZSk7CiB9ICpmZWF0X3Byb3BzW0ZF QVRfVFlQRV9OVU1dOwogCiAvKgpAQCAtMjE1LDEzICsyMTUsMTMgQEAgc3RhdGljIHZvaWQgZnJl ZV9zb2NrZXRfcmVzb3VyY2VzKHVuc2lnbmVkIGludCBzb2NrZXQpCiAgICAgYml0bWFwX3plcm8o aW5mby0+ZG9tX3NldCwgRE9NSURfSURMRSArIDEpOwogfQogCi1zdGF0aWMgZW51bSBwc3JfZmVh dF90eXBlIHBzcl9jYm1fdHlwZV90b19mZWF0X3R5cGUoZW51bSBjYm1fdHlwZSB0eXBlKQorc3Rh dGljIGVudW0gcHNyX2ZlYXRfdHlwZSBwc3JfdHlwZV90b19mZWF0X3R5cGUoZW51bSBwc3JfdHlw ZSB0eXBlKQogewogICAgIGVudW0gcHNyX2ZlYXRfdHlwZSBmZWF0X3R5cGUgPSBGRUFUX1RZUEVf VU5LTk9XTjsKIAogICAgIHN3aXRjaCAoIHR5cGUgKQogICAgIHsKLSAgICBjYXNlIFBTUl9DQk1f VFlQRV9MMzoKKyAgICBjYXNlIFBTUl9UWVBFX0wzX0NCTToKICAgICAgICAgZmVhdF90eXBlID0g RkVBVF9UWVBFX0wzX0NBVDsKIAogICAgICAgICAvKgpAQCAtMjMzLDEyICsyMzMsMTIgQEAgc3Rh dGljIGVudW0gcHNyX2ZlYXRfdHlwZSBwc3JfY2JtX3R5cGVfdG9fZmVhdF90eXBlKGVudW0gY2Jt X3R5cGUgdHlwZSkKIAogICAgICAgICBicmVhazsKIAotICAgIGNhc2UgUFNSX0NCTV9UWVBFX0wz X0RBVEE6Ci0gICAgY2FzZSBQU1JfQ0JNX1RZUEVfTDNfQ09ERToKKyAgICBjYXNlIFBTUl9UWVBF X0wzX0RBVEE6CisgICAgY2FzZSBQU1JfVFlQRV9MM19DT0RFOgogICAgICAgICBmZWF0X3R5cGUg PSBGRUFUX1RZUEVfTDNfQ0RQOwogICAgICAgICBicmVhazsKIAotICAgIGNhc2UgUFNSX0NCTV9U WVBFX0wyOgorICAgIGNhc2UgUFNSX1RZUEVfTDJfQ0JNOgogICAgICAgICBmZWF0X3R5cGUgPSBG RUFUX1RZUEVfTDJfQ0FUOwogICAgICAgICBicmVhazsKIApAQCAtMzYyLDE1ICszNjIsMTYgQEAg c3RhdGljIGJvb2wgY2F0X2dldF9mZWF0X2luZm8oY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVh dCwKIH0KIAogLyogTDMgQ0FUIHByb3BzICovCi1zdGF0aWMgdm9pZCBsM19jYXRfd3JpdGVfbXNy KHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKQorc3Rh dGljIHZvaWQgbDNfY2F0X3dyaXRlX21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2YWws CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudW0gcHNyX3R5cGUgdHlwZSkKIHsKICAg ICB3cm1zcmwoTVNSX0lBMzJfUFNSX0wzX01BU0soY29zKSwgdmFsKTsKIH0KIAogc3RhdGljIGNv bnN0IHN0cnVjdCBmZWF0X3Byb3BzIGwzX2NhdF9wcm9wcyA9IHsKICAgICAuY29zX251bSA9IDEs Ci0gICAgLnR5cGVbMF0gPSBQU1JfQ0JNX1RZUEVfTDMsCi0gICAgLmFsdF90eXBlID0gUFNSX0NC TV9UWVBFX1VOS05PV04sCisgICAgLnR5cGVbMF0gPSBQU1JfVFlQRV9MM19DQk0sCisgICAgLmFs dF90eXBlID0gUFNSX1RZUEVfVU5LTk9XTiwKICAgICAuZ2V0X2ZlYXRfaW5mbyA9IGNhdF9nZXRf ZmVhdF9pbmZvLAogICAgIC53cml0ZV9tc3IgPSBsM19jYXRfd3JpdGVfbXNyLAogfTsKQEAgLTM4 Nyw5ICszODgsMTAgQEAgc3RhdGljIGJvb2wgbDNfY2RwX2dldF9mZWF0X2luZm8oY29uc3Qgc3Ry dWN0IGZlYXRfbm9kZSAqZmVhdCwKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIHZvaWQg bDNfY2RwX3dyaXRlX21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2YWwsIGVudW0gY2Jt X3R5cGUgdHlwZSkKK3N0YXRpYyB2b2lkIGwzX2NkcF93cml0ZV9tc3IodW5zaWduZWQgaW50IGNv cywgdWludDMyX3QgdmFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnVtIHBzcl90 eXBlIHR5cGUpCiB7Ci0gICAgd3Jtc3JsKCgodHlwZSA9PSBQU1JfQ0JNX1RZUEVfTDNfREFUQSkg PworICAgIHdybXNybCgoKHR5cGUgPT0gUFNSX1RZUEVfTDNfREFUQSkgPwogICAgICAgICAgICAg TVNSX0lBMzJfUFNSX0wzX01BU0tfREFUQShjb3MpIDoKICAgICAgICAgICAgIE1TUl9JQTMyX1BT Ul9MM19NQVNLX0NPREUoY29zKSksCiAgICAgICAgICAgIHZhbCk7CkBAIC0zOTcsMjMgKzM5OSwy NCBAQCBzdGF0aWMgdm9pZCBsM19jZHBfd3JpdGVfbXNyKHVuc2lnbmVkIGludCBjb3MsIHVpbnQz Ml90IHZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGZlYXRf cHJvcHMgbDNfY2RwX3Byb3BzID0gewogICAgIC5jb3NfbnVtID0gMiwKLSAgICAudHlwZVswXSA9 IFBTUl9DQk1fVFlQRV9MM19EQVRBLAotICAgIC50eXBlWzFdID0gUFNSX0NCTV9UWVBFX0wzX0NP REUsCi0gICAgLmFsdF90eXBlID0gUFNSX0NCTV9UWVBFX0wzLAorICAgIC50eXBlWzBdID0gUFNS X1RZUEVfTDNfREFUQSwKKyAgICAudHlwZVsxXSA9IFBTUl9UWVBFX0wzX0NPREUsCisgICAgLmFs dF90eXBlID0gUFNSX1RZUEVfTDNfQ0JNLAogICAgIC5nZXRfZmVhdF9pbmZvID0gbDNfY2RwX2dl dF9mZWF0X2luZm8sCiAgICAgLndyaXRlX21zciA9IGwzX2NkcF93cml0ZV9tc3IsCiB9OwogCiAv KiBMMiBDQVQgcHJvcHMgKi8KLXN0YXRpYyB2b2lkIGwyX2NhdF93cml0ZV9tc3IodW5zaWduZWQg aW50IGNvcywgdWludDMyX3QgdmFsLCBlbnVtIGNibV90eXBlIHR5cGUpCitzdGF0aWMgdm9pZCBs Ml9jYXRfd3JpdGVfbXNyKHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZW51bSBwc3JfdHlwZSB0eXBlKQogewogICAgIHdybXNybChN U1JfSUEzMl9QU1JfTDJfTUFTSyhjb3MpLCB2YWwpOwogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0 IGZlYXRfcHJvcHMgbDJfY2F0X3Byb3BzID0gewogICAgIC5jb3NfbnVtID0gMSwKLSAgICAudHlw ZVswXSA9IFBTUl9DQk1fVFlQRV9MMiwKLSAgICAuYWx0X3R5cGUgPSBQU1JfQ0JNX1RZUEVfVU5L Tk9XTiwKKyAgICAudHlwZVswXSA9IFBTUl9UWVBFX0wyX0NCTSwKKyAgICAuYWx0X3R5cGUgPSBQ U1JfVFlQRV9VTktOT1dOLAogICAgIC5nZXRfZmVhdF9pbmZvID0gY2F0X2dldF9mZWF0X2luZm8s CiAgICAgLndyaXRlX21zciA9IGwyX2NhdF93cml0ZV9tc3IsCiB9OwpAQCAtNjc1LDcgKzY3OCw3 IEBAIHN0YXRpYyBzdHJ1Y3QgcHNyX3NvY2tldF9pbmZvICpnZXRfc29ja2V0X2luZm8odW5zaWdu ZWQgaW50IHNvY2tldCkKICAgICByZXR1cm4gc29ja2V0X2luZm8gKyBzb2NrZXQ7CiB9CiAKLWlu dCBwc3JfZ2V0X2luZm8odW5zaWduZWQgaW50IHNvY2tldCwgZW51bSBjYm1fdHlwZSB0eXBlLAor aW50IHBzcl9nZXRfaW5mbyh1bnNpZ25lZCBpbnQgc29ja2V0LCBlbnVtIHBzcl90eXBlIHR5cGUs CiAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGRhdGFbXSwgdW5zaWduZWQgaW50IGFycmF5X2xl bikKIHsKICAgICBjb25zdCBzdHJ1Y3QgcHNyX3NvY2tldF9pbmZvICppbmZvID0gZ2V0X3NvY2tl dF9pbmZvKHNvY2tldCk7CkBAIC02ODcsNyArNjkwLDcgQEAgaW50IHBzcl9nZXRfaW5mbyh1bnNp Z25lZCBpbnQgc29ja2V0LCBlbnVtIGNibV90eXBlIHR5cGUsCiAgICAgaWYgKCBJU19FUlIoaW5m bykgKQogICAgICAgICByZXR1cm4gUFRSX0VSUihpbmZvKTsKIAotICAgIGZlYXRfdHlwZSA9IHBz cl9jYm1fdHlwZV90b19mZWF0X3R5cGUodHlwZSk7CisgICAgZmVhdF90eXBlID0gcHNyX3R5cGVf dG9fZmVhdF90eXBlKHR5cGUpOwogICAgIGlmICggZmVhdF90eXBlID49IEFSUkFZX1NJWkUoaW5m by0+ZmVhdHVyZXMpICkKICAgICAgICAgcmV0dXJuIC1FTk9FTlQ7CiAKQEAgLTcwOCw3ICs3MTEs NyBAQCBpbnQgcHNyX2dldF9pbmZvKHVuc2lnbmVkIGludCBzb2NrZXQsIGVudW0gY2JtX3R5cGUg dHlwZSwKIH0KIAogaW50IHBzcl9nZXRfdmFsKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGlu dCBzb2NrZXQsCi0gICAgICAgICAgICAgICAgdWludDMyX3QgKnZhbCwgZW51bSBjYm1fdHlwZSB0 eXBlKQorICAgICAgICAgICAgICAgIHVpbnQzMl90ICp2YWwsIGVudW0gcHNyX3R5cGUgdHlwZSkK IHsKICAgICBjb25zdCBzdHJ1Y3QgcHNyX3NvY2tldF9pbmZvICppbmZvID0gZ2V0X3NvY2tldF9p bmZvKHNvY2tldCk7CiAgICAgY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdDsKQEAgLTcyMCw3 ICs3MjMsNyBAQCBpbnQgcHNyX2dldF92YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50 IHNvY2tldCwKICAgICBpZiAoIElTX0VSUihpbmZvKSApCiAgICAgICAgIHJldHVybiBQVFJfRVJS KGluZm8pOwogCi0gICAgZmVhdF90eXBlID0gcHNyX2NibV90eXBlX3RvX2ZlYXRfdHlwZSh0eXBl KTsKKyAgICBmZWF0X3R5cGUgPSBwc3JfdHlwZV90b19mZWF0X3R5cGUodHlwZSk7CiAgICAgaWYg KCBmZWF0X3R5cGUgPj0gQVJSQVlfU0laRShpbmZvLT5mZWF0dXJlcykgKQogICAgICAgICByZXR1 cm4gLUVOT0VOVDsKIApAQCAtODUwLDcgKzg1Myw3IEBAIHN0YXRpYyBpbnQgaW5zZXJ0X3ZhbF9p bnRvX2FycmF5KHVpbnQzMl90IHZhbFtdLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgaW50IGFycmF5X2xlbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IHN0cnVjdCBwc3Jfc29ja2V0X2luZm8gKmluZm8sCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBlbnVtIHBzcl9mZWF0X3R5cGUgZmVhdF90eXBlLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZW51bSBjYm1fdHlwZSB0eXBlLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZW51bSBwc3JfdHlwZSB0eXBlLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdWludDMyX3QgbmV3X3ZhbCkKIHsKICAgICBjb25zdCBzdHJ1Y3Qg ZmVhdF9ub2RlICpmZWF0OwpAQCAtODg2LDggKzg4OSw5IEBAIHN0YXRpYyBpbnQgaW5zZXJ0X3Zh bF9pbnRvX2FycmF5KHVpbnQzMl90IHZhbFtdLAogICAgIC8qCiAgICAgICogVmFsdWUgc2V0dGlu ZyBwb3NpdGlvbiBpcyBzYW1lIGFzIGZlYXR1cmUgYXJyYXkuCiAgICAgICogRm9yIENEUCwgdXNl ciBtYXkgc2V0IGJvdGggREFUQSBhbmQgQ09ERSB0byBzYW1lIHZhbHVlLiBGb3Igc3VjaCBjYXNl LAotICAgICAqIHVzZXIgaW5wdXQgJ1BTUl9DQk1fVFlQRV9MMycgYXMgdHlwZS4gVGhlIGFsdGVy bmF0aXZlIHR5cGUgb2YgQ0RQIGlzIHNhbWUKLSAgICAgKiBhcyBpdC4gU28gd2Ugc2hvdWxkIHNl dCBuZXdfdmFsIHRvIGJvdGggb2YgREFUQSBhbmQgQ09ERSB1bmRlciBzdWNoIGNhc2UuCisgICAg ICogdXNlciBpbnB1dCAnUFNSX1RZUEVfTDNfQ0JNJyBhcyB0eXBlLiBUaGUgYWx0ZXJuYXRpdmUg dHlwZSBvZiBDRFAgaXMKKyAgICAgKiBzYW1lIGFzIGl0LiBTbyB3ZSBzaG91bGQgc2V0IG5ld192 YWwgdG8gYm90aCBvZiBEQVRBIGFuZCBDT0RFIHVuZGVyIHN1Y2gKKyAgICAgKiBjYXNlLgogICAg ICAqLwogICAgIGZvciAoIGkgPSAwOyBpIDwgcHJvcHMtPmNvc19udW07IGkrKyApCiAgICAgewpA QCAtMTE3Niw3ICsxMTgwLDcgQEAgc3RhdGljIGludCB3cml0ZV9wc3JfbXNycyh1bnNpZ25lZCBp bnQgc29ja2V0LCB1bnNpZ25lZCBpbnQgY29zLAogfQogCiBpbnQgcHNyX3NldF92YWwoc3RydWN0 IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHNvY2tldCwKLSAgICAgICAgICAgICAgICB1aW50NjRf dCBuZXdfdmFsLCBlbnVtIGNibV90eXBlIHR5cGUpCisgICAgICAgICAgICAgICAgdWludDY0X3Qg bmV3X3ZhbCwgZW51bSBwc3JfdHlwZSB0eXBlKQogewogICAgIHVuc2lnbmVkIGludCBvbGRfY29z LCBhcnJheV9sZW47CiAgICAgaW50IGNvcywgcmV0OwpAQCAtMTE5Miw3ICsxMTk2LDcgQEAgaW50 IHBzcl9zZXRfdmFsKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBzb2NrZXQsCiAgICAg aWYgKCBuZXdfdmFsICE9IHZhbCApCiAgICAgICAgIHJldHVybiAtRUlOVkFMOwogCi0gICAgZmVh dF90eXBlID0gcHNyX2NibV90eXBlX3RvX2ZlYXRfdHlwZSh0eXBlKTsKKyAgICBmZWF0X3R5cGUg PSBwc3JfdHlwZV90b19mZWF0X3R5cGUodHlwZSk7CiAgICAgaWYgKCBmZWF0X3R5cGUgPj0gQVJS QVlfU0laRShpbmZvLT5mZWF0dXJlcykgfHwKICAgICAgICAgICFpbmZvLT5mZWF0dXJlc1tmZWF0 X3R5cGVdICkKICAgICAgICAgcmV0dXJuIC1FTk9FTlQ7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94 ODYvc3lzY3RsLmMgYi94ZW4vYXJjaC94ODYvc3lzY3RsLmMKaW5kZXggZTQ0ZDhhZC4uOWRlZTE2 MyAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L3N5c2N0bC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9z eXNjdGwuYwpAQCAtMTc5LDcgKzE3OSw3IEBAIGxvbmcgYXJjaF9kb19zeXNjdGwoCiAgICAgICAg IGNhc2UgWEVOX1NZU0NUTF9QU1JfZ2V0X2wzX2luZm86CiAgICAgICAgIHsKICAgICAgICAgICAg IHJldCA9IHBzcl9nZXRfaW5mbyhzeXNjdGwtPnUucHNyX2FsbG9jLnRhcmdldCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBQU1JfQ0JNX1RZUEVfTDMsIGRhdGEsIEFSUkFZX1NJWkUo ZGF0YSkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9UWVBFX0wzX0NCTSwg ZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiAgICAgICAgICAgICBpZiAoIHJldCApCiAgICAgICAg ICAgICAgICAgYnJlYWs7CiAKQEAgLTE5OCw3ICsxOTgsNyBAQCBsb25nIGFyY2hfZG9fc3lzY3Rs KAogICAgICAgICBjYXNlIFhFTl9TWVNDVExfUFNSX2dldF9sMl9pbmZvOgogICAgICAgICB7CiAg ICAgICAgICAgICByZXQgPSBwc3JfZ2V0X2luZm8oc3lzY3RsLT51LnBzcl9hbGxvYy50YXJnZXQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wyLCBkYXRhLCBB UlJBWV9TSVpFKGRhdGEpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQU1JfVFlQ RV9MMl9DQk0sIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOwogICAgICAgICAgICAgaWYgKCByZXQg KQogICAgICAgICAgICAgICAgIGJyZWFrOwogCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20t eDg2L3Bzci5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wc3IuaAppbmRleCAxOGE0MmYzLi5jYjNm MDY3IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L3Bzci5oCisrKyBiL3hlbi9pbmNs dWRlL2FzbS14ODYvcHNyLmgKQEAgLTUzLDEyICs1MywxMiBAQCBzdHJ1Y3QgcHNyX2NtdCB7CiAg ICAgc3RydWN0IHBzcl9jbXRfbDMgbDM7CiB9OwogCi1lbnVtIGNibV90eXBlIHsKLSAgICBQU1Jf Q0JNX1RZUEVfTDMsCi0gICAgUFNSX0NCTV9UWVBFX0wzX0NPREUsCi0gICAgUFNSX0NCTV9UWVBF X0wzX0RBVEEsCi0gICAgUFNSX0NCTV9UWVBFX0wyLAotICAgIFBTUl9DQk1fVFlQRV9VTktOT1dO LAorZW51bSBwc3JfdHlwZSB7CisgICAgUFNSX1RZUEVfTDNfQ0JNLAorICAgIFBTUl9UWVBFX0wz X0NPREUsCisgICAgUFNSX1RZUEVfTDNfREFUQSwKKyAgICBQU1JfVFlQRV9MMl9DQk0sCisgICAg UFNSX1RZUEVfVU5LTk9XTiwKIH07CiAKIGV4dGVybiBzdHJ1Y3QgcHNyX2NtdCAqcHNyX2NtdDsK QEAgLTcyLDEyICs3MiwxMiBAQCBpbnQgcHNyX2FsbG9jX3JtaWQoc3RydWN0IGRvbWFpbiAqZCk7 CiB2b2lkIHBzcl9mcmVlX3JtaWQoc3RydWN0IGRvbWFpbiAqZCk7CiB2b2lkIHBzcl9jdHh0X3N3 aXRjaF90byhzdHJ1Y3QgZG9tYWluICpkKTsKIAotaW50IHBzcl9nZXRfaW5mbyh1bnNpZ25lZCBp bnQgc29ja2V0LCBlbnVtIGNibV90eXBlIHR5cGUsCitpbnQgcHNyX2dldF9pbmZvKHVuc2lnbmVk IGludCBzb2NrZXQsIGVudW0gcHNyX3R5cGUgdHlwZSwKICAgICAgICAgICAgICAgICAgdWludDMy X3QgZGF0YVtdLCB1bnNpZ25lZCBpbnQgYXJyYXlfbGVuKTsKIGludCBwc3JfZ2V0X3ZhbChzdHJ1 Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgc29ja2V0LAotICAgICAgICAgICAgICAgIHVpbnQz Ml90ICp2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSk7CisgICAgICAgICAgICAgICAgdWludDMyX3Qg KnZhbCwgZW51bSBwc3JfdHlwZSB0eXBlKTsKIGludCBwc3Jfc2V0X3ZhbChzdHJ1Y3QgZG9tYWlu ICpkLCB1bnNpZ25lZCBpbnQgc29ja2V0LAotICAgICAgICAgICAgICAgIHVpbnQ2NF90IHZhbCwg ZW51bSBjYm1fdHlwZSB0eXBlKTsKKyAgICAgICAgICAgICAgICB1aW50NjRfdCB2YWwsIGVudW0g cHNyX3R5cGUgdHlwZSk7CiAKIHZvaWQgcHNyX2RvbWFpbl9pbml0KHN0cnVjdCBkb21haW4gKmQp Owogdm9pZCBwc3JfZG9tYWluX2ZyZWUoc3RydWN0IGRvbWFpbiAqZCk7Ci0tIAoxLjkuMQoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3Jn L3hlbi1kZXZlbAo=