From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 22/29] drm/i915: Remove the now redundant
	'obj->ring'
Date: Thu, 30 Oct 2014 18:41:14 +0000
Message-ID: <1414694481-15724-23-git-send-email-John.C.Harrison@Intel.com>
References: <1414694481-15724-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 mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id 14EAC6E5A7
 for <Intel-GFX@lists.freedesktop.org>; Thu, 30 Oct 2014 11:41:52 -0700 (PDT)
In-Reply-To: <1414694481-15724-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+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k
ZWJ1Z2ZzLmMgICAgIHwgICAgOSArKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
ZHJ2LmggICAgICAgICB8ICAgIDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg
ICAgICAgICB8ICAgMzIgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgICAgMyArKy0KIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgICB8ICAgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMgICAgfCAgIDE0ICsrKysrKysrLS0tLS0tCiA2IGZpbGVzIGNoYW5n
ZWQsIDM3IGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kZWJ1Z2ZzLmMKaW5kZXggZjI2YzJiMi4uMGY0MGU2MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kZWJ1Z2ZzLmMKQEAgLTE2OCw4ICsxNjgsOSBAQCBkZXNjcmliZV9vYmooc3RydWN0IHNlcV9m
aWxlICptLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCQkqdCA9ICdcMCc7CiAJ
CXNlcV9wcmludGYobSwgIiAoJXMgbWFwcGFibGUpIiwgcyk7CiAJfQotCWlmIChvYmotPnJpbmcg
IT0gTlVMTCkKLQkJc2VxX3ByaW50ZihtLCAiICglcykiLCBvYmotPnJpbmctPm5hbWUpOworCWlm
IChvYmotPmxhc3RfcmVhZF9yZXEgIT0gTlVMTCkKKwkJc2VxX3ByaW50ZihtLCAiICglcykiLAor
CQkJICAgaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhvYmotPmxhc3RfcmVhZF9yZXEpLT5uYW1l
KTsKIAlpZiAob2JqLT5mcm9udGJ1ZmZlcl9iaXRzKQogCQlzZXFfcHJpbnRmKG0sICIgKGZyb250
YnVmZmVyOiAweCUwM3gpIiwgb2JqLT5mcm9udGJ1ZmZlcl9iaXRzKTsKIH0KQEAgLTMzNiw3ICsz
MzcsNyBAQCBzdGF0aWMgaW50IHBlcl9maWxlX3N0YXRzKGludCBpZCwgdm9pZCAqcHRyLCB2b2lk
ICpkYXRhKQogCQkJaWYgKHBwZ3R0LT5maWxlX3ByaXYgIT0gc3RhdHMtPmZpbGVfcHJpdikKIAkJ
CQljb250aW51ZTsKIAotCQkJaWYgKG9iai0+cmluZykgLyogWFhYIHBlci12bWEgc3RhdGlzdGlj
ICovCisJCQlpZiAob2JqLT5hY3RpdmUpIC8qIFhYWCBwZXItdm1hIHN0YXRpc3RpYyAqLwogCQkJ
CXN0YXRzLT5hY3RpdmUgKz0gb2JqLT5iYXNlLnNpemU7CiAJCQllbHNlCiAJCQkJc3RhdHMtPmlu
YWN0aXZlICs9IG9iai0+YmFzZS5zaXplOwpAQCAtMzQ2LDcgKzM0Nyw3IEBAIHN0YXRpYyBpbnQg
cGVyX2ZpbGVfc3RhdHMoaW50IGlkLCB2b2lkICpwdHIsIHZvaWQgKmRhdGEpCiAJfSBlbHNlIHsK
IAkJaWYgKGk5MTVfZ2VtX29ial9nZ3R0X2JvdW5kKG9iaikpIHsKIAkJCXN0YXRzLT5nbG9iYWwg
Kz0gb2JqLT5iYXNlLnNpemU7Ci0JCQlpZiAob2JqLT5yaW5nKQorCQkJaWYgKG9iai0+YWN0aXZl
KQogCQkJCXN0YXRzLT5hY3RpdmUgKz0gb2JqLT5iYXNlLnNpemU7CiAJCQllbHNlCiAJCQkJc3Rh
dHMtPmluYWN0aXZlICs9IG9iai0+YmFzZS5zaXplOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5k
ZXggMWQzMGRjYi4uNDFjMmRiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xODY4LDgg
KzE4NjgsNiBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCB7CiAJdm9pZCAqZG1hX2J1Zl92
bWFwcGluZzsKIAlpbnQgdm1hcHBpbmdfY291bnQ7CiAKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz
ICpyaW5nOwotCiAJLyoqIEJyZWFkY3J1bWIgb2YgbGFzdCByZW5kZXJpbmcgdG8gdGhlIGJ1ZmZl
ci4gKi8KIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmxhc3RfcmVhZF9yZXE7CiAJc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpsYXN0X3dyaXRlX3JlcTsKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2dlbS5jCmluZGV4IDJkYWFmZWIuLmVhNmQ2NzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA
QCAtMjE4MywxNCArMjE4MywxOCBAQCBzdGF0aWMgdm9pZAogaTkxNV9nZW1fb2JqZWN0X21vdmVf
dG9fYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkgICAgICAgc3Ry
dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl
c3QgKnJlcSA9IGludGVsX3JpbmdfZ2V0X3JlcXVlc3QocmluZyk7CisJc3RydWN0IGRybV9pOTE1
X2dlbV9yZXF1ZXN0ICpyZXE7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqb2xkX3Jpbmc7CiAK
IAlCVUdfT04ocmluZyA9PSBOVUxMKTsKLQlpZiAob2JqLT5yaW5nICE9IHJpbmcgJiYgb2JqLT5s
YXN0X3dyaXRlX3JlcSkgeworCisJcmVxID0gaW50ZWxfcmluZ19nZXRfcmVxdWVzdChyaW5nKTsK
KwlvbGRfcmluZyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVx
KTsKKworCWlmIChvbGRfcmluZyAhPSByaW5nICYmIG9iai0+bGFzdF93cml0ZV9yZXEpIHsKIAkJ
LyogS2VlcCB0aGUgcmVxdWVzdCByZWxhdGl2ZSB0byB0aGUgY3VycmVudCByaW5nICovCiAJCWk5
MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZvYmotPmxhc3Rfd3JpdGVfcmVxLCByZXEpOwogCX0KLQlv
YmotPnJpbmcgPSByaW5nOwogCiAJLyogQWRkIGEgcmVmZXJlbmNlIGlmIHdlJ3JlIG5ld2x5IGVu
dGVyaW5nIHRoZSBhY3RpdmUgbGlzdC4gKi8KIAlpZiAoIW9iai0+YWN0aXZlKSB7CkBAIC0yMjI5
LDcgKzIyMzMsNiBAQCBpOTE1X2dlbV9vYmplY3RfbW92ZV90b19pbmFjdGl2ZShzdHJ1Y3QgZHJt
X2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCWludGVsX2ZiX29ial9mbHVzaChvYmosIHRydWUpOwog
CiAJbGlzdF9kZWxfaW5pdCgmb2JqLT5yaW5nX2xpc3QpOwotCW9iai0+cmluZyA9IE5VTEw7CiAK
IAlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb2JqLT5sYXN0X3JlYWRfcmVxLCBOVUxMKTsKIAlp
OTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb2JqLT5sYXN0X3dyaXRlX3JlcSwgTlVMTCk7CkBAIC0y
MjQ2LDkgKzIyNDksNyBAQCBpOTE1X2dlbV9vYmplY3RfbW92ZV90b19pbmFjdGl2ZShzdHJ1Y3Qg
ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogc3RhdGljIHZvaWQKIGk5MTVfZ2VtX29iamVjdF9y
ZXRpcmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKLQlzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICpyaW5nID0gb2JqLT5yaW5nOwotCi0JaWYgKHJpbmcgPT0gTlVMTCkKKwlpZiAo
b2JqLT5sYXN0X3JlYWRfcmVxID09IE5VTEwpCiAJCXJldHVybjsKIAogCWlmIChpOTE1X2dlbV9y
ZXF1ZXN0X2NvbXBsZXRlZChvYmotPmxhc3RfcmVhZF9yZXEsIHRydWUpKQpAQCAtMjc4NiwxNCAr
Mjc4NywxNyBAQCBpOTE1X2dlbV9pZGxlX3dvcmtfaGFuZGxlcihzdHJ1Y3Qgd29ya19zdHJ1Y3Qg
KndvcmspCiBzdGF0aWMgaW50CiBpOTE1X2dlbV9vYmplY3RfZmx1c2hfYWN0aXZlKHN0cnVjdCBk
cm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu
ZzsKIAlpbnQgcmV0OwogCiAJaWYgKG9iai0+YWN0aXZlKSB7CisJCXJpbmcgPSBpOTE1X2dlbV9y
ZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSk7CisKIAkJcmV0ID0gaTkxNV9nZW1f
Y2hlY2tfb2xyKG9iai0+bGFzdF9yZWFkX3JlcSk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0
OwogCi0JCWk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0c19yaW5nKG9iai0+cmluZyk7CisJCWk5MTVf
Z2VtX3JldGlyZV9yZXF1ZXN0c19yaW5nKHJpbmcpOwogCX0KIAogCXJldHVybiAwOwpAQCAtMjg5
NiwxMCArMjkwMCwxMiBAQCBpbnQKIGk5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkx
NV9nZW1fb2JqZWN0ICpvYmosCiAJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqdG8pCiB7
Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZnJvbSA9IG9iai0+cmluZzsKKwlzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICpmcm9tOwogCXUzMiBzZXFubzsKIAlpbnQgcmV0LCBpZHg7CiAKKwlmcm9t
ID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhvYmotPmxhc3RfcmVhZF9yZXEpOworCiAJaWYg
KGZyb20gPT0gTlVMTCB8fCB0byA9PSBmcm9tKQogCQlyZXR1cm4gMDsKIApAQCAtMzg3Miw3ICsz
ODc4LDcgQEAgaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1f
aTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJYm9vbCB3YXNfcGluX2Rpc3BsYXk7CiAJaW50IHJldDsK
IAotCWlmIChwaXBlbGluZWQgIT0gb2JqLT5yaW5nKSB7CisJaWYgKHBpcGVsaW5lZCAhPSBpOTE1
X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSkpIHsKIAkJcmV0ID0gaTkx
NV9nZW1fb2JqZWN0X3N5bmMob2JqLCBwaXBlbGluZWQpOwogCQlpZiAocmV0KQogCQkJcmV0dXJu
IHJldDsKQEAgLTQyOTIsOSArNDI5OCwxMSBAQCBpOTE1X2dlbV9idXN5X2lvY3RsKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X2ZsdXNo
X2FjdGl2ZShvYmopOwogCiAJYXJncy0+YnVzeSA9IG9iai0+YWN0aXZlOwotCWlmIChvYmotPnJp
bmcpIHsKKwlpZiAob2JqLT5sYXN0X3JlYWRfcmVxKSB7CisJCXN0cnVjdCBpbnRlbF9lbmdpbmVf
Y3MgKnJpbmc7CiAJCUJVSUxEX0JVR19PTihJOTE1X05VTV9SSU5HUyA+IDE2KTsKLQkJYXJncy0+
YnVzeSB8PSBpbnRlbF9yaW5nX2ZsYWcob2JqLT5yaW5nKSA8PCAxNjsKKwkJcmluZyA9IGk5MTVf
Z2VtX3JlcXVlc3RfZ2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVxKTsKKwkJYXJncy0+YnVzeSB8
PSBpbnRlbF9yaW5nX2ZsYWcocmluZykgPDwgMTY7CiAJfQogCiAJZHJtX2dlbV9vYmplY3RfdW5y
ZWZlcmVuY2UoJm9iai0+YmFzZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0
LmMKaW5kZXggN2QzMjU3MS4uMGUzNWFmZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt
X2NvbnRleHQuYwpAQCAtNjEzLDcgKzYxMyw4IEBAIHN0YXRpYyBpbnQgZG9fc3dpdGNoKHN0cnVj
dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCSAqIHN3YXBwZWQsIGJ1dCB0aGVyZSBpcyBubyB3
YXkgdG8gZG8gdGhhdCB5ZXQuCiAJCSAqLwogCQlmcm9tLT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0
ZS0+ZGlydHkgPSAxOwotCQlCVUdfT04oZnJvbS0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUtPnJp
bmcgIT0gcmluZyk7CisJCUJVR19PTihpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKAorCQkJZnJv
bS0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUtPmxhc3RfcmVhZF9yZXEpICE9IHJpbmcpOwogCiAJ
CS8qIG9iaiBpcyBrZXB0IGFsaXZlIHVudGlsIHRoZSBuZXh0IHJlcXVlc3QgYnkgaXRzIGFjdGl2
ZSByZWYgKi8KIAkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oZnJvbS0+bGVnYWN5X2h3X2N0
eC5yY3Nfc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVf
ZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggMTBi
YTE4OC4uNGMxMWU1YmNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dw
dV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAg
LTY4Myw3ICs2ODMsOCBAQCBzdGF0aWMgdm9pZCBjYXB0dXJlX2JvKHN0cnVjdCBkcm1faTkxNV9l
cnJvcl9idWZmZXIgKmVyciwKIAllcnItPmRpcnR5ID0gb2JqLT5kaXJ0eTsKIAllcnItPnB1cmdl
YWJsZSA9IG9iai0+bWFkdiAhPSBJOTE1X01BRFZfV0lMTE5FRUQ7CiAJZXJyLT51c2VycHRyID0g
b2JqLT51c2VycHRyLm1tICE9IE5VTEw7Ci0JZXJyLT5yaW5nID0gb2JqLT5yaW5nID8gb2JqLT5y
aW5nLT5pZCA6IC0xOworCWVyci0+cmluZyA9IG9iai0+bGFzdF9yZWFkX3JlcSA/CisJCQlpOTE1
X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSktPmlkIDogLTE7CiAJZXJy
LT5jYWNoZV9sZXZlbCA9IG9iai0+Y2FjaGVfbGV2ZWw7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rpc3BsYXkuYwppbmRleCBlY2E0MjQwLi5lZWEyZTkyIDEwMDY0NAotLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jCkBAIC05MzA0LDcgKzkzMDQsNyBAQCBzdGF0aWMgYm9vbCB1c2VfbW1p
b19mbGlwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJZWxzZSBpZiAoaTkxNS5lbmFi
bGVfZXhlY2xpc3RzKQogCQlyZXR1cm4gdHJ1ZTsKIAllbHNlCi0JCXJldHVybiByaW5nICE9IG9i
ai0+cmluZzsKKwkJcmV0dXJuIHJpbmcgIT0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhvYmot
Pmxhc3RfcmVhZF9yZXEpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9kb19tbWlvX2ZsaXAoc3Ry
dWN0IGludGVsX2NydGMgKmludGVsX2NydGMpCkBAIC05MzQ0LDcgKzkzNDQsNyBAQCBzdGF0aWMg
aW50IGludGVsX3Bvc3Rwb25lX2ZsaXAoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikK
IAlpZiAoIW9iai0+bGFzdF93cml0ZV9yZXEpCiAJCXJldHVybiAwOwogCi0JcmluZyA9IG9iai0+
cmluZzsKKwlyaW5nID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhvYmotPmxhc3Rfd3JpdGVf
cmVxKTsKIAogCWlmIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChvYmotPmxhc3Rfd3JpdGVf
cmVxLCB0cnVlKSkKIAkJcmV0dXJuIDA7CkBAIC05NDEwLDE0ICs5NDEwLDE1IEBAIHN0YXRpYyBp
bnQgaW50ZWxfcXVldWVfbW1pb19mbGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3Bpbl9s
b2NrX2lycSgmZGV2X3ByaXYtPm1taW9fZmxpcF9sb2NrKTsKIAlpOTE1X2dlbV9yZXF1ZXN0X2Fz
c2lnbigmaW50ZWxfY3J0Yy0+bW1pb19mbGlwLnJlcSwKIAkJCQlvYmotPmxhc3Rfd3JpdGVfcmVx
KTsKLQlpbnRlbF9jcnRjLT5tbWlvX2ZsaXAucmluZ19pZCA9IG9iai0+cmluZy0+aWQ7CisJV0FS
Tl9PTihyaW5nICE9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcoaW50ZWxfY3J0Yy0+bW1pb19m
bGlwLnJlcSkpOworCWludGVsX2NydGMtPm1taW9fZmxpcC5yaW5nX2lkID0gcmluZy0+aWQ7CiAJ
c3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+bW1pb19mbGlwX2xvY2spOwogCiAJLyoKIAkgKiBE
b3VibGUgY2hlY2sgdG8gY2F0Y2ggY2FzZXMgd2hlcmUgaXJxIGZpcmVkIGJlZm9yZQogCSAqIG1t
aW8gZmxpcCBkYXRhIHdhcyByZWFkeQogCSAqLwotCWludGVsX25vdGlmeV9tbWlvX2ZsaXAob2Jq
LT5yaW5nKTsKKwlpbnRlbF9ub3RpZnlfbW1pb19mbGlwKHJpbmcpOwogCXJldHVybiAwOwogfQog
CkBAIC05NTk3LDcgKzk1OTgsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0
cnVjdCBkcm1fY3J0YyAqY3J0YywKIAl9IGVsc2UgaWYgKElTX0lWWUJSSURHRShkZXYpKSB7CiAJ
CXJpbmcgPSAmZGV2X3ByaXYtPnJpbmdbQkNTXTsKIAl9IGVsc2UgaWYgKElOVEVMX0lORk8oZGV2
KS0+Z2VuID49IDcpIHsKLQkJcmluZyA9IG9iai0+cmluZzsKKwkJcmluZyA9IGk5MTVfZ2VtX3Jl
cXVlc3RfZ2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVxKTsKIAkJaWYgKHJpbmcgPT0gTlVMTCB8
fCByaW5nLT5pZCAhPSBSQ1MpCiAJCQlyaW5nID0gJmRldl9wcml2LT5yaW5nW0JDU107CiAJfSBl
bHNlIHsKQEAgLTk2MTksNyArOTYyMCw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2Zs
aXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZ3
b3JrLT5mbGlwX3F1ZXVlZF9yZXEsCiAJCQkJCW9iai0+bGFzdF93cml0ZV9yZXEpOwotCQl3b3Jr
LT5mbGlwX3F1ZXVlZF9yaW5nID0gb2JqLT5yaW5nOworCQl3b3JrLT5mbGlwX3F1ZXVlZF9yaW5n
ID0KKwkJCQlpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF93cml0ZV9yZXEpOwog
CX0gZWxzZSB7CiAJCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LnF1ZXVlX2ZsaXAoZGV2LCBjcnRj
LCBmYiwgb2JqLCByaW5nLAogCQkJCQkJICAgcGFnZV9mbGlwX2ZsYWdzKTsKLS0gCjEuNy45LjUK
Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm
eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz
dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==