From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH v3 21/28] drm/i915: Remove the now redundant
	'obj->ring'
Date: Mon, 24 Nov 2014 18:49:43 +0000
Message-ID: <1416854990-1920-22-git-send-email-John.C.Harrison@Intel.com>
References: <1416854990-1920-1-git-send-email-John.C.Harrison@Intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 607076EE26
 for <Intel-GFX@lists.freedesktop.org>; Mon, 24 Nov 2014 10:50:27 -0800 (PST)
In-Reply-To: <1416854990-1920-1-git-send-email-John.C.Harrison@Intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Intel-GFX@Lists.FreeDesktop.Org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSByaW5n
IG1lbWJlciBvZiB0aGUgb2JqZWN0IHN0cnVjdHVyZSB3YXMgYWx3YXlzIHVwZGF0ZWQgd2l0aCB0
aGUKbGFzdF9yZWFkX3NlcW5vIG1lbWJlci4gVGh1cyB3aXRoIHRoZSBjb252ZXJzaW9uIHRvIGxh
c3RfcmVhZF9yZXEsIG9iai0+cmluZyBpcwpub3cgYSBkaXJlY3QgY29weSBvZiBvYmotPmxhc3Rf
cmVhZF9yZXEtPnJpbmcuIFRoaXMgbWFrZXMgaXQgc29tZXdoYXQgcmVkdW5kYW50CmFuZCBwb3Rl
bnRpYWxseSBtaXNsZWFkaW5nIChlc3BlY2lhbGx5IGFzIHRoZXJlIHdhcyBubyBjb21tZW50IHRv
IGV4cGxhaW4gaXRzCnB1cnBvc2UpLgoKVGhpcyBjaGVja2luIHJlbW92ZXMgdGhlIHJlZHVuZGFu
dCBmaWVsZC4gTWFueSB1c2VzIHdlcmUgc2ltcGx5IHRlc3RpbmcgZm9yCm5vbi1udWxsIHRvIHNl
ZSBpZiB0aGUgb2JqZWN0IGlzIGFjdGl2ZSBvbiB0aGUgR1BVLiBTb21lIG9mIHRoZXNlIGhhdmUg
YmVlbgpjb252ZXJ0ZWQgdG8gY2hlY2sgJ29iai0+YWN0aXZlJyBpbnN0ZWFkLiBPdGhlcnMgKHdo
ZXJlIHRoZSBsYXN0X3JlYWRfcmVxIGlzCmFib3V0IHRvIGJlIHVzZWQgYW55d2F5KSBoYXZlIGJl
ZW4gY2hhbmdlZCB0byBjaGVjayBvYmotPmxhc3RfcmVhZF9yZXEuIFRoZSByZXN0CnNpbXBseSBw
dWxsIHRoZSByaW5nIG91dCBmcm9tIHRoZSByZXF1ZXN0IHN0cnVjdHVyZSBhbmQgcHJvY2VlZCBh
cyBiZWZvcmUuCgpGb3I6IFZJWi00Mzc3ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpv
aG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmlld2VkLWJ5OiBUaG9tYXMgRGFuaWVsIDxUaG9t
YXMuRGFuaWVsQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn
ZnMuYyAgICAgfCAgICA5ICsrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu
aCAgICAgICAgIHwgICAgMiAtLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAg
ICAgIHwgICAzMiArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCAgICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9ncHVfZXJyb3IuYyAgIHwgICAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rpc3BsYXkuYyAgICB8ICAgIDcgKysrKy0tLQogNiBmaWxlcyBjaGFuZ2VkLCAzMyBpbnNl
cnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j
CmluZGV4IDNkYzg5M2MuLmI0OTkzZmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j
CkBAIC0xNjgsOCArMTY4LDkgQEAgZGVzY3JpYmVfb2JqKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3Ry
dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAkJKnQgPSAnXDAnOwogCQlzZXFfcHJpbnRm
KG0sICIgKCVzIG1hcHBhYmxlKSIsIHMpOwogCX0KLQlpZiAob2JqLT5yaW5nICE9IE5VTEwpCi0J
CXNlcV9wcmludGYobSwgIiAoJXMpIiwgb2JqLT5yaW5nLT5uYW1lKTsKKwlpZiAob2JqLT5sYXN0
X3JlYWRfcmVxICE9IE5VTEwpCisJCXNlcV9wcmludGYobSwgIiAoJXMpIiwKKwkJCSAgIGk5MTVf
Z2VtX3JlcXVlc3RfZ2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVxKS0+bmFtZSk7CiAJaWYgKG9i
ai0+ZnJvbnRidWZmZXJfYml0cykKIAkJc2VxX3ByaW50ZihtLCAiIChmcm9udGJ1ZmZlcjogMHgl
MDN4KSIsIG9iai0+ZnJvbnRidWZmZXJfYml0cyk7CiB9CkBAIC0zMzYsNyArMzM3LDcgQEAgc3Rh
dGljIGludCBwZXJfZmlsZV9zdGF0cyhpbnQgaWQsIHZvaWQgKnB0ciwgdm9pZCAqZGF0YSkKIAkJ
CWlmIChwcGd0dC0+ZmlsZV9wcml2ICE9IHN0YXRzLT5maWxlX3ByaXYpCiAJCQkJY29udGludWU7
CiAKLQkJCWlmIChvYmotPnJpbmcpIC8qIFhYWCBwZXItdm1hIHN0YXRpc3RpYyAqLworCQkJaWYg
KG9iai0+YWN0aXZlKSAvKiBYWFggcGVyLXZtYSBzdGF0aXN0aWMgKi8KIAkJCQlzdGF0cy0+YWN0
aXZlICs9IG9iai0+YmFzZS5zaXplOwogCQkJZWxzZQogCQkJCXN0YXRzLT5pbmFjdGl2ZSArPSBv
YmotPmJhc2Uuc2l6ZTsKQEAgLTM0Niw3ICszNDcsNyBAQCBzdGF0aWMgaW50IHBlcl9maWxlX3N0
YXRzKGludCBpZCwgdm9pZCAqcHRyLCB2b2lkICpkYXRhKQogCX0gZWxzZSB7CiAJCWlmIChpOTE1
X2dlbV9vYmpfZ2d0dF9ib3VuZChvYmopKSB7CiAJCQlzdGF0cy0+Z2xvYmFsICs9IG9iai0+YmFz
ZS5zaXplOwotCQkJaWYgKG9iai0+cmluZykKKwkJCWlmIChvYmotPmFjdGl2ZSkKIAkJCQlzdGF0
cy0+YWN0aXZlICs9IG9iai0+YmFzZS5zaXplOwogCQkJZWxzZQogCQkJCXN0YXRzLT5pbmFjdGl2
ZSArPSBvYmotPmJhc2Uuc2l6ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDEzMjU1MDYu
LjM2YTQ0MTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTk0MSw4ICsxOTQxLDYgQEAg
c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgewogCXZvaWQgKmRtYV9idWZfdm1hcHBpbmc7CiAJ
aW50IHZtYXBwaW5nX2NvdW50OwogCi0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKLQog
CS8qKiBCcmVhZGNydW1iIG9mIGxhc3QgcmVuZGVyaW5nIHRvIHRoZSBidWZmZXIuICovCiAJc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpsYXN0X3JlYWRfcmVxOwogCXN0cnVjdCBkcm1faTkx
NV9nZW1fcmVxdWVzdCAqbGFzdF93cml0ZV9yZXE7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRl
eCBjY2NjYTQ3Li42OGMyM2RkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTIyNjMsMTQg
KzIyNjMsMTggQEAgc3RhdGljIHZvaWQKIGk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2FjdGl2ZShz
dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJICAgICAgIHN0cnVjdCBpbnRlbF9l
bmdpbmVfY3MgKnJpbmcpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEgPSBp
bnRlbF9yaW5nX2dldF9yZXF1ZXN0KHJpbmcpOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz
dCAqcmVxOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKm9sZF9yaW5nOwogCiAJQlVHX09OKHJp
bmcgPT0gTlVMTCk7Ci0JaWYgKG9iai0+cmluZyAhPSByaW5nICYmIG9iai0+bGFzdF93cml0ZV9y
ZXEpIHsKKworCXJlcSA9IGludGVsX3JpbmdfZ2V0X3JlcXVlc3QocmluZyk7CisJb2xkX3Jpbmcg
PSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSk7CisKKwlpZiAo
b2xkX3JpbmcgIT0gcmluZyAmJiBvYmotPmxhc3Rfd3JpdGVfcmVxKSB7CiAJCS8qIEtlZXAgdGhl
IHJlcXVlc3QgcmVsYXRpdmUgdG8gdGhlIGN1cnJlbnQgcmluZyAqLwogCQlpOTE1X2dlbV9yZXF1
ZXN0X2Fzc2lnbigmb2JqLT5sYXN0X3dyaXRlX3JlcSwgcmVxKTsKIAl9Ci0Jb2JqLT5yaW5nID0g
cmluZzsKIAogCS8qIEFkZCBhIHJlZmVyZW5jZSBpZiB3ZSdyZSBuZXdseSBlbnRlcmluZyB0aGUg
YWN0aXZlIGxpc3QuICovCiAJaWYgKCFvYmotPmFjdGl2ZSkgewpAQCAtMjMwOSw3ICsyMzEzLDYg
QEAgaTkxNV9nZW1fb2JqZWN0X21vdmVfdG9faW5hY3RpdmUoc3RydWN0IGRybV9pOTE1X2dlbV9v
YmplY3QgKm9iaikKIAlpbnRlbF9mYl9vYmpfZmx1c2gob2JqLCB0cnVlKTsKIAogCWxpc3RfZGVs
X2luaXQoJm9iai0+cmluZ19saXN0KTsKLQlvYmotPnJpbmcgPSBOVUxMOwogCiAJaTkxNV9nZW1f
cmVxdWVzdF9hc3NpZ24oJm9iai0+bGFzdF9yZWFkX3JlcSwgTlVMTCk7CiAJaTkxNV9nZW1fcmVx
dWVzdF9hc3NpZ24oJm9iai0+bGFzdF93cml0ZV9yZXEsIE5VTEwpOwpAQCAtMjMyNiw5ICsyMzI5
LDcgQEAgaTkxNV9nZW1fb2JqZWN0X21vdmVfdG9faW5hY3RpdmUoc3RydWN0IGRybV9pOTE1X2dl
bV9vYmplY3QgKm9iaikKIHN0YXRpYyB2b2lkCiBpOTE1X2dlbV9vYmplY3RfcmV0aXJlKHN0cnVj
dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAq
cmluZyA9IG9iai0+cmluZzsKLQotCWlmIChyaW5nID09IE5VTEwpCisJaWYgKG9iai0+bGFzdF9y
ZWFkX3JlcSA9PSBOVUxMKQogCQlyZXR1cm47CiAKIAlpZiAoaTkxNV9nZW1fcmVxdWVzdF9jb21w
bGV0ZWQob2JqLT5sYXN0X3JlYWRfcmVxLCB0cnVlKSkKQEAgLTI4OTIsMTQgKzI4OTMsMTcgQEAg
aTkxNV9nZW1faWRsZV93b3JrX2hhbmRsZXIoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogc3Rh
dGljIGludAogaTkxNV9nZW1fb2JqZWN0X2ZsdXNoX2FjdGl2ZShzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X29iamVjdCAqb2JqKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CiAJaW50IHJl
dDsKIAogCWlmIChvYmotPmFjdGl2ZSkgeworCQlyaW5nID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRf
cmluZyhvYmotPmxhc3RfcmVhZF9yZXEpOworCiAJCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scihv
YmotPmxhc3RfcmVhZF9yZXEpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAotCQlpOTE1
X2dlbV9yZXRpcmVfcmVxdWVzdHNfcmluZyhvYmotPnJpbmcpOworCQlpOTE1X2dlbV9yZXRpcmVf
cmVxdWVzdHNfcmluZyhyaW5nKTsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTMwMDIsMTAgKzMwMDYs
MTIgQEAgaW50CiBpOTE1X2dlbV9vYmplY3Rfc3luYyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj
dCAqb2JqLAogCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnRvKQogewotCXN0cnVjdCBp
bnRlbF9lbmdpbmVfY3MgKmZyb20gPSBvYmotPnJpbmc7CisJc3RydWN0IGludGVsX2VuZ2luZV9j
cyAqZnJvbTsKIAl1MzIgc2Vxbm87CiAJaW50IHJldCwgaWR4OwogCisJZnJvbSA9IGk5MTVfZ2Vt
X3JlcXVlc3RfZ2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVxKTsKKwogCWlmIChmcm9tID09IE5V
TEwgfHwgdG8gPT0gZnJvbSkKIAkJcmV0dXJuIDA7CiAKQEAgLTM5NjQsNyArMzk3MCw3IEBAIGk5
MTVfZ2VtX29iamVjdF9waW5fdG9fZGlzcGxheV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i
amVjdCAqb2JqLAogCWJvb2wgd2FzX3Bpbl9kaXNwbGF5OwogCWludCByZXQ7CiAKLQlpZiAocGlw
ZWxpbmVkICE9IG9iai0+cmluZykgeworCWlmIChwaXBlbGluZWQgIT0gaTkxNV9nZW1fcmVxdWVz
dF9nZXRfcmluZyhvYmotPmxhc3RfcmVhZF9yZXEpKSB7CiAJCXJldCA9IGk5MTVfZ2VtX29iamVj
dF9zeW5jKG9iaiwgcGlwZWxpbmVkKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CkBAIC00
NDEyLDkgKzQ0MTgsMTEgQEAgaTkxNV9nZW1fYnVzeV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2LCB2b2lkICpkYXRhLAogCXJldCA9IGk5MTVfZ2VtX29iamVjdF9mbHVzaF9hY3RpdmUob2Jq
KTsKIAogCWFyZ3MtPmJ1c3kgPSBvYmotPmFjdGl2ZTsKLQlpZiAob2JqLT5yaW5nKSB7CisJaWYg
KG9iai0+bGFzdF9yZWFkX3JlcSkgeworCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwog
CQlCVUlMRF9CVUdfT04oSTkxNV9OVU1fUklOR1MgPiAxNik7Ci0JCWFyZ3MtPmJ1c3kgfD0gaW50
ZWxfcmluZ19mbGFnKG9iai0+cmluZykgPDwgMTY7CisJCXJpbmcgPSBpOTE1X2dlbV9yZXF1ZXN0
X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSk7CisJCWFyZ3MtPmJ1c3kgfD0gaW50ZWxfcmlu
Z19mbGFnKHJpbmcpIDw8IDE2OwogCX0KIAogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZv
YmotPmJhc2UpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29u
dGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGQx
N2ZmNDMuLjNjM2E5ZmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt
X2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMK
QEAgLTYxOSw3ICs2MTksOCBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3QgaW50ZWxfZW5n
aW5lX2NzICpyaW5nLAogCQkgKiBzd2FwcGVkLCBidXQgdGhlcmUgaXMgbm8gd2F5IHRvIGRvIHRo
YXQgeWV0LgogCQkgKi8KIAkJZnJvbS0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUtPmRpcnR5ID0g
MTsKLQkJQlVHX09OKGZyb20tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlLT5yaW5nICE9IHJpbmcp
OworCQlCVUdfT04oaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZygKKwkJCWZyb20tPmxlZ2FjeV9o
d19jdHgucmNzX3N0YXRlLT5sYXN0X3JlYWRfcmVxKSAhPSByaW5nKTsKIAogCQkvKiBvYmogaXMg
a2VwdCBhbGl2ZSB1bnRpbCB0aGUgbmV4dCByZXF1ZXN0IGJ5IGl0cyBhY3RpdmUgcmVmICovCiAJ
CWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGZyb20tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRl
KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IDk5OGJkOGEuLmYzYjE2
M2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtNjg1LDcgKzY4NSw4
IEBAIHN0YXRpYyB2b2lkIGNhcHR1cmVfYm8oc3RydWN0IGRybV9pOTE1X2Vycm9yX2J1ZmZlciAq
ZXJyLAogCWVyci0+ZGlydHkgPSBvYmotPmRpcnR5OwogCWVyci0+cHVyZ2VhYmxlID0gb2JqLT5t
YWR2ICE9IEk5MTVfTUFEVl9XSUxMTkVFRDsKIAllcnItPnVzZXJwdHIgPSBvYmotPnVzZXJwdHIu
bW0gIT0gTlVMTDsKLQllcnItPnJpbmcgPSBvYmotPnJpbmcgPyBvYmotPnJpbmctPmlkIDogLTE7
CisJZXJyLT5yaW5nID0gb2JqLT5sYXN0X3JlYWRfcmVxID8KKwkJCWk5MTVfZ2VtX3JlcXVlc3Rf
Z2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVxKS0+aWQgOiAtMTsKIAllcnItPmNhY2hlX2xldmVs
ID0gb2JqLT5jYWNoZV9sZXZlbDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j
CmluZGV4IDBkYjQxZmIuLjFjZjljODIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5
LmMKQEAgLTk0NTksNyArOTQ1OSw3IEBAIHN0YXRpYyBib29sIHVzZV9tbWlvX2ZsaXAoc3RydWN0
IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAllbHNlIGlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMp
CiAJCXJldHVybiB0cnVlOwogCWVsc2UKLQkJcmV0dXJuIHJpbmcgIT0gb2JqLT5yaW5nOworCQly
ZXR1cm4gcmluZyAhPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3Jl
cSk7CiB9CiAKIHN0YXRpYyB2b2lkIHNrbF9kb19tbWlvX2ZsaXAoc3RydWN0IGludGVsX2NydGMg
KmludGVsX2NydGMpCkBAIC05ODIwLDcgKzk4MjAsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNf
cGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAl9IGVsc2UgaWYgKElTX0lWWUJSSURH
RShkZXYpKSB7CiAJCXJpbmcgPSAmZGV2X3ByaXYtPnJpbmdbQkNTXTsKIAl9IGVsc2UgaWYgKElO
VEVMX0lORk8oZGV2KS0+Z2VuID49IDcpIHsKLQkJcmluZyA9IG9iai0+cmluZzsKKwkJcmluZyA9
IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVxKTsKIAkJaWYgKHJp
bmcgPT0gTlVMTCB8fCByaW5nLT5pZCAhPSBSQ1MpCiAJCQlyaW5nID0gJmRldl9wcml2LT5yaW5n
W0JDU107CiAJfSBlbHNlIHsKQEAgLTk4NDIsNyArOTg0Miw4IEBAIHN0YXRpYyBpbnQgaW50ZWxf
Y3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJCWk5MTVfZ2VtX3JlcXVl
c3RfYXNzaWduKCZ3b3JrLT5mbGlwX3F1ZXVlZF9yZXEsCiAJCQkJCW9iai0+bGFzdF93cml0ZV9y
ZXEpOwotCQl3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nID0gb2JqLT5yaW5nOworCQl3b3JrLT5mbGlw
X3F1ZXVlZF9yaW5nID0KKwkJCQlpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF93
cml0ZV9yZXEpOwogCX0gZWxzZSB7CiAJCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LnF1ZXVlX2Zs
aXAoZGV2LCBjcnRjLCBmYiwgb2JqLCByaW5nLAogCQkJCQkJICAgcGFnZV9mbGlwX2ZsYWdzKTsK
LS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y
ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4
Cg==