From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yi Sun Subject: [PATCH v2 03/15] x86: rename 'cbm_type' to 'psr_val_type' to make it general Date: Thu, 24 Aug 2017 09:14:37 +0800 Message-ID: <1503537289-56036-4-git-send-email-yi.y.sun@linux.intel.com> References: <1503537289-56036-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 1dkh0M-0000ia-95 for xen-devel@lists.xenproject.org; Thu, 24 Aug 2017 01:32:18 +0000 In-Reply-To: <1503537289-56036-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, roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCByZW5hbWVzICdjYm1fdHlwZScgdG8gJ3Bzcl92YWxfdHlwZScgdG8gbWFrZSBp dCBiZSBnZW5lcmFsLgpUaGVuLCB3ZSBjYW4gcmV1c2UgdGhpcyBmb3IgYWxsIHBzciBhbGxvY2F0 aW9uIGZlYXR1cmVzLgoKU2lnbmVkLW9mZi1ieTogWWkgU3VuIDx5aS55LnN1bkBsaW51eC5pbnRl bC5jb20+ClJldmlld2VkLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KdjI6 CiAgICAtIHJlcGxhY2UgJ1BTUl9WQUxfVFlQRV97TDMsIEwyfScgdG8gJ1BTUl9WQUxfVFlQRV97 TDMsIEwyfV9DQk0nLgogICAgICAoc3VnZ2VzdGVkIGJ5IENoYW8gUGVuZykKLS0tCiB4ZW4vYXJj aC94ODYvZG9tY3RsLmMgICAgIHwgMTYgKysrKysrLS0tLS0tCiB4ZW4vYXJjaC94ODYvcHNyLmMg ICAgICAgIHwgNjIgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIHhlbi9hcmNoL3g4Ni9zeXNjdGwuYyAgICAgfCAgNCArLS0KIHhlbi9pbmNsdWRlL2FzbS14 ODYvcHNyLmggfCAxOCArKysrKysrLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA1MiBpbnNlcnRp b25zKCspLCA0OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvZG9tY3Rs LmMgYi94ZW4vYXJjaC94ODYvZG9tY3RsLmMKaW5kZXggMjRiOTk4Yi4uZTFjN2M3MCAxMDA2NDQK LS0tIGEveGVuL2FyY2gveDg2L2RvbWN0bC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9kb21jdGwuYwpA QCAtMTQ0Nyw1MSArMTQ0Nyw1MSBAQCBsb25nIGFyY2hfZG9fZG9tY3RsKAogICAgICAgICBjYXNl IFhFTl9ET01DVExfUFNSX0NBVF9PUF9TRVRfTDNfQ0JNOgogICAgICAgICAgICAgcmV0ID0gcHNy X3NldF92YWwoZCwgZG9tY3RsLT51LnBzcl9hbGxvY19vcC50YXJnZXQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkb21jdGwtPnUucHNyX2FsbG9jX29wLmRhdGEsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBQU1JfQ0JNX1RZUEVfTDMpOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgUFNSX1ZBTF9UWVBFX0wzX0NCTSk7CiAgICAgICAgICAgICBicmVhazsKIAog ICAgICAgICBjYXNlIFhFTl9ET01DVExfUFNSX0NBVF9PUF9TRVRfTDNfQ09ERToKICAgICAgICAg ICAgIHJldCA9IHBzcl9zZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AudGFyZ2V0LAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxvY19vcC5kYXRh LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wzX0NPREUpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX1ZBTF9UWVBFX0wzX0NPREUpOwogICAg ICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBYRU5fRE9NQ1RMX1BTUl9DQVRfT1BfU0VU X0wzX0RBVEE6CiAgICAgICAgICAgICByZXQgPSBwc3Jfc2V0X3ZhbChkLCBkb21jdGwtPnUucHNy X2FsbG9jX29wLnRhcmdldCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvbWN0bC0+ dS5wc3JfYWxsb2Nfb3AuZGF0YSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9D Qk1fVFlQRV9MM19EQVRBKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9WQUxf VFlQRV9MM19EQVRBKTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgWEVOX0RP TUNUTF9QU1JfQ0FUX09QX1NFVF9MMl9DQk06CiAgICAgICAgICAgICByZXQgPSBwc3Jfc2V0X3Zh bChkLCBkb21jdGwtPnUucHNyX2FsbG9jX29wLnRhcmdldCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AuZGF0YSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFBTUl9DQk1fVFlQRV9MMik7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBQU1JfVkFMX1RZUEVfTDJfQ0JNKTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAg IGNhc2UgWEVOX0RPTUNUTF9QU1JfQ0FUX09QX0dFVF9MM19DQk06CiAgICAgICAgICAgICByZXQg PSBwc3JfZ2V0X3ZhbChkLCBkb21jdGwtPnUucHNyX2FsbG9jX29wLnRhcmdldCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX0NCTV9UWVBFX0wzKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX1ZBTF9UWVBFX0wzX0NCTSk7CiAgICAg ICAgICAgICBkb21jdGwtPnUucHNyX2FsbG9jX29wLmRhdGEgPSB2YWwzMjsKICAgICAgICAgICAg IGNvcHliYWNrID0gdHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgWEVO X0RPTUNUTF9QU1JfQ0FUX09QX0dFVF9MM19DT0RFOgogICAgICAgICAgICAgcmV0ID0gcHNyX2dl dF92YWwoZCwgZG9tY3RsLT51LnBzcl9hbGxvY19vcC50YXJnZXQsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAmdmFsMzIsIFBTUl9DQk1fVFlQRV9MM19DT0RFKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX1ZBTF9UWVBFX0wzX0NPREUpOwogICAgICAg ICAgICAgZG9tY3RsLT51LnBzcl9hbGxvY19vcC5kYXRhID0gdmFsMzI7CiAgICAgICAgICAgICBj b3B5YmFjayA9IHRydWU7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFhFTl9E T01DVExfUFNSX0NBVF9PUF9HRVRfTDNfREFUQToKICAgICAgICAgICAgIHJldCA9IHBzcl9nZXRf dmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AudGFyZ2V0LAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJnZhbDMyLCBQU1JfQ0JNX1RZUEVfTDNfREFUQSk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAmdmFsMzIsIFBTUl9WQUxfVFlQRV9MM19EQVRBKTsKICAgICAgICAg ICAgIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AuZGF0YSA9IHZhbDMyOwogICAgICAgICAgICAgY29w eWJhY2sgPSB0cnVlOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBYRU5fRE9N Q1RMX1BTUl9DQVRfT1BfR0VUX0wyX0NCTToKICAgICAgICAgICAgIHJldCA9IHBzcl9nZXRfdmFs KGQsIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AudGFyZ2V0LAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJnZhbDMyLCBQU1JfQ0JNX1RZUEVfTDIpOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJnZhbDMyLCBQU1JfVkFMX1RZUEVfTDJfQ0JNKTsKICAgICAgICAgICAgIGRvbWN0 bC0+dS5wc3JfYWxsb2Nfb3AuZGF0YSA9IHZhbDMyOwogICAgICAgICAgICAgY29weWJhY2sgPSB0 cnVlOwogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvcHNyLmMg Yi94ZW4vYXJjaC94ODYvcHNyLmMKaW5kZXggMzYyMmRlMC4uZGE2MmY4MSAxMDA2NDQKLS0tIGEv eGVuL2FyY2gveDg2L3Bzci5jCisrKyBiL3hlbi9hcmNoL3g4Ni9wc3IuYwpAQCAtMTAwLDI0ICsx MDAsMjQgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBmZWF0X3Byb3BzIHsKICAgICB1bnNpZ25lZCBp bnQgY29zX251bTsKIAogICAgIC8qCi0gICAgICogQW4gYXJyYXkgdG8gc2F2ZSBhbGwgJ2VudW0g Y2JtX3R5cGUnIHZhbHVlcyBvZiB0aGUgZmVhdHVyZS4gSXQgaXMKKyAgICAgKiBBbiBhcnJheSB0 byBzYXZlIGFsbCAnZW51bSBwc3JfdmFsX3R5cGUnIHZhbHVlcyBvZiB0aGUgZmVhdHVyZS4gSXQg aXMKICAgICAgKiB1c2VkIHdpdGggY29zX251bSB0b2dldGhlciB0byBnZXQvd3JpdGUgYSBmZWF0 dXJlJ3MgQ09TIHJlZ2lzdGVycwogICAgICAqIHZhbHVlcyBvbmUgYnkgb25lLgogICAgICAqLwot ICAgIGVudW0gY2JtX3R5cGUgdHlwZVtNQVhfQ09TX05VTV07CisgICAgZW51bSBwc3JfdmFsX3R5 cGUgdHlwZVtNQVhfQ09TX05VTV07CiAKICAgICAvKgogICAgICAqIGFsdF90eXBlIGlzICdhbHRl cm5hdGl2ZSB0eXBlJy4gV2hlbiB0aGlzICdhbHRfdHlwZScgaXMgaW5wdXQsIHRoZQogICAgICAq IGZlYXR1cmUgZG9lcyBzb21lIHNwZWNpYWwgb3BlcmF0aW9ucy4KICAgICAgKi8KLSAgICBlbnVt IGNibV90eXBlIGFsdF90eXBlOworICAgIGVudW0gcHNyX3ZhbF90eXBlIGFsdF90eXBlOwogCiAg ICAgLyogZ2V0X2ZlYXRfaW5mbyBpcyB1c2VkIHRvIHJldHVybiBmZWF0dXJlIEhXIGluZm8gdGhy b3VnaCBzeXNjdGwuICovCiAgICAgYm9vbCAoKmdldF9mZWF0X2luZm8pKGNvbnN0IHN0cnVjdCBm ZWF0X25vZGUgKmZlYXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGRhdGFb XSwgdW5zaWduZWQgaW50IGFycmF5X2xlbik7CiAKICAgICAvKiB3cml0ZV9tc3IgaXMgdXNlZCB0 byB3cml0ZSBvdXQgZmVhdHVyZSBNU1IgcmVnaXN0ZXIuICovCi0gICAgdm9pZCAoKndyaXRlX21z cikodW5zaWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLCBlbnVtIGNibV90eXBlIHR5cGUpOwor ICAgIHZvaWQgKCp3cml0ZV9tc3IpKHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwgZW51 bSBwc3JfdmFsX3R5cGUgdHlwZSk7CiB9ICpmZWF0X3Byb3BzW0ZFQVRfVFlQRV9OVU1dOwogCiAv KgpAQCAtMjE2LDEzICsyMTYsMTMgQEAgc3RhdGljIHZvaWQgZnJlZV9zb2NrZXRfcmVzb3VyY2Vz KHVuc2lnbmVkIGludCBzb2NrZXQpCiAgICAgYml0bWFwX3plcm8oaW5mby0+ZG9tX3NldCwgRE9N SURfSURMRSArIDEpOwogfQogCi1zdGF0aWMgZW51bSBwc3JfZmVhdF90eXBlIHBzcl9jYm1fdHlw ZV90b19mZWF0X3R5cGUoZW51bSBjYm1fdHlwZSB0eXBlKQorc3RhdGljIGVudW0gcHNyX2ZlYXRf dHlwZSBwc3JfdmFsX3R5cGVfdG9fZmVhdF90eXBlKGVudW0gcHNyX3ZhbF90eXBlIHR5cGUpCiB7 CiAgICAgZW51bSBwc3JfZmVhdF90eXBlIGZlYXRfdHlwZSA9IEZFQVRfVFlQRV9VTktOT1dOOwog CiAgICAgc3dpdGNoICggdHlwZSApCiAgICAgewotICAgIGNhc2UgUFNSX0NCTV9UWVBFX0wzOgor ICAgIGNhc2UgUFNSX1ZBTF9UWVBFX0wzX0NCTToKICAgICAgICAgZmVhdF90eXBlID0gRkVBVF9U WVBFX0wzX0NBVDsKIAogICAgICAgICAvKgpAQCAtMjM0LDEyICsyMzQsMTIgQEAgc3RhdGljIGVu dW0gcHNyX2ZlYXRfdHlwZSBwc3JfY2JtX3R5cGVfdG9fZmVhdF90eXBlKGVudW0gY2JtX3R5cGUg dHlwZSkKIAogICAgICAgICBicmVhazsKIAotICAgIGNhc2UgUFNSX0NCTV9UWVBFX0wzX0RBVEE6 Ci0gICAgY2FzZSBQU1JfQ0JNX1RZUEVfTDNfQ09ERToKKyAgICBjYXNlIFBTUl9WQUxfVFlQRV9M M19EQVRBOgorICAgIGNhc2UgUFNSX1ZBTF9UWVBFX0wzX0NPREU6CiAgICAgICAgIGZlYXRfdHlw ZSA9IEZFQVRfVFlQRV9MM19DRFA7CiAgICAgICAgIGJyZWFrOwogCi0gICAgY2FzZSBQU1JfQ0JN X1RZUEVfTDI6CisgICAgY2FzZSBQU1JfVkFMX1RZUEVfTDJfQ0JNOgogICAgICAgICBmZWF0X3R5 cGUgPSBGRUFUX1RZUEVfTDJfQ0FUOwogICAgICAgICBicmVhazsKIApAQCAtMzYzLDE1ICszNjMs MTYgQEAgc3RhdGljIGJvb2wgY2F0X2dldF9mZWF0X2luZm8oY29uc3Qgc3RydWN0IGZlYXRfbm9k ZSAqZmVhdCwKIH0KIAogLyogTDMgQ0FUIHByb3BzICovCi1zdGF0aWMgdm9pZCBsM19jYXRfd3Jp dGVfbXNyKHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwgZW51bSBjYm1fdHlwZSB0eXBl KQorc3RhdGljIHZvaWQgbDNfY2F0X3dyaXRlX21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJf dCB2YWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudW0gcHNyX3ZhbF90eXBlIHR5 cGUpCiB7CiAgICAgd3Jtc3JsKE1TUl9JQTMyX1BTUl9MM19NQVNLKGNvcyksIHZhbCk7CiB9CiAK IHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVhdF9wcm9wcyBsM19jYXRfcHJvcHMgPSB7CiAgICAgLmNv c19udW0gPSAxLAotICAgIC50eXBlWzBdID0gUFNSX0NCTV9UWVBFX0wzLAotICAgIC5hbHRfdHlw ZSA9IFBTUl9DQk1fVFlQRV9VTktOT1dOLAorICAgIC50eXBlWzBdID0gUFNSX1ZBTF9UWVBFX0wz X0NCTSwKKyAgICAuYWx0X3R5cGUgPSBQU1JfVkFMX1RZUEVfVU5LTk9XTiwKICAgICAuZ2V0X2Zl YXRfaW5mbyA9IGNhdF9nZXRfZmVhdF9pbmZvLAogICAgIC53cml0ZV9tc3IgPSBsM19jYXRfd3Jp dGVfbXNyLAogfTsKQEAgLTM4OCw5ICszODksMTAgQEAgc3RhdGljIGJvb2wgbDNfY2RwX2dldF9m ZWF0X2luZm8oY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdCwKICAgICByZXR1cm4gdHJ1ZTsK IH0KIAotc3RhdGljIHZvaWQgbDNfY2RwX3dyaXRlX21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50 MzJfdCB2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSkKK3N0YXRpYyB2b2lkIGwzX2NkcF93cml0ZV9t c3IodW5zaWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBlbnVtIHBzcl92YWxfdHlwZSB0eXBlKQogewotICAgIHdybXNybCgoKHR5cGUgPT0g UFNSX0NCTV9UWVBFX0wzX0RBVEEpID8KKyAgICB3cm1zcmwoKCh0eXBlID09IFBTUl9WQUxfVFlQ RV9MM19EQVRBKSA/CiAgICAgICAgICAgICBNU1JfSUEzMl9QU1JfTDNfTUFTS19EQVRBKGNvcykg OgogICAgICAgICAgICAgTVNSX0lBMzJfUFNSX0wzX01BU0tfQ09ERShjb3MpKSwKICAgICAgICAg ICAgdmFsKTsKQEAgLTM5OCwyMyArNDAwLDI0IEBAIHN0YXRpYyB2b2lkIGwzX2NkcF93cml0ZV9t c3IodW5zaWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLCBlbnVtIGNibV90eXBlIHR5cGUpCiAK IHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVhdF9wcm9wcyBsM19jZHBfcHJvcHMgPSB7CiAgICAgLmNv c19udW0gPSAyLAotICAgIC50eXBlWzBdID0gUFNSX0NCTV9UWVBFX0wzX0RBVEEsCi0gICAgLnR5 cGVbMV0gPSBQU1JfQ0JNX1RZUEVfTDNfQ09ERSwKLSAgICAuYWx0X3R5cGUgPSBQU1JfQ0JNX1RZ UEVfTDMsCisgICAgLnR5cGVbMF0gPSBQU1JfVkFMX1RZUEVfTDNfREFUQSwKKyAgICAudHlwZVsx XSA9IFBTUl9WQUxfVFlQRV9MM19DT0RFLAorICAgIC5hbHRfdHlwZSA9IFBTUl9WQUxfVFlQRV9M M19DQk0sCiAgICAgLmdldF9mZWF0X2luZm8gPSBsM19jZHBfZ2V0X2ZlYXRfaW5mbywKICAgICAu d3JpdGVfbXNyID0gbDNfY2RwX3dyaXRlX21zciwKIH07CiAKIC8qIEwyIENBVCBwcm9wcyAqLwot c3RhdGljIHZvaWQgbDJfY2F0X3dyaXRlX21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2 YWwsIGVudW0gY2JtX3R5cGUgdHlwZSkKK3N0YXRpYyB2b2lkIGwyX2NhdF93cml0ZV9tc3IodW5z aWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBlbnVtIHBzcl92YWxfdHlwZSB0eXBlKQogewogICAgIHdybXNybChNU1JfSUEzMl9QU1JfTDJf TUFTSyhjb3MpLCB2YWwpOwogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGZlYXRfcHJvcHMgbDJf Y2F0X3Byb3BzID0gewogICAgIC5jb3NfbnVtID0gMSwKLSAgICAudHlwZVswXSA9IFBTUl9DQk1f VFlQRV9MMiwKLSAgICAuYWx0X3R5cGUgPSBQU1JfQ0JNX1RZUEVfVU5LTk9XTiwKKyAgICAudHlw ZVswXSA9IFBTUl9WQUxfVFlQRV9MMl9DQk0sCisgICAgLmFsdF90eXBlID0gUFNSX1ZBTF9UWVBF X1VOS05PV04sCiAgICAgLmdldF9mZWF0X2luZm8gPSBjYXRfZ2V0X2ZlYXRfaW5mbywKICAgICAu d3JpdGVfbXNyID0gbDJfY2F0X3dyaXRlX21zciwKIH07CkBAIC02NTUsNyArNjU4LDcgQEAgc3Rh dGljIHN0cnVjdCBwc3Jfc29ja2V0X2luZm8gKmdldF9zb2NrZXRfaW5mbyh1bnNpZ25lZCBpbnQg c29ja2V0KQogICAgIHJldHVybiBzb2NrZXRfaW5mbyArIHNvY2tldDsKIH0KIAotaW50IHBzcl9n ZXRfaW5mbyh1bnNpZ25lZCBpbnQgc29ja2V0LCBlbnVtIGNibV90eXBlIHR5cGUsCitpbnQgcHNy X2dldF9pbmZvKHVuc2lnbmVkIGludCBzb2NrZXQsIGVudW0gcHNyX3ZhbF90eXBlIHR5cGUsCiAg ICAgICAgICAgICAgICAgIHVpbnQzMl90IGRhdGFbXSwgdW5zaWduZWQgaW50IGFycmF5X2xlbikK IHsKICAgICBjb25zdCBzdHJ1Y3QgcHNyX3NvY2tldF9pbmZvICppbmZvID0gZ2V0X3NvY2tldF9p bmZvKHNvY2tldCk7CkBAIC02NjcsNyArNjcwLDcgQEAgaW50IHBzcl9nZXRfaW5mbyh1bnNpZ25l ZCBpbnQgc29ja2V0LCBlbnVtIGNibV90eXBlIHR5cGUsCiAgICAgaWYgKCBJU19FUlIoaW5mbykg KQogICAgICAgICByZXR1cm4gUFRSX0VSUihpbmZvKTsKIAotICAgIGZlYXRfdHlwZSA9IHBzcl9j Ym1fdHlwZV90b19mZWF0X3R5cGUodHlwZSk7CisgICAgZmVhdF90eXBlID0gcHNyX3ZhbF90eXBl X3RvX2ZlYXRfdHlwZSh0eXBlKTsKICAgICBpZiAoIGZlYXRfdHlwZSA+PSBBUlJBWV9TSVpFKGlu Zm8tPmZlYXR1cmVzKSApCiAgICAgICAgIHJldHVybiAtRU5PRU5UOwogCkBAIC02ODgsNyArNjkx LDcgQEAgaW50IHBzcl9nZXRfaW5mbyh1bnNpZ25lZCBpbnQgc29ja2V0LCBlbnVtIGNibV90eXBl IHR5cGUsCiB9CiAKIGludCBwc3JfZ2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBp bnQgc29ja2V0LAotICAgICAgICAgICAgICAgIHVpbnQzMl90ICp2YWwsIGVudW0gY2JtX3R5cGUg dHlwZSkKKyAgICAgICAgICAgICAgICB1aW50MzJfdCAqdmFsLCBlbnVtIHBzcl92YWxfdHlwZSB0 eXBlKQogewogICAgIGNvbnN0IHN0cnVjdCBwc3Jfc29ja2V0X2luZm8gKmluZm8gPSBnZXRfc29j a2V0X2luZm8oc29ja2V0KTsKICAgICBjb25zdCBzdHJ1Y3QgZmVhdF9ub2RlICpmZWF0OwpAQCAt NzAwLDcgKzcwMyw3IEBAIGludCBwc3JfZ2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25l ZCBpbnQgc29ja2V0LAogICAgIGlmICggSVNfRVJSKGluZm8pICkKICAgICAgICAgcmV0dXJuIFBU Ul9FUlIoaW5mbyk7CiAKLSAgICBmZWF0X3R5cGUgPSBwc3JfY2JtX3R5cGVfdG9fZmVhdF90eXBl KHR5cGUpOworICAgIGZlYXRfdHlwZSA9IHBzcl92YWxfdHlwZV90b19mZWF0X3R5cGUodHlwZSk7 CiAgICAgaWYgKCBmZWF0X3R5cGUgPj0gQVJSQVlfU0laRShpbmZvLT5mZWF0dXJlcykgKQogICAg ICAgICByZXR1cm4gLUVOT0VOVDsKIApAQCAtODMwLDcgKzgzMyw3IEBAIHN0YXRpYyBpbnQgaW5z ZXJ0X3ZhbF9pbnRvX2FycmF5KHVpbnQzMl90IHZhbFtdLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdW5zaWduZWQgaW50IGFycmF5X2xlbiwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBwc3Jfc29ja2V0X2luZm8gKmluZm8sCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBlbnVtIHBzcl9mZWF0X3R5cGUgZmVhdF90eXBlLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW51bSBjYm1fdHlwZSB0eXBlLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW51bSBwc3JfdmFsX3R5cGUgdHlwZSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IG5ld192YWwpCiB7CiAgICAg Y29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdDsKQEAgLTg2Niw4ICs4NjksOSBAQCBzdGF0aWMg aW50IGluc2VydF92YWxfaW50b19hcnJheSh1aW50MzJfdCB2YWxbXSwKICAgICAvKgogICAgICAq IFZhbHVlIHNldHRpbmcgcG9zaXRpb24gaXMgc2FtZSBhcyBmZWF0dXJlIGFycmF5LgogICAgICAq IEZvciBDRFAsIHVzZXIgbWF5IHNldCBib3RoIERBVEEgYW5kIENPREUgdG8gc2FtZSB2YWx1ZS4g Rm9yIHN1Y2ggY2FzZSwKLSAgICAgKiB1c2VyIGlucHV0ICdQU1JfQ0JNX1RZUEVfTDMnIGFzIHR5 cGUuIFRoZSBhbHRlcm5hdGl2ZSB0eXBlIG9mIENEUCBpcyBzYW1lCi0gICAgICogYXMgaXQuIFNv IHdlIHNob3VsZCBzZXQgbmV3X3ZhbCB0byBib3RoIG9mIERBVEEgYW5kIENPREUgdW5kZXIgc3Vj aCBjYXNlLgorICAgICAqIHVzZXIgaW5wdXQgJ1BTUl9WQUxfVFlQRV9MM19DQk0nIGFzIHR5cGUu IFRoZSBhbHRlcm5hdGl2ZSB0eXBlIG9mIENEUCBpcworICAgICAqIHNhbWUgYXMgaXQuIFNvIHdl IHNob3VsZCBzZXQgbmV3X3ZhbCB0byBib3RoIG9mIERBVEEgYW5kIENPREUgdW5kZXIgc3VjaAor ICAgICAqIGNhc2UuCiAgICAgICovCiAgICAgZm9yICggaSA9IDA7IGkgPCBwcm9wcy0+Y29zX251 bTsgaSsrICkKICAgICB7CkBAIC0xMTU2LDcgKzExNjAsNyBAQCBzdGF0aWMgaW50IHdyaXRlX3Bz cl9tc3JzKHVuc2lnbmVkIGludCBzb2NrZXQsIHVuc2lnbmVkIGludCBjb3MsCiB9CiAKIGludCBw c3Jfc2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgc29ja2V0LAotICAgICAg ICAgICAgICAgIHVpbnQ2NF90IG5ld192YWwsIGVudW0gY2JtX3R5cGUgdHlwZSkKKyAgICAgICAg ICAgICAgICB1aW50NjRfdCBuZXdfdmFsLCBlbnVtIHBzcl92YWxfdHlwZSB0eXBlKQogewogICAg IHVuc2lnbmVkIGludCBvbGRfY29zLCBhcnJheV9sZW47CiAgICAgaW50IGNvcywgcmV0OwpAQCAt MTE3Miw3ICsxMTc2LDcgQEAgaW50IHBzcl9zZXRfdmFsKHN0cnVjdCBkb21haW4gKmQsIHVuc2ln bmVkIGludCBzb2NrZXQsCiAgICAgaWYgKCBuZXdfdmFsICE9IHZhbCApCiAgICAgICAgIHJldHVy biAtRUlOVkFMOwogCi0gICAgZmVhdF90eXBlID0gcHNyX2NibV90eXBlX3RvX2ZlYXRfdHlwZSh0 eXBlKTsKKyAgICBmZWF0X3R5cGUgPSBwc3JfdmFsX3R5cGVfdG9fZmVhdF90eXBlKHR5cGUpOwog ICAgIGlmICggZmVhdF90eXBlID49IEFSUkFZX1NJWkUoaW5mby0+ZmVhdHVyZXMpIHx8CiAgICAg ICAgICAhaW5mby0+ZmVhdHVyZXNbZmVhdF90eXBlXSApCiAgICAgICAgIHJldHVybiAtRU5PRU5U OwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L3N5c2N0bC5jIGIveGVuL2FyY2gveDg2L3N5c2N0 bC5jCmluZGV4IGU3ZTM5MGUuLmRmNTRkMzggMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9zeXNj dGwuYworKysgYi94ZW4vYXJjaC94ODYvc3lzY3RsLmMKQEAgLTE3OSw3ICsxNzksNyBAQCBsb25n IGFyY2hfZG9fc3lzY3RsKAogICAgICAgICBjYXNlIFhFTl9TWVNDVExfUFNSX0NBVF9nZXRfbDNf aW5mbzoKICAgICAgICAgewogICAgICAgICAgICAgcmV0ID0gcHNyX2dldF9pbmZvKHN5c2N0bC0+ dS5wc3JfYWxsb2Nfb3AudGFyZ2V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBT Ul9DQk1fVFlQRV9MMywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUFNSX1ZBTF9UWVBFX0wzX0NCTSwgZGF0YSwgQVJSQVlfU0laRShkYXRh KSk7CiAgICAgICAgICAgICBpZiAoIHJldCApCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAKQEAg LTE5OCw3ICsxOTgsNyBAQCBsb25nIGFyY2hfZG9fc3lzY3RsKAogICAgICAgICBjYXNlIFhFTl9T WVNDVExfUFNSX0NBVF9nZXRfbDJfaW5mbzoKICAgICAgICAgewogICAgICAgICAgICAgcmV0ID0g cHNyX2dldF9pbmZvKHN5c2N0bC0+dS5wc3JfYWxsb2Nfb3AudGFyZ2V0LAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFBTUl9DQk1fVFlQRV9MMiwgZGF0YSwgQVJSQVlfU0laRShkYXRh KSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX1ZBTF9UWVBFX0wyX0NCTSwg ZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiAgICAgICAgICAgICBpZiAoIHJldCApCiAgICAgICAg ICAgICAgICAgYnJlYWs7CiAKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcHNyLmgg Yi94ZW4vaW5jbHVkZS9hc20teDg2L3Bzci5oCmluZGV4IDE4YTQyZjMuLmZiNGEyMGEgMTAwNjQ0 Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcHNyLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4 Ni9wc3IuaApAQCAtNTMsMTIgKzUzLDEyIEBAIHN0cnVjdCBwc3JfY210IHsKICAgICBzdHJ1Y3Qg cHNyX2NtdF9sMyBsMzsKIH07CiAKLWVudW0gY2JtX3R5cGUgewotICAgIFBTUl9DQk1fVFlQRV9M MywKLSAgICBQU1JfQ0JNX1RZUEVfTDNfQ09ERSwKLSAgICBQU1JfQ0JNX1RZUEVfTDNfREFUQSwK LSAgICBQU1JfQ0JNX1RZUEVfTDIsCi0gICAgUFNSX0NCTV9UWVBFX1VOS05PV04sCitlbnVtIHBz cl92YWxfdHlwZSB7CisgICAgUFNSX1ZBTF9UWVBFX0wzX0NCTSwKKyAgICBQU1JfVkFMX1RZUEVf TDNfQ09ERSwKKyAgICBQU1JfVkFMX1RZUEVfTDNfREFUQSwKKyAgICBQU1JfVkFMX1RZUEVfTDJf Q0JNLAorICAgIFBTUl9WQUxfVFlQRV9VTktOT1dOLAogfTsKIAogZXh0ZXJuIHN0cnVjdCBwc3Jf Y210ICpwc3JfY210OwpAQCAtNzIsMTIgKzcyLDEyIEBAIGludCBwc3JfYWxsb2Nfcm1pZChzdHJ1 Y3QgZG9tYWluICpkKTsKIHZvaWQgcHNyX2ZyZWVfcm1pZChzdHJ1Y3QgZG9tYWluICpkKTsKIHZv aWQgcHNyX2N0eHRfc3dpdGNoX3RvKHN0cnVjdCBkb21haW4gKmQpOwogCi1pbnQgcHNyX2dldF9p bmZvKHVuc2lnbmVkIGludCBzb2NrZXQsIGVudW0gY2JtX3R5cGUgdHlwZSwKK2ludCBwc3JfZ2V0 X2luZm8odW5zaWduZWQgaW50IHNvY2tldCwgZW51bSBwc3JfdmFsX3R5cGUgdHlwZSwKICAgICAg ICAgICAgICAgICAgdWludDMyX3QgZGF0YVtdLCB1bnNpZ25lZCBpbnQgYXJyYXlfbGVuKTsKIGlu dCBwc3JfZ2V0X3ZhbChzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgc29ja2V0LAotICAg ICAgICAgICAgICAgIHVpbnQzMl90ICp2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSk7CisgICAgICAg ICAgICAgICAgdWludDMyX3QgKnZhbCwgZW51bSBwc3JfdmFsX3R5cGUgdHlwZSk7CiBpbnQgcHNy X3NldF92YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHNvY2tldCwKLSAgICAgICAg ICAgICAgICB1aW50NjRfdCB2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSk7CisgICAgICAgICAgICAg ICAgdWludDY0X3QgdmFsLCBlbnVtIHBzcl92YWxfdHlwZSB0eXBlKTsKIAogdm9pZCBwc3JfZG9t YWluX2luaXQoc3RydWN0IGRvbWFpbiAqZCk7CiB2b2lkIHBzcl9kb21haW5fZnJlZShzdHJ1Y3Qg ZG9tYWluICpkKTsKLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVu Lm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==