From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH for-next 1/3] x86/pv: Move compat_set_gdt() to be beside do_set_gdt() Date: Thu, 19 Oct 2017 16:47:10 +0100 Message-ID: <1508428032-23829-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhpcyBhbHNvIG1ha2VzIHRoZSBkb191cGRhdGVfZGVzY3JpcHRvcigpIHBhaXIgb2YgZnVuY3Rp b25zIGFkamFjZW50LgoKUHVyZWx5IGNvZGUgbW90aW9uOyBubyBmdW5jdGlvbmFsIGNoYW5nZS4K ClNpZ25lZC1vZmYtYnk6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+ Ci0tLQpDQzogSmFuIEJldWxpY2ggPEpCZXVsaWNoQHN1c2UuY29tPgpDQzogV2VpIExpdSA8d2Vp LmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvcHYvZGVzY3JpcHRvci10YWJsZXMu YyB8IDY5ICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAzNiBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4v YXJjaC94ODYvcHYvZGVzY3JpcHRvci10YWJsZXMuYyBiL3hlbi9hcmNoL3g4Ni9wdi9kZXNjcmlw dG9yLXRhYmxlcy5jCmluZGV4IDgxOTczYWYuLjljOGRlMWQgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNo L3g4Ni9wdi9kZXNjcmlwdG9yLXRhYmxlcy5jCisrKyBiL3hlbi9hcmNoL3g4Ni9wdi9kZXNjcmlw dG9yLXRhYmxlcy5jCkBAIC0xMjYsNiArMTI2LDQyIEBAIGxvbmcgZG9fc2V0X2dkdChYRU5fR1VF U1RfSEFORExFX1BBUkFNKHhlbl91bG9uZ190KSBmcmFtZV9saXN0LAogICAgIHJldHVybiByZXQ7 CiB9CiAKK2ludCBjb21wYXRfc2V0X2dkdChYRU5fR1VFU1RfSEFORExFX1BBUkFNKHVpbnQpIGZy YW1lX2xpc3QsCisgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGVudHJpZXMpCit7Cisg ICAgc3RydWN0IHZjcHUgKmN1cnIgPSBjdXJyZW50OworICAgIHVuc2lnbmVkIGludCBpLCBucl9w YWdlcyA9IChlbnRyaWVzICsgNTExKSAvIDUxMjsKKyAgICB1bnNpZ25lZCBsb25nIGZyYW1lc1sx Nl07CisgICAgaW50IHJldDsKKworICAgIC8qIFJlY2hlY2tlZCBpbiBzZXRfZ2R0LCBidXQgZW5z dXJlcyBhIHNhbmUgbGltaXQgZm9yIGNvcHlfZnJvbV91c2VyKCkuICovCisgICAgaWYgKCBlbnRy aWVzID4gRklSU1RfUkVTRVJWRURfR0RUX0VOVFJZICkKKyAgICAgICAgcmV0dXJuIC1FSU5WQUw7 CisKKyAgICBpZiAoICFndWVzdF9oYW5kbGVfb2theShmcmFtZV9saXN0LCBucl9wYWdlcykgKQor ICAgICAgICByZXR1cm4gLUVGQVVMVDsKKworICAgIGZvciAoIGkgPSAwOyBpIDwgbnJfcGFnZXM7 ICsraSApCisgICAgeworICAgICAgICB1bnNpZ25lZCBpbnQgZnJhbWU7CisKKyAgICAgICAgaWYg KCBfX2NvcHlfZnJvbV9ndWVzdCgmZnJhbWUsIGZyYW1lX2xpc3QsIDEpICkKKyAgICAgICAgICAg IHJldHVybiAtRUZBVUxUOworCisgICAgICAgIGZyYW1lc1tpXSA9IGZyYW1lOworICAgICAgICBn dWVzdF9oYW5kbGVfYWRkX29mZnNldChmcmFtZV9saXN0LCAxKTsKKyAgICB9CisKKyAgICBkb21h aW5fbG9jayhjdXJyLT5kb21haW4pOworCisgICAgaWYgKCAocmV0ID0gcHZfc2V0X2dkdChjdXJy LCBmcmFtZXMsIGVudHJpZXMpKSA9PSAwICkKKyAgICAgICAgZmx1c2hfdGxiX2xvY2FsKCk7CisK KyAgICBkb21haW5fdW5sb2NrKGN1cnItPmRvbWFpbik7CisKKyAgICByZXR1cm4gcmV0OworfQor CiBsb25nIGRvX3VwZGF0ZV9kZXNjcmlwdG9yKHVpbnQ2NF90IHBhLCB1aW50NjRfdCBkZXNjKQog ewogICAgIHN0cnVjdCBkb21haW4gKmN1cnJkID0gY3VycmVudC0+ZG9tYWluOwpAQCAtMTgxLDM5 ICsyMTcsNiBAQCBsb25nIGRvX3VwZGF0ZV9kZXNjcmlwdG9yKHVpbnQ2NF90IHBhLCB1aW50NjRf dCBkZXNjKQogICAgIHJldHVybiByZXQ7CiB9CiAKLWludCBjb21wYXRfc2V0X2dkdChYRU5fR1VF U1RfSEFORExFX1BBUkFNKHVpbnQpIGZyYW1lX2xpc3QsIHVuc2lnbmVkIGludCBlbnRyaWVzKQot ewotICAgIHVuc2lnbmVkIGludCBpLCBucl9wYWdlcyA9IChlbnRyaWVzICsgNTExKSAvIDUxMjsK LSAgICB1bnNpZ25lZCBsb25nIGZyYW1lc1sxNl07Ci0gICAgaW50IHJldDsKLQotICAgIC8qIFJl Y2hlY2tlZCBpbiBzZXRfZ2R0LCBidXQgZW5zdXJlcyBhIHNhbmUgbGltaXQgZm9yIGNvcHlfZnJv bV91c2VyKCkuICovCi0gICAgaWYgKCBlbnRyaWVzID4gRklSU1RfUkVTRVJWRURfR0RUX0VOVFJZ ICkKLSAgICAgICAgcmV0dXJuIC1FSU5WQUw7Ci0KLSAgICBpZiAoICFndWVzdF9oYW5kbGVfb2th eShmcmFtZV9saXN0LCBucl9wYWdlcykgKQotICAgICAgICByZXR1cm4gLUVGQVVMVDsKLQotICAg IGZvciAoIGkgPSAwOyBpIDwgbnJfcGFnZXM7ICsraSApCi0gICAgewotICAgICAgICB1bnNpZ25l ZCBpbnQgZnJhbWU7Ci0KLSAgICAgICAgaWYgKCBfX2NvcHlfZnJvbV9ndWVzdCgmZnJhbWUsIGZy YW1lX2xpc3QsIDEpICkKLSAgICAgICAgICAgIHJldHVybiAtRUZBVUxUOwotICAgICAgICBmcmFt ZXNbaV0gPSBmcmFtZTsKLSAgICAgICAgZ3Vlc3RfaGFuZGxlX2FkZF9vZmZzZXQoZnJhbWVfbGlz dCwgMSk7Ci0gICAgfQotCi0gICAgZG9tYWluX2xvY2soY3VycmVudC0+ZG9tYWluKTsKLQotICAg IGlmICggKHJldCA9IHB2X3NldF9nZHQoY3VycmVudCwgZnJhbWVzLCBlbnRyaWVzKSkgPT0gMCAp Ci0gICAgICAgIGZsdXNoX3RsYl9sb2NhbCgpOwotCi0gICAgZG9tYWluX3VubG9jayhjdXJyZW50 LT5kb21haW4pOwotCi0gICAgcmV0dXJuIHJldDsKLX0KLQogaW50IGNvbXBhdF91cGRhdGVfZGVz Y3JpcHRvcih1aW50MzJfdCBwYV9sbywgdWludDMyX3QgcGFfaGksCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVpbnQzMl90IGRlc2NfbG8sIHVpbnQzMl90IGRlc2NfaGkpCiB7Ci0tIAoy LjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhl bi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0 cy54ZW4ub3JnL3hlbi1kZXZlbAo=