From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yi Sun Subject: [PATCH v1 03/13] x86: rename 'cbm_type' to 'psr_val_type' to make it general Date: Wed, 9 Aug 2017 15:41:42 +0800 Message-ID: <1502264512-4648-4-git-send-email-yi.y.sun@linux.intel.com> References: <1502264512-4648-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 1dfLsQ-0001eB-EP for xen-devel@lists.xenproject.org; Wed, 09 Aug 2017 07:58:02 +0000 In-Reply-To: <1502264512-4648-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+Ci0tLQogeGVuL2FyY2gveDg2L2RvbWN0bC5jICAgICB8IDE2ICsrKysrKy0tLS0tLS0K IHhlbi9hcmNoL3g4Ni9wc3IuYyAgICAgICAgfCA1OSArKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2FyY2gveDg2L3N5c2N0bC5jICAgICB8ICA0ICsr LS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvcHNyLmggfCAxOCArKysrKysrLS0tLS0tLS0KIDQgZmls ZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgNDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEveGVuL2FyY2gveDg2L2RvbWN0bC5jIGIveGVuL2FyY2gveDg2L2RvbWN0bC5jCmluZGV4IDI0 Yjk5OGIuLjg1MDc0MmEgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9kb21jdGwuYworKysgYi94 ZW4vYXJjaC94ODYvZG9tY3RsLmMKQEAgLTE0NDcsNTEgKzE0NDcsNTEgQEAgbG9uZyBhcmNoX2Rv X2RvbWN0bCgKICAgICAgICAgY2FzZSBYRU5fRE9NQ1RMX1BTUl9DQVRfT1BfU0VUX0wzX0NCTToK ICAgICAgICAgICAgIHJldCA9IHBzcl9zZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3Au dGFyZ2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxv Y19vcC5kYXRhLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX0NCTV9UWVBFX0wz KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9WQUxfVFlQRV9MMyk7CiAgICAg ICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFhFTl9ET01DVExfUFNSX0NBVF9PUF9TRVRf TDNfQ09ERToKICAgICAgICAgICAgIHJldCA9IHBzcl9zZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3Jf YWxsb2Nfb3AudGFyZ2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9tY3RsLT51 LnBzcl9hbGxvY19vcC5kYXRhLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX0NC TV9UWVBFX0wzX0NPREUpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNSX1ZBTF9U WVBFX0wzX0NPREUpOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBYRU5fRE9N Q1RMX1BTUl9DQVRfT1BfU0VUX0wzX0RBVEE6CiAgICAgICAgICAgICByZXQgPSBwc3Jfc2V0X3Zh bChkLCBkb21jdGwtPnUucHNyX2FsbG9jX29wLnRhcmdldCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AuZGF0YSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFBTUl9DQk1fVFlQRV9MM19EQVRBKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFBTUl9WQUxfVFlQRV9MM19EQVRBKTsKICAgICAgICAgICAgIGJyZWFrOwogCiAg ICAgICAgIGNhc2UgWEVOX0RPTUNUTF9QU1JfQ0FUX09QX1NFVF9MMl9DQk06CiAgICAgICAgICAg ICByZXQgPSBwc3Jfc2V0X3ZhbChkLCBkb21jdGwtPnUucHNyX2FsbG9jX29wLnRhcmdldCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AuZGF0YSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9DQk1fVFlQRV9MMik7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBQU1JfVkFMX1RZUEVfTDIpOwogICAgICAgICAgICAgYnJl YWs7CiAKICAgICAgICAgY2FzZSBYRU5fRE9NQ1RMX1BTUl9DQVRfT1BfR0VUX0wzX0NCTToKICAg ICAgICAgICAgIHJldCA9IHBzcl9nZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AudGFy Z2V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnZhbDMyLCBQU1JfQ0JNX1RZUEVf TDMpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnZhbDMyLCBQU1JfVkFMX1RZUEVf TDMpOwogICAgICAgICAgICAgZG9tY3RsLT51LnBzcl9hbGxvY19vcC5kYXRhID0gdmFsMzI7CiAg ICAgICAgICAgICBjb3B5YmFjayA9IHRydWU7CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAg ICBjYXNlIFhFTl9ET01DVExfUFNSX0NBVF9PUF9HRVRfTDNfQ09ERToKICAgICAgICAgICAgIHJl dCA9IHBzcl9nZXRfdmFsKGQsIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AudGFyZ2V0LAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJnZhbDMyLCBQU1JfQ0JNX1RZUEVfTDNfQ09ERSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmdmFsMzIsIFBTUl9WQUxfVFlQRV9MM19DT0RF KTsKICAgICAgICAgICAgIGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AuZGF0YSA9IHZhbDMyOwogICAg ICAgICAgICAgY29weWJhY2sgPSB0cnVlOwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAg Y2FzZSBYRU5fRE9NQ1RMX1BTUl9DQVRfT1BfR0VUX0wzX0RBVEE6CiAgICAgICAgICAgICByZXQg PSBwc3JfZ2V0X3ZhbChkLCBkb21jdGwtPnUucHNyX2FsbG9jX29wLnRhcmdldCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX0NCTV9UWVBFX0wzX0RBVEEpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJnZhbDMyLCBQU1JfVkFMX1RZUEVfTDNfREFUQSk7 CiAgICAgICAgICAgICBkb21jdGwtPnUucHNyX2FsbG9jX29wLmRhdGEgPSB2YWwzMjsKICAgICAg ICAgICAgIGNvcHliYWNrID0gdHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNh c2UgWEVOX0RPTUNUTF9QU1JfQ0FUX09QX0dFVF9MMl9DQk06CiAgICAgICAgICAgICByZXQgPSBw c3JfZ2V0X3ZhbChkLCBkb21jdGwtPnUucHNyX2FsbG9jX29wLnRhcmdldCwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX0NCTV9UWVBFX0wyKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICZ2YWwzMiwgUFNSX1ZBTF9UWVBFX0wyKTsKICAgICAgICAgICAg IGRvbWN0bC0+dS5wc3JfYWxsb2Nfb3AuZGF0YSA9IHZhbDMyOwogICAgICAgICAgICAgY29weWJh Y2sgPSB0cnVlOwogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYv cHNyLmMgYi94ZW4vYXJjaC94ODYvcHNyLmMKaW5kZXggNmJhMDcwZi4uNWVjMDBhOSAxMDA2NDQK LS0tIGEveGVuL2FyY2gveDg2L3Bzci5jCisrKyBiL3hlbi9hcmNoL3g4Ni9wc3IuYwpAQCAtMTAw LDI0ICsxMDAsMjQgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBmZWF0X3Byb3BzIHsKICAgICB1bnNp Z25lZCBpbnQgY29zX251bTsKIAogICAgIC8qCi0gICAgICogQW4gYXJyYXkgdG8gc2F2ZSBhbGwg J2VudW0gY2JtX3R5cGUnIHZhbHVlcyBvZiB0aGUgZmVhdHVyZS4gSXQgaXMKKyAgICAgKiBBbiBh cnJheSB0byBzYXZlIGFsbCAnZW51bSBwc3JfdmFsX3R5cGUnIHZhbHVlcyBvZiB0aGUgZmVhdHVy ZS4gSXQgaXMKICAgICAgKiB1c2VkIHdpdGggY29zX251bSB0b2dldGhlciB0byBnZXQvd3JpdGUg YSBmZWF0dXJlJ3MgQ09TIHJlZ2lzdGVycwogICAgICAqIHZhbHVlcyBvbmUgYnkgb25lLgogICAg ICAqLwotICAgIGVudW0gY2JtX3R5cGUgdHlwZVtNQVhfQ09TX05VTV07CisgICAgZW51bSBwc3Jf dmFsX3R5cGUgdHlwZVtNQVhfQ09TX05VTV07CiAKICAgICAvKgogICAgICAqIGFsdF90eXBlIGlz ICdhbHRlcm5hdGl2ZSB0eXBlJy4gV2hlbiB0aGlzICdhbHRfdHlwZScgaXMgaW5wdXQsIHRoZQog ICAgICAqIGZlYXR1cmUgZG9lcyBzb21lIHNwZWNpYWwgb3BlcmF0aW9ucy4KICAgICAgKi8KLSAg ICBlbnVtIGNibV90eXBlIGFsdF90eXBlOworICAgIGVudW0gcHNyX3ZhbF90eXBlIGFsdF90eXBl OwogCiAgICAgLyogZ2V0X2ZlYXRfaW5mbyBpcyB1c2VkIHRvIHJldHVybiBmZWF0dXJlIEhXIGlu Zm8gdGhyb3VnaCBzeXNjdGwuICovCiAgICAgYm9vbCAoKmdldF9mZWF0X2luZm8pKGNvbnN0IHN0 cnVjdCBmZWF0X25vZGUgKmZlYXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90 IGRhdGFbXSwgdW5zaWduZWQgaW50IGFycmF5X2xlbik7CiAKICAgICAvKiB3cml0ZV9tc3IgaXMg dXNlZCB0byB3cml0ZSBvdXQgZmVhdHVyZSBNU1IgcmVnaXN0ZXIuICovCi0gICAgdm9pZCAoKndy aXRlX21zcikodW5zaWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLCBlbnVtIGNibV90eXBlIHR5 cGUpOworICAgIHZvaWQgKCp3cml0ZV9tc3IpKHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZh bCwgZW51bSBwc3JfdmFsX3R5cGUgdHlwZSk7CiB9ICpmZWF0X3Byb3BzW0ZFQVRfVFlQRV9OVU1d OwogCiAvKgpAQCAtMjE2LDEzICsyMTYsMTMgQEAgc3RhdGljIHZvaWQgZnJlZV9zb2NrZXRfcmVz b3VyY2VzKHVuc2lnbmVkIGludCBzb2NrZXQpCiAgICAgYml0bWFwX3plcm8oaW5mby0+ZG9tX3Nl dCwgRE9NSURfSURMRSArIDEpOwogfQogCi1zdGF0aWMgZW51bSBwc3JfZmVhdF90eXBlIHBzcl9j Ym1fdHlwZV90b19mZWF0X3R5cGUoZW51bSBjYm1fdHlwZSB0eXBlKQorc3RhdGljIGVudW0gcHNy X2ZlYXRfdHlwZSBwc3JfdmFsX3R5cGVfdG9fZmVhdF90eXBlKGVudW0gcHNyX3ZhbF90eXBlIHR5 cGUpCiB7CiAgICAgZW51bSBwc3JfZmVhdF90eXBlIGZlYXRfdHlwZSA9IEZFQVRfVFlQRV9VTktO T1dOOwogCiAgICAgc3dpdGNoICggdHlwZSApCiAgICAgewotICAgIGNhc2UgUFNSX0NCTV9UWVBF X0wzOgorICAgIGNhc2UgUFNSX1ZBTF9UWVBFX0wzOgogICAgICAgICBmZWF0X3R5cGUgPSBGRUFU X1RZUEVfTDNfQ0FUOwogCiAgICAgICAgIC8qCkBAIC0yMzQsMTIgKzIzNCwxMiBAQCBzdGF0aWMg ZW51bSBwc3JfZmVhdF90eXBlIHBzcl9jYm1fdHlwZV90b19mZWF0X3R5cGUoZW51bSBjYm1fdHlw ZSB0eXBlKQogCiAgICAgICAgIGJyZWFrOwogCi0gICAgY2FzZSBQU1JfQ0JNX1RZUEVfTDNfREFU QToKLSAgICBjYXNlIFBTUl9DQk1fVFlQRV9MM19DT0RFOgorICAgIGNhc2UgUFNSX1ZBTF9UWVBF X0wzX0RBVEE6CisgICAgY2FzZSBQU1JfVkFMX1RZUEVfTDNfQ09ERToKICAgICAgICAgZmVhdF90 eXBlID0gRkVBVF9UWVBFX0wzX0NEUDsKICAgICAgICAgYnJlYWs7CiAKLSAgICBjYXNlIFBTUl9D Qk1fVFlQRV9MMjoKKyAgICBjYXNlIFBTUl9WQUxfVFlQRV9MMjoKICAgICAgICAgZmVhdF90eXBl ID0gRkVBVF9UWVBFX0wyX0NBVDsKICAgICAgICAgYnJlYWs7CiAKQEAgLTM2MywxNSArMzYzLDE2 IEBAIHN0YXRpYyBib29sIGNhdF9nZXRfZmVhdF9pbmZvKGNvbnN0IHN0cnVjdCBmZWF0X25vZGUg KmZlYXQsCiB9CiAKIC8qIEwzIENBVCBwcm9wcyAqLwotc3RhdGljIHZvaWQgbDNfY2F0X3dyaXRl X21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2YWwsIGVudW0gY2JtX3R5cGUgdHlwZSkK K3N0YXRpYyB2b2lkIGwzX2NhdF93cml0ZV9tc3IodW5zaWduZWQgaW50IGNvcywgdWludDMyX3Qg dmFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnVtIHBzcl92YWxfdHlwZSB0eXBl KQogewogICAgIHdybXNybChNU1JfSUEzMl9QU1JfTDNfTUFTSyhjb3MpLCB2YWwpOwogfQogCiBz dGF0aWMgY29uc3Qgc3RydWN0IGZlYXRfcHJvcHMgbDNfY2F0X3Byb3BzID0gewogICAgIC5jb3Nf bnVtID0gMSwKLSAgICAudHlwZVswXSA9IFBTUl9DQk1fVFlQRV9MMywKLSAgICAuYWx0X3R5cGUg PSBQU1JfQ0JNX1RZUEVfVU5LTk9XTiwKKyAgICAudHlwZVswXSA9IFBTUl9WQUxfVFlQRV9MMywK KyAgICAuYWx0X3R5cGUgPSBQU1JfVkFMX1RZUEVfVU5LTk9XTiwKICAgICAuZ2V0X2ZlYXRfaW5m byA9IGNhdF9nZXRfZmVhdF9pbmZvLAogICAgIC53cml0ZV9tc3IgPSBsM19jYXRfd3JpdGVfbXNy LAogfTsKQEAgLTM4OCw5ICszODksMTAgQEAgc3RhdGljIGJvb2wgbDNfY2RwX2dldF9mZWF0X2lu Zm8oY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdCwKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAot c3RhdGljIHZvaWQgbDNfY2RwX3dyaXRlX21zcih1bnNpZ25lZCBpbnQgY29zLCB1aW50MzJfdCB2 YWwsIGVudW0gY2JtX3R5cGUgdHlwZSkKK3N0YXRpYyB2b2lkIGwzX2NkcF93cml0ZV9tc3IodW5z aWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBlbnVtIHBzcl92YWxfdHlwZSB0eXBlKQogewotICAgIHdybXNybCgoKHR5cGUgPT0gUFNSX0NC TV9UWVBFX0wzX0RBVEEpID8KKyAgICB3cm1zcmwoKCh0eXBlID09IFBTUl9WQUxfVFlQRV9MM19E QVRBKSA/CiAgICAgICAgICAgICBNU1JfSUEzMl9QU1JfTDNfTUFTS19EQVRBKGNvcykgOgogICAg ICAgICAgICAgTVNSX0lBMzJfUFNSX0wzX01BU0tfQ09ERShjb3MpKSwKICAgICAgICAgICAgdmFs KTsKQEAgLTM5OCwyMyArNDAwLDI0IEBAIHN0YXRpYyB2b2lkIGwzX2NkcF93cml0ZV9tc3IodW5z aWduZWQgaW50IGNvcywgdWludDMyX3QgdmFsLCBlbnVtIGNibV90eXBlIHR5cGUpCiAKIHN0YXRp YyBjb25zdCBzdHJ1Y3QgZmVhdF9wcm9wcyBsM19jZHBfcHJvcHMgPSB7CiAgICAgLmNvc19udW0g PSAyLAotICAgIC50eXBlWzBdID0gUFNSX0NCTV9UWVBFX0wzX0RBVEEsCi0gICAgLnR5cGVbMV0g PSBQU1JfQ0JNX1RZUEVfTDNfQ09ERSwKLSAgICAuYWx0X3R5cGUgPSBQU1JfQ0JNX1RZUEVfTDMs CisgICAgLnR5cGVbMF0gPSBQU1JfVkFMX1RZUEVfTDNfREFUQSwKKyAgICAudHlwZVsxXSA9IFBT Ul9WQUxfVFlQRV9MM19DT0RFLAorICAgIC5hbHRfdHlwZSA9IFBTUl9WQUxfVFlQRV9MMywKICAg ICAuZ2V0X2ZlYXRfaW5mbyA9IGwzX2NkcF9nZXRfZmVhdF9pbmZvLAogICAgIC53cml0ZV9tc3Ig PSBsM19jZHBfd3JpdGVfbXNyLAogfTsKIAogLyogTDIgQ0FUIHByb3BzICovCi1zdGF0aWMgdm9p ZCBsMl9jYXRfd3JpdGVfbXNyKHVuc2lnbmVkIGludCBjb3MsIHVpbnQzMl90IHZhbCwgZW51bSBj Ym1fdHlwZSB0eXBlKQorc3RhdGljIHZvaWQgbDJfY2F0X3dyaXRlX21zcih1bnNpZ25lZCBpbnQg Y29zLCB1aW50MzJfdCB2YWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudW0gcHNy X3ZhbF90eXBlIHR5cGUpCiB7CiAgICAgd3Jtc3JsKE1TUl9JQTMyX1BTUl9MMl9NQVNLKGNvcyks IHZhbCk7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVhdF9wcm9wcyBsMl9jYXRfcHJvcHMg PSB7CiAgICAgLmNvc19udW0gPSAxLAotICAgIC50eXBlWzBdID0gUFNSX0NCTV9UWVBFX0wyLAot ICAgIC5hbHRfdHlwZSA9IFBTUl9DQk1fVFlQRV9VTktOT1dOLAorICAgIC50eXBlWzBdID0gUFNS X1ZBTF9UWVBFX0wyLAorICAgIC5hbHRfdHlwZSA9IFBTUl9WQUxfVFlQRV9VTktOT1dOLAogICAg IC5nZXRfZmVhdF9pbmZvID0gY2F0X2dldF9mZWF0X2luZm8sCiAgICAgLndyaXRlX21zciA9IGwy X2NhdF93cml0ZV9tc3IsCiB9OwpAQCAtNjU1LDcgKzY1OCw3IEBAIHN0YXRpYyBzdHJ1Y3QgcHNy X3NvY2tldF9pbmZvICpnZXRfc29ja2V0X2luZm8odW5zaWduZWQgaW50IHNvY2tldCkKICAgICBy ZXR1cm4gc29ja2V0X2luZm8gKyBzb2NrZXQ7CiB9CiAKLWludCBwc3JfZ2V0X2luZm8odW5zaWdu ZWQgaW50IHNvY2tldCwgZW51bSBjYm1fdHlwZSB0eXBlLAoraW50IHBzcl9nZXRfaW5mbyh1bnNp Z25lZCBpbnQgc29ja2V0LCBlbnVtIHBzcl92YWxfdHlwZSB0eXBlLAogICAgICAgICAgICAgICAg ICB1aW50MzJfdCBkYXRhW10sIHVuc2lnbmVkIGludCBhcnJheV9sZW4pCiB7CiAgICAgY29uc3Qg c3RydWN0IHBzcl9zb2NrZXRfaW5mbyAqaW5mbyA9IGdldF9zb2NrZXRfaW5mbyhzb2NrZXQpOwpA QCAtNjY3LDcgKzY3MCw3IEBAIGludCBwc3JfZ2V0X2luZm8odW5zaWduZWQgaW50IHNvY2tldCwg ZW51bSBjYm1fdHlwZSB0eXBlLAogICAgIGlmICggSVNfRVJSKGluZm8pICkKICAgICAgICAgcmV0 dXJuIFBUUl9FUlIoaW5mbyk7CiAKLSAgICBmZWF0X3R5cGUgPSBwc3JfY2JtX3R5cGVfdG9fZmVh dF90eXBlKHR5cGUpOworICAgIGZlYXRfdHlwZSA9IHBzcl92YWxfdHlwZV90b19mZWF0X3R5cGUo dHlwZSk7CiAgICAgaWYgKCBmZWF0X3R5cGUgPj0gQVJSQVlfU0laRShpbmZvLT5mZWF0dXJlcykg KQogICAgICAgICByZXR1cm4gLUVOT0VOVDsKIApAQCAtNjg4LDcgKzY5MSw3IEBAIGludCBwc3Jf Z2V0X2luZm8odW5zaWduZWQgaW50IHNvY2tldCwgZW51bSBjYm1fdHlwZSB0eXBlLAogfQogCiBp bnQgcHNyX2dldF92YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHNvY2tldCwKLSAg ICAgICAgICAgICAgICB1aW50MzJfdCAqdmFsLCBlbnVtIGNibV90eXBlIHR5cGUpCisgICAgICAg ICAgICAgICAgdWludDMyX3QgKnZhbCwgZW51bSBwc3JfdmFsX3R5cGUgdHlwZSkKIHsKICAgICBj b25zdCBzdHJ1Y3QgcHNyX3NvY2tldF9pbmZvICppbmZvID0gZ2V0X3NvY2tldF9pbmZvKHNvY2tl dCk7CiAgICAgY29uc3Qgc3RydWN0IGZlYXRfbm9kZSAqZmVhdDsKQEAgLTcwMCw3ICs3MDMsNyBA QCBpbnQgcHNyX2dldF92YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHNvY2tldCwK ICAgICBpZiAoIElTX0VSUihpbmZvKSApCiAgICAgICAgIHJldHVybiBQVFJfRVJSKGluZm8pOwog Ci0gICAgZmVhdF90eXBlID0gcHNyX2NibV90eXBlX3RvX2ZlYXRfdHlwZSh0eXBlKTsKKyAgICBm ZWF0X3R5cGUgPSBwc3JfdmFsX3R5cGVfdG9fZmVhdF90eXBlKHR5cGUpOwogICAgIGlmICggZmVh dF90eXBlID49IEFSUkFZX1NJWkUoaW5mby0+ZmVhdHVyZXMpICkKICAgICAgICAgcmV0dXJuIC1F Tk9FTlQ7CiAKQEAgLTgzMCw3ICs4MzMsNyBAQCBzdGF0aWMgaW50IGluc2VydF92YWxfaW50b19h cnJheSh1aW50MzJfdCB2YWxbXSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVu c2lnbmVkIGludCBhcnJheV9sZW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBzdHJ1Y3QgcHNyX3NvY2tldF9pbmZvICppbmZvLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZW51bSBwc3JfZmVhdF90eXBlIGZlYXRfdHlwZSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGVudW0gY2JtX3R5cGUgdHlwZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGVudW0gcHNyX3ZhbF90eXBlIHR5cGUsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1aW50MzJfdCBuZXdfdmFsKQogewogICAgIGNvbnN0IHN0cnVjdCBm ZWF0X25vZGUgKmZlYXQ7CkBAIC04NjYsNyArODY5LDcgQEAgc3RhdGljIGludCBpbnNlcnRfdmFs X2ludG9fYXJyYXkodWludDMyX3QgdmFsW10sCiAgICAgLyoKICAgICAgKiBWYWx1ZSBzZXR0aW5n IHBvc2l0aW9uIGlzIHNhbWUgYXMgZmVhdHVyZSBhcnJheS4KICAgICAgKiBGb3IgQ0RQLCB1c2Vy IG1heSBzZXQgYm90aCBEQVRBIGFuZCBDT0RFIHRvIHNhbWUgdmFsdWUuIEZvciBzdWNoIGNhc2Us Ci0gICAgICogdXNlciBpbnB1dCAnUFNSX0NCTV9UWVBFX0wzJyBhcyB0eXBlLiBUaGUgYWx0ZXJu YXRpdmUgdHlwZSBvZiBDRFAgaXMgc2FtZQorICAgICAqIHVzZXIgaW5wdXQgJ1BTUl9WQUxfVFlQ RV9MMycgYXMgdHlwZS4gVGhlIGFsdGVybmF0aXZlIHR5cGUgb2YgQ0RQIGlzIHNhbWUKICAgICAg KiBhcyBpdC4gU28gd2Ugc2hvdWxkIHNldCBuZXdfdmFsIHRvIGJvdGggb2YgREFUQSBhbmQgQ09E RSB1bmRlciBzdWNoIGNhc2UuCiAgICAgICovCiAgICAgZm9yICggaSA9IDA7IGkgPCBwcm9wcy0+ Y29zX251bTsgaSsrICkKQEAgLTExNTYsNyArMTE1OSw3IEBAIHN0YXRpYyBpbnQgd3JpdGVfcHNy X21zcnModW5zaWduZWQgaW50IHNvY2tldCwgdW5zaWduZWQgaW50IGNvcywKIH0KIAogaW50IHBz cl9zZXRfdmFsKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBzb2NrZXQsCi0gICAgICAg ICAgICAgICAgdWludDY0X3QgbmV3X3ZhbCwgZW51bSBjYm1fdHlwZSB0eXBlKQorICAgICAgICAg ICAgICAgIHVpbnQ2NF90IG5ld192YWwsIGVudW0gcHNyX3ZhbF90eXBlIHR5cGUpCiB7CiAgICAg dW5zaWduZWQgaW50IG9sZF9jb3MsIGFycmF5X2xlbjsKICAgICBpbnQgY29zLCByZXQ7CkBAIC0x MTcyLDcgKzExNzUsNyBAQCBpbnQgcHNyX3NldF92YWwoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWdu ZWQgaW50IHNvY2tldCwKICAgICBpZiAoIG5ld192YWwgIT0gdmFsICkKICAgICAgICAgcmV0dXJu IC1FSU5WQUw7CiAKLSAgICBmZWF0X3R5cGUgPSBwc3JfY2JtX3R5cGVfdG9fZmVhdF90eXBlKHR5 cGUpOworICAgIGZlYXRfdHlwZSA9IHBzcl92YWxfdHlwZV90b19mZWF0X3R5cGUodHlwZSk7CiAg ICAgaWYgKCBmZWF0X3R5cGUgPj0gQVJSQVlfU0laRShpbmZvLT5mZWF0dXJlcykgfHwKICAgICAg ICAgICFpbmZvLT5mZWF0dXJlc1tmZWF0X3R5cGVdICkKICAgICAgICAgcmV0dXJuIC1FTk9FTlQ7 CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvc3lzY3RsLmMgYi94ZW4vYXJjaC94ODYvc3lzY3Rs LmMKaW5kZXggMzA1MTg0My4uYjRmYzFkNSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L3N5c2N0 bC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9zeXNjdGwuYwpAQCAtMTc5LDcgKzE3OSw3IEBAIGxvbmcg YXJjaF9kb19zeXNjdGwoCiAgICAgICAgIGNhc2UgWEVOX1NZU0NUTF9QU1JfQ0FUX2dldF9sM19p bmZvOgogICAgICAgICB7CiAgICAgICAgICAgICByZXQgPSBwc3JfZ2V0X2luZm8oc3lzY3RsLT51 LnBzcl9hbGxvY19vcC50YXJnZXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFNS X0NCTV9UWVBFX0wzLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBQU1JfVkFMX1RZUEVfTDMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOwog ICAgICAgICAgICAgaWYgKCByZXQgKQogICAgICAgICAgICAgICAgIGJyZWFrOwogCkBAIC0xOTgs NyArMTk4LDcgQEAgbG9uZyBhcmNoX2RvX3N5c2N0bCgKICAgICAgICAgY2FzZSBYRU5fU1lTQ1RM X1BTUl9DQVRfZ2V0X2wyX2luZm86CiAgICAgICAgIHsKICAgICAgICAgICAgIHJldCA9IHBzcl9n ZXRfaW5mbyhzeXNjdGwtPnUucHNyX2FsbG9jX29wLnRhcmdldCwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBQU1JfQ0JNX1RZUEVfTDIsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBTUl9WQUxfVFlQRV9MMiwgZGF0YSwgQVJS QVlfU0laRShkYXRhKSk7CiAgICAgICAgICAgICBpZiAoIHJldCApCiAgICAgICAgICAgICAgICAg YnJlYWs7CiAKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcHNyLmggYi94ZW4vaW5j bHVkZS9hc20teDg2L3Bzci5oCmluZGV4IDE4YTQyZjMuLjFiNmYyMmYgMTAwNjQ0Ci0tLSBhL3hl bi9pbmNsdWRlL2FzbS14ODYvcHNyLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wc3IuaApA QCAtNTMsMTIgKzUzLDEyIEBAIHN0cnVjdCBwc3JfY210IHsKICAgICBzdHJ1Y3QgcHNyX2NtdF9s MyBsMzsKIH07CiAKLWVudW0gY2JtX3R5cGUgewotICAgIFBTUl9DQk1fVFlQRV9MMywKLSAgICBQ U1JfQ0JNX1RZUEVfTDNfQ09ERSwKLSAgICBQU1JfQ0JNX1RZUEVfTDNfREFUQSwKLSAgICBQU1Jf Q0JNX1RZUEVfTDIsCi0gICAgUFNSX0NCTV9UWVBFX1VOS05PV04sCitlbnVtIHBzcl92YWxfdHlw ZSB7CisgICAgUFNSX1ZBTF9UWVBFX0wzLAorICAgIFBTUl9WQUxfVFlQRV9MM19DT0RFLAorICAg IFBTUl9WQUxfVFlQRV9MM19EQVRBLAorICAgIFBTUl9WQUxfVFlQRV9MMiwKKyAgICBQU1JfVkFM X1RZUEVfVU5LTk9XTiwKIH07CiAKIGV4dGVybiBzdHJ1Y3QgcHNyX2NtdCAqcHNyX2NtdDsKQEAg LTcyLDEyICs3MiwxMiBAQCBpbnQgcHNyX2FsbG9jX3JtaWQoc3RydWN0IGRvbWFpbiAqZCk7CiB2 b2lkIHBzcl9mcmVlX3JtaWQoc3RydWN0IGRvbWFpbiAqZCk7CiB2b2lkIHBzcl9jdHh0X3N3aXRj aF90byhzdHJ1Y3QgZG9tYWluICpkKTsKIAotaW50IHBzcl9nZXRfaW5mbyh1bnNpZ25lZCBpbnQg c29ja2V0LCBlbnVtIGNibV90eXBlIHR5cGUsCitpbnQgcHNyX2dldF9pbmZvKHVuc2lnbmVkIGlu dCBzb2NrZXQsIGVudW0gcHNyX3ZhbF90eXBlIHR5cGUsCiAgICAgICAgICAgICAgICAgIHVpbnQz Ml90IGRhdGFbXSwgdW5zaWduZWQgaW50IGFycmF5X2xlbik7CiBpbnQgcHNyX2dldF92YWwoc3Ry dWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHNvY2tldCwKLSAgICAgICAgICAgICAgICB1aW50 MzJfdCAqdmFsLCBlbnVtIGNibV90eXBlIHR5cGUpOworICAgICAgICAgICAgICAgIHVpbnQzMl90 ICp2YWwsIGVudW0gcHNyX3ZhbF90eXBlIHR5cGUpOwogaW50IHBzcl9zZXRfdmFsKHN0cnVjdCBk b21haW4gKmQsIHVuc2lnbmVkIGludCBzb2NrZXQsCi0gICAgICAgICAgICAgICAgdWludDY0X3Qg dmFsLCBlbnVtIGNibV90eXBlIHR5cGUpOworICAgICAgICAgICAgICAgIHVpbnQ2NF90IHZhbCwg ZW51bSBwc3JfdmFsX3R5cGUgdHlwZSk7CiAKIHZvaWQgcHNyX2RvbWFpbl9pbml0KHN0cnVjdCBk b21haW4gKmQpOwogdm9pZCBwc3JfZG9tYWluX2ZyZWUoc3RydWN0IGRvbWFpbiAqZCk7Ci0tIAox LjkuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhl bi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0 cy54ZW4ub3JnL3hlbi1kZXZlbAo=