From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH v2 21/28] drm/i915: Remove the now redundant
	'obj->ring'
Date: Fri, 14 Nov 2014 12:19:12 +0000
Message-ID: <1415967559-17074-22-git-send-email-John.C.Harrison@Intel.com>
References: <1415967559-17074-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 mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 13D356EDC2
 for <Intel-GFX@lists.freedesktop.org>; Fri, 14 Nov 2014 04:19:45 -0800 (PST)
In-Reply-To: <1415967559-17074-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
NS9pbnRlbF9kaXNwbGF5LmMgICAgfCAgICA3ICsrKystLS0KIDYgZmlsZXMgY2hhbmdlZCwgMzMg
aW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn
ZnMuYwppbmRleCBmNGQxMzhlLi44Y2JmMzJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn
ZnMuYwpAQCAtMTY4LDggKzE2OCw5IEBAIGRlc2NyaWJlX29iaihzdHJ1Y3Qgc2VxX2ZpbGUgKm0s
IHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJCSp0ID0gJ1wwJzsKIAkJc2VxX3By
aW50ZihtLCAiICglcyBtYXBwYWJsZSkiLCBzKTsKIAl9Ci0JaWYgKG9iai0+cmluZyAhPSBOVUxM
KQotCQlzZXFfcHJpbnRmKG0sICIgKCVzKSIsIG9iai0+cmluZy0+bmFtZSk7CisJaWYgKG9iai0+
bGFzdF9yZWFkX3JlcSAhPSBOVUxMKQorCQlzZXFfcHJpbnRmKG0sICIgKCVzKSIsCisJCQkgICBp
OTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSktPm5hbWUpOwogCWlm
IChvYmotPmZyb250YnVmZmVyX2JpdHMpCiAJCXNlcV9wcmludGYobSwgIiAoZnJvbnRidWZmZXI6
IDB4JTAzeCkiLCBvYmotPmZyb250YnVmZmVyX2JpdHMpOwogfQpAQCAtMzM2LDcgKzMzNyw3IEBA
IHN0YXRpYyBpbnQgcGVyX2ZpbGVfc3RhdHMoaW50IGlkLCB2b2lkICpwdHIsIHZvaWQgKmRhdGEp
CiAJCQlpZiAocHBndHQtPmZpbGVfcHJpdiAhPSBzdGF0cy0+ZmlsZV9wcml2KQogCQkJCWNvbnRp
bnVlOwogCi0JCQlpZiAob2JqLT5yaW5nKSAvKiBYWFggcGVyLXZtYSBzdGF0aXN0aWMgKi8KKwkJ
CWlmIChvYmotPmFjdGl2ZSkgLyogWFhYIHBlci12bWEgc3RhdGlzdGljICovCiAJCQkJc3RhdHMt
PmFjdGl2ZSArPSBvYmotPmJhc2Uuc2l6ZTsKIAkJCWVsc2UKIAkJCQlzdGF0cy0+aW5hY3RpdmUg
Kz0gb2JqLT5iYXNlLnNpemU7CkBAIC0zNDYsNyArMzQ3LDcgQEAgc3RhdGljIGludCBwZXJfZmls
ZV9zdGF0cyhpbnQgaWQsIHZvaWQgKnB0ciwgdm9pZCAqZGF0YSkKIAl9IGVsc2UgewogCQlpZiAo
aTkxNV9nZW1fb2JqX2dndHRfYm91bmQob2JqKSkgewogCQkJc3RhdHMtPmdsb2JhbCArPSBvYmot
PmJhc2Uuc2l6ZTsKLQkJCWlmIChvYmotPnJpbmcpCisJCQlpZiAob2JqLT5hY3RpdmUpCiAJCQkJ
c3RhdHMtPmFjdGl2ZSArPSBvYmotPmJhc2Uuc2l6ZTsKIAkJCWVsc2UKIAkJCQlzdGF0cy0+aW5h
Y3RpdmUgKz0gb2JqLT5iYXNlLnNpemU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA1Y2Ey
M2RjLi45MThkNjFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE5MzUsOCArMTkzNSw2
IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0IHsKIAl2b2lkICpkbWFfYnVmX3ZtYXBwaW5n
OwogCWludCB2bWFwcGluZ19jb3VudDsKIAotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7
Ci0KIAkvKiogQnJlYWRjcnVtYiBvZiBsYXN0IHJlbmRlcmluZyB0byB0aGUgYnVmZmVyLiAqLwog
CXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqbGFzdF9yZWFkX3JlcTsKIAlzdHJ1Y3QgZHJt
X2k5MTVfZ2VtX3JlcXVlc3QgKmxhc3Rfd3JpdGVfcmVxOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK
aW5kZXggM2Q2ODk0Yy4uMWQwN2ExNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yMjY1
LDE0ICsyMjY1LDE4IEBAIHN0YXRpYyB2b2lkCiBpOTE1X2dlbV9vYmplY3RfbW92ZV90b19hY3Rp
dmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCSAgICAgICBzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICpyaW5nKQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx
ID0gaW50ZWxfcmluZ19nZXRfcmVxdWVzdChyaW5nKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl
cXVlc3QgKnJlcTsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpvbGRfcmluZzsKIAogCUJVR19P
TihyaW5nID09IE5VTEwpOwotCWlmIChvYmotPnJpbmcgIT0gcmluZyAmJiBvYmotPmxhc3Rfd3Jp
dGVfcmVxKSB7CisKKwlyZXEgPSBpbnRlbF9yaW5nX2dldF9yZXF1ZXN0KHJpbmcpOworCW9sZF9y
aW5nID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhvYmotPmxhc3RfcmVhZF9yZXEpOworCisJ
aWYgKG9sZF9yaW5nICE9IHJpbmcgJiYgb2JqLT5sYXN0X3dyaXRlX3JlcSkgewogCQkvKiBLZWVw
IHRoZSByZXF1ZXN0IHJlbGF0aXZlIHRvIHRoZSBjdXJyZW50IHJpbmcgKi8KIAkJaTkxNV9nZW1f
cmVxdWVzdF9hc3NpZ24oJm9iai0+bGFzdF93cml0ZV9yZXEsIHJlcSk7CiAJfQotCW9iai0+cmlu
ZyA9IHJpbmc7CiAKIAkvKiBBZGQgYSByZWZlcmVuY2UgaWYgd2UncmUgbmV3bHkgZW50ZXJpbmcg
dGhlIGFjdGl2ZSBsaXN0LiAqLwogCWlmICghb2JqLT5hY3RpdmUpIHsKQEAgLTIzMTEsNyArMjMx
NSw2IEBAIGk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2luYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9n
ZW1fb2JqZWN0ICpvYmopCiAJaW50ZWxfZmJfb2JqX2ZsdXNoKG9iaiwgdHJ1ZSk7CiAKIAlsaXN0
X2RlbF9pbml0KCZvYmotPnJpbmdfbGlzdCk7Ci0Jb2JqLT5yaW5nID0gTlVMTDsKIAogCWk5MTVf
Z2VtX3JlcXVlc3RfYXNzaWduKCZvYmotPmxhc3RfcmVhZF9yZXEsIE5VTEwpOwogCWk5MTVfZ2Vt
X3JlcXVlc3RfYXNzaWduKCZvYmotPmxhc3Rfd3JpdGVfcmVxLCBOVUxMKTsKQEAgLTIzMjgsOSAr
MjMzMSw3IEBAIGk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2luYWN0aXZlKHN0cnVjdCBkcm1faTkx
NV9nZW1fb2JqZWN0ICpvYmopCiBzdGF0aWMgdm9pZAogaTkxNV9nZW1fb2JqZWN0X3JldGlyZShz
dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogewotCXN0cnVjdCBpbnRlbF9lbmdpbmVf
Y3MgKnJpbmcgPSBvYmotPnJpbmc7Ci0KLQlpZiAocmluZyA9PSBOVUxMKQorCWlmIChvYmotPmxh
c3RfcmVhZF9yZXEgPT0gTlVMTCkKIAkJcmV0dXJuOwogCiAJaWYgKGk5MTVfZ2VtX3JlcXVlc3Rf
Y29tcGxldGVkKG9iai0+bGFzdF9yZWFkX3JlcSwgdHJ1ZSkpCkBAIC0yODczLDE0ICsyODc0LDE3
IEBAIGk5MTVfZ2VtX2lkbGVfd29ya19oYW5kbGVyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykK
IHN0YXRpYyBpbnQKIGk5MTVfZ2VtX29iamVjdF9mbHVzaF9hY3RpdmUoc3RydWN0IGRybV9pOTE1
X2dlbV9vYmplY3QgKm9iaikKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwogCWlu
dCByZXQ7CiAKIAlpZiAob2JqLT5hY3RpdmUpIHsKKwkJcmluZyA9IGk5MTVfZ2VtX3JlcXVlc3Rf
Z2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVxKTsKKwogCQlyZXQgPSBpOTE1X2dlbV9jaGVja19v
bHIob2JqLT5sYXN0X3JlYWRfcmVxKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKLQkJ
aTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3Jpbmcob2JqLT5yaW5nKTsKKwkJaTkxNV9nZW1fcmV0
aXJlX3JlcXVlc3RzX3JpbmcocmluZyk7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC0yOTgzLDEwICsy
OTg3LDEyIEBAIGludAogaTkxNV9nZW1fb2JqZWN0X3N5bmMoc3RydWN0IGRybV9pOTE1X2dlbV9v
YmplY3QgKm9iaiwKIAkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp0bykKIHsKLQlzdHJ1
Y3QgaW50ZWxfZW5naW5lX2NzICpmcm9tID0gb2JqLT5yaW5nOworCXN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKmZyb207CiAJdTMyIHNlcW5vOwogCWludCByZXQsIGlkeDsKIAorCWZyb20gPSBpOTE1
X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSk7CisKIAlpZiAoZnJvbSA9
PSBOVUxMIHx8IHRvID09IGZyb20pCiAJCXJldHVybiAwOwogCkBAIC0zOTQ1LDcgKzM5NTEsNyBA
QCBpOTE1X2dlbV9vYmplY3RfcGluX3RvX2Rpc3BsYXlfcGxhbmUoc3RydWN0IGRybV9pOTE1X2dl
bV9vYmplY3QgKm9iaiwKIAlib29sIHdhc19waW5fZGlzcGxheTsKIAlpbnQgcmV0OwogCi0JaWYg
KHBpcGVsaW5lZCAhPSBvYmotPnJpbmcpIHsKKwlpZiAocGlwZWxpbmVkICE9IGk5MTVfZ2VtX3Jl
cXVlc3RfZ2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVxKSkgewogCQlyZXQgPSBpOTE1X2dlbV9v
YmplY3Rfc3luYyhvYmosIHBpcGVsaW5lZCk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwpA
QCAtNDM5Myw5ICs0Mzk5LDExIEBAIGk5MTVfZ2VtX2J1c3lfaW9jdGwoc3RydWN0IGRybV9kZXZp
Y2UgKmRldiwgdm9pZCAqZGF0YSwKIAlyZXQgPSBpOTE1X2dlbV9vYmplY3RfZmx1c2hfYWN0aXZl
KG9iaik7CiAKIAlhcmdzLT5idXN5ID0gb2JqLT5hY3RpdmU7Ci0JaWYgKG9iai0+cmluZykgewor
CWlmIChvYmotPmxhc3RfcmVhZF9yZXEpIHsKKwkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu
ZzsKIAkJQlVJTERfQlVHX09OKEk5MTVfTlVNX1JJTkdTID4gMTYpOwotCQlhcmdzLT5idXN5IHw9
IGludGVsX3JpbmdfZmxhZyhvYmotPnJpbmcpIDw8IDE2OworCQlyaW5nID0gaTkxNV9nZW1fcmVx
dWVzdF9nZXRfcmluZyhvYmotPmxhc3RfcmVhZF9yZXEpOworCQlhcmdzLT5idXN5IHw9IGludGVs
X3JpbmdfZmxhZyhyaW5nKSA8PCAxNjsKIAl9CiAKIAlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5j
ZSgmb2JqLT5iYXNlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt
X2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRl
eCBkMTdmZjQzLi4zYzNhOWZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4
dC5jCkBAIC02MTksNyArNjE5LDggQEAgc3RhdGljIGludCBkb19zd2l0Y2goc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqcmluZywKIAkJICogc3dhcHBlZCwgYnV0IHRoZXJlIGlzIG5vIHdheSB0byBk
byB0aGF0IHlldC4KIAkJICovCiAJCWZyb20tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlLT5kaXJ0
eSA9IDE7Ci0JCUJVR19PTihmcm9tLT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZS0+cmluZyAhPSBy
aW5nKTsKKwkJQlVHX09OKGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcoCisJCQlmcm9tLT5sZWdh
Y3lfaHdfY3R4LnJjc19zdGF0ZS0+bGFzdF9yZWFkX3JlcSkgIT0gcmluZyk7CiAKIAkJLyogb2Jq
IGlzIGtlcHQgYWxpdmUgdW50aWwgdGhlIG5leHQgcmVxdWVzdCBieSBpdHMgYWN0aXZlIHJlZiAq
LwogCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihmcm9tLT5sZWdhY3lfaHdfY3R4LnJjc19z
dGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCA5OTQzM2Q5Li40
MTVhYmJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTY4Myw3ICs2
ODMsOCBAQCBzdGF0aWMgdm9pZCBjYXB0dXJlX2JvKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9idWZm
ZXIgKmVyciwKIAllcnItPmRpcnR5ID0gb2JqLT5kaXJ0eTsKIAllcnItPnB1cmdlYWJsZSA9IG9i
ai0+bWFkdiAhPSBJOTE1X01BRFZfV0lMTE5FRUQ7CiAJZXJyLT51c2VycHRyID0gb2JqLT51c2Vy
cHRyLm1tICE9IE5VTEw7Ci0JZXJyLT5yaW5nID0gb2JqLT5yaW5nID8gb2JqLT5yaW5nLT5pZCA6
IC0xOworCWVyci0+cmluZyA9IG9iai0+bGFzdF9yZWFkX3JlcSA/CisJCQlpOTE1X2dlbV9yZXF1
ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSktPmlkIDogLTE7CiAJZXJyLT5jYWNoZV9s
ZXZlbCA9IG9iai0+Y2FjaGVfbGV2ZWw7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYwppbmRleCAzNTIwMmVkLi4wMGNkNTc5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz
cGxheS5jCkBAIC05Mzg3LDcgKzkzODcsNyBAQCBzdGF0aWMgYm9vbCB1c2VfbW1pb19mbGlwKHN0
cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJZWxzZSBpZiAoaTkxNS5lbmFibGVfZXhlY2xp
c3RzKQogCQlyZXR1cm4gdHJ1ZTsKIAllbHNlCi0JCXJldHVybiByaW5nICE9IG9iai0+cmluZzsK
KwkJcmV0dXJuIHJpbmcgIT0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhvYmotPmxhc3RfcmVh
ZF9yZXEpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9kb19tbWlvX2ZsaXAoc3RydWN0IGludGVs
X2NydGMgKmludGVsX2NydGMpCkBAIC05NjM1LDcgKzk2MzUsNyBAQCBzdGF0aWMgaW50IGludGVs
X2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAl9IGVsc2UgaWYgKElTX0lW
WUJSSURHRShkZXYpKSB7CiAJCXJpbmcgPSAmZGV2X3ByaXYtPnJpbmdbQkNTXTsKIAl9IGVsc2Ug
aWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDcpIHsKLQkJcmluZyA9IG9iai0+cmluZzsKKwkJ
cmluZyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3Jpbmcob2JqLT5sYXN0X3JlYWRfcmVxKTsKIAkJ
aWYgKHJpbmcgPT0gTlVMTCB8fCByaW5nLT5pZCAhPSBSQ1MpCiAJCQlyaW5nID0gJmRldl9wcml2
LT5yaW5nW0JDU107CiAJfSBlbHNlIHsKQEAgLTk2NTcsNyArOTY1Nyw4IEBAIHN0YXRpYyBpbnQg
aW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJCWk5MTVfZ2Vt
X3JlcXVlc3RfYXNzaWduKCZ3b3JrLT5mbGlwX3F1ZXVlZF9yZXEsCiAJCQkJCW9iai0+bGFzdF93
cml0ZV9yZXEpOwotCQl3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nID0gb2JqLT5yaW5nOworCQl3b3Jr
LT5mbGlwX3F1ZXVlZF9yaW5nID0KKwkJCQlpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+
bGFzdF93cml0ZV9yZXEpOwogCX0gZWxzZSB7CiAJCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LnF1
ZXVlX2ZsaXAoZGV2LCBjcnRjLCBmYiwgb2JqLCByaW5nLAogCQkJCQkJICAgcGFnZV9mbGlwX2Zs
YWdzKTsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr
dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50
ZWwtZ2Z4Cg==