From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH v4 21/27] x86: move compat_set_trap_table along
	side the non-compat variant
Date: Thu, 8 Jun 2017 18:11:57 +0100
Message-ID: <20170608171203.20416-22-wei.liu2@citrix.com>
References: <20170608171203.20416-1-wei.liu2@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta6.messagelabs.com ([193.109.254.103])
 by lists.xenproject.org with esmtp (Exim 4.84_2)
 (envelope-from <prvs=3259bf657=wei.liu2@citrix.com>)
 id 1dJ12l-0005zA-LX
 for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 17:16:23 +0000
In-Reply-To: <20170608171203.20416-1-wei.liu2@citrix.com>
List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xen.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wei.liu2@citrix.com>, Jan Beulich <JBeulich@suse.com>
List-Id: xen-devel@lists.xenproject.org

U2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJj
aC94ODYvcHYvdHJhcHMuYyAgICAgICAgICAgIHwgNDUgKysrKysrKysrKysrKysrKysrKysrKysr
KysrKysrKysrKysrKysKIHhlbi9hcmNoL3g4Ni94ODZfNjQvY29tcGF0L3RyYXBzLmMgfCA0NSAt
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0
NSBpbnNlcnRpb25zKCspLCA0NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94
ODYvcHYvdHJhcHMuYyBiL3hlbi9hcmNoL3g4Ni9wdi90cmFwcy5jCmluZGV4IGYyNTU2YzdlNGEu
LjNkY2IzZjE4NzcgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wdi90cmFwcy5jCisrKyBiL3hl
bi9hcmNoL3g4Ni9wdi90cmFwcy5jCkBAIC04Nyw2ICs4Nyw1MSBAQCBsb25nIGRvX3NldF90cmFw
X3RhYmxlKFhFTl9HVUVTVF9IQU5ETEVfUEFSQU0oY29uc3RfdHJhcF9pbmZvX3QpIHRyYXBzKQog
ICAgIHJldHVybiByYzsKIH0KIAoraW50IGNvbXBhdF9zZXRfdHJhcF90YWJsZShYRU5fR1VFU1Rf
SEFORExFKHRyYXBfaW5mb19jb21wYXRfdCkgdHJhcHMpCit7CisgICAgc3RydWN0IGNvbXBhdF90
cmFwX2luZm8gY3VyOworICAgIHN0cnVjdCB0cmFwX2luZm8gKmRzdCA9IGN1cnJlbnQtPmFyY2gu
cHZfdmNwdS50cmFwX2N0eHQ7CisgICAgbG9uZyByYyA9IDA7CisKKyAgICAvKiBJZiBubyB0YWJs
ZSBpcyBwcmVzZW50ZWQgdGhlbiBjbGVhciB0aGUgZW50aXJlIHZpcnR1YWwgSURULiAqLworICAg
IGlmICggZ3Vlc3RfaGFuZGxlX2lzX251bGwodHJhcHMpICkKKyAgICB7CisgICAgICAgIG1lbXNl
dChkc3QsIDAsIE5SX1ZFQ1RPUlMgKiBzaXplb2YoKmRzdCkpOworICAgICAgICBpbml0X2ludDgw
X2RpcmVjdF90cmFwKGN1cnJlbnQpOworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisKKyAgICBm
b3IgKCA7IDsgKQorICAgIHsKKyAgICAgICAgaWYgKCBjb3B5X2Zyb21fZ3Vlc3QoJmN1ciwgdHJh
cHMsIDEpICkKKyAgICAgICAgeworICAgICAgICAgICAgcmMgPSAtRUZBVUxUOworICAgICAgICAg
ICAgYnJlYWs7CisgICAgICAgIH0KKworICAgICAgICBpZiAoIGN1ci5hZGRyZXNzID09IDAgKQor
ICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgZml4dXBfZ3Vlc3RfY29kZV9zZWxlY3Rvcihj
dXJyZW50LT5kb21haW4sIGN1ci5jcyk7CisKKyAgICAgICAgWExBVF90cmFwX2luZm8oZHN0ICsg
Y3VyLnZlY3RvciwgJmN1cik7CisKKyAgICAgICAgaWYgKCBjdXIudmVjdG9yID09IDB4ODAgKQor
ICAgICAgICAgICAgaW5pdF9pbnQ4MF9kaXJlY3RfdHJhcChjdXJyZW50KTsKKworICAgICAgICBn
dWVzdF9oYW5kbGVfYWRkX29mZnNldCh0cmFwcywgMSk7CisKKyAgICAgICAgaWYgKCBoeXBlcmNh
bGxfcHJlZW1wdF9jaGVjaygpICkKKyAgICAgICAgeworICAgICAgICAgICAgcmMgPSBoeXBlcmNh
bGxfY3JlYXRlX2NvbnRpbnVhdGlvbigKKyAgICAgICAgICAgICAgICBfX0hZUEVSVklTT1Jfc2V0
X3RyYXBfdGFibGUsICJoIiwgdHJhcHMpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0K
KyAgICB9CisKKyAgICByZXR1cm4gcmM7Cit9CisKIHZvaWQgcHZfaW5qZWN0X2V2ZW50KGNvbnN0
IHN0cnVjdCB4ODZfZXZlbnQgKmV2ZW50KQogewogICAgIHN0cnVjdCB2Y3B1ICpjdXJyID0gY3Vy
cmVudDsKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni94ODZfNjQvY29tcGF0L3RyYXBzLmMgYi94
ZW4vYXJjaC94ODYveDg2XzY0L2NvbXBhdC90cmFwcy5jCmluZGV4IGY0ODUyOTljODguLmFkZDRh
ZjM0MDMgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni94ODZfNjQvY29tcGF0L3RyYXBzLmMKKysr
IGIveGVuL2FyY2gveDg2L3g4Nl82NC9jb21wYXQvdHJhcHMuYwpAQCAtMzI5LDUxICszMjksNiBA
QCBsb25nIGNvbXBhdF9zZXRfY2FsbGJhY2tzKHVuc2lnbmVkIGxvbmcgZXZlbnRfc2VsZWN0b3Is
CiAgICAgcmV0dXJuIDA7CiB9CiAKLWludCBjb21wYXRfc2V0X3RyYXBfdGFibGUoWEVOX0dVRVNU
X0hBTkRMRSh0cmFwX2luZm9fY29tcGF0X3QpIHRyYXBzKQotewotICAgIHN0cnVjdCBjb21wYXRf
dHJhcF9pbmZvIGN1cjsKLSAgICBzdHJ1Y3QgdHJhcF9pbmZvICpkc3QgPSBjdXJyZW50LT5hcmNo
LnB2X3ZjcHUudHJhcF9jdHh0OwotICAgIGxvbmcgcmMgPSAwOwotCi0gICAgLyogSWYgbm8gdGFi
bGUgaXMgcHJlc2VudGVkIHRoZW4gY2xlYXIgdGhlIGVudGlyZSB2aXJ0dWFsIElEVC4gKi8KLSAg
ICBpZiAoIGd1ZXN0X2hhbmRsZV9pc19udWxsKHRyYXBzKSApCi0gICAgewotICAgICAgICBtZW1z
ZXQoZHN0LCAwLCBOUl9WRUNUT1JTICogc2l6ZW9mKCpkc3QpKTsKLSAgICAgICAgaW5pdF9pbnQ4
MF9kaXJlY3RfdHJhcChjdXJyZW50KTsKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgfQotCi0gICAg
Zm9yICggOyA7ICkKLSAgICB7Ci0gICAgICAgIGlmICggY29weV9mcm9tX2d1ZXN0KCZjdXIsIHRy
YXBzLCAxKSApCi0gICAgICAgIHsKLSAgICAgICAgICAgIHJjID0gLUVGQVVMVDsKLSAgICAgICAg
ICAgIGJyZWFrOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKCBjdXIuYWRkcmVzcyA9PSAwICkK
LSAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGZpeHVwX2d1ZXN0X2NvZGVfc2VsZWN0b3Io
Y3VycmVudC0+ZG9tYWluLCBjdXIuY3MpOwotCi0gICAgICAgIFhMQVRfdHJhcF9pbmZvKGRzdCAr
IGN1ci52ZWN0b3IsICZjdXIpOwotCi0gICAgICAgIGlmICggY3VyLnZlY3RvciA9PSAweDgwICkK
LSAgICAgICAgICAgIGluaXRfaW50ODBfZGlyZWN0X3RyYXAoY3VycmVudCk7Ci0KLSAgICAgICAg
Z3Vlc3RfaGFuZGxlX2FkZF9vZmZzZXQodHJhcHMsIDEpOwotCi0gICAgICAgIGlmICggaHlwZXJj
YWxsX3ByZWVtcHRfY2hlY2soKSApCi0gICAgICAgIHsKLSAgICAgICAgICAgIHJjID0gaHlwZXJj
YWxsX2NyZWF0ZV9jb250aW51YXRpb24oCi0gICAgICAgICAgICAgICAgX19IWVBFUlZJU09SX3Nl
dF90cmFwX3RhYmxlLCAiaCIsIHRyYXBzKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9
Ci0gICAgfQotCi0gICAgcmV0dXJuIHJjOwotfQotCiAvKgogICogTG9jYWwgdmFyaWFibGVzOgog
ICogbW9kZTogQwotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVu
Lm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==