From: Roger Pau Monne Subject: [PATCH v2] x86: fix alternative_callN usage of ALTERNATIVE asm macro Date: Wed, 22 May 2019 17:45:30 +0100 Message-ID: <20190522164530.33147-1-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hTUN9-00080t-GZ for xen-devel@lists.xenproject.org; Wed, 22 May 2019 16:45:47 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Wei Liu , Jan Beulich , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org YWx0ZXJuYXRpdmVfY2FsbE4gdXNpbmcgaW5saW5lIGFzc2VtYmx5IHRvIGdlbmVyYXRlIHRoZSBh bHRlcm5hdGl2ZQpwYXRjaCBzaXRlcyBzaG91bGQgYmUgdXNpbmcgdGhlIEFMVEVSTkFUSVZFIEMg cHJlcHJvY2Vzc29yIG1hY3JvCnJhdGhlciB0aGFuIHRoZSBBTFRFUk5BVElWRSBhc3NlbWJseSBt YWNybywgdGhlIG1vcmUgdGhhdCB1c2luZyB0aGUKYXNzZW1ibHkgbWFjcm8gaW4gYW4gaW5saW5l IGFzc2VtYmx5IGluc3RhbmNlIGNhdXNlcyB0aGUgZm9sbG93aW5nCmVycm9yIG9uIGxsdm0gYmFz ZWQgdG9vbGNoYWluczoKCjxpbnN0YW50aWF0aW9uPjoxOjE6IGVycm9yOiBpbnZhbGlkIHN5bWJv bCByZWRlZmluaXRpb24KLkwwX29yaWdfczogY2FsbCAqZ2VuYXBpYys2NCglcmlwKTsgLkwwX29y aWdfZTogLkwwX2RpZmYgPSAoLkwwX3JlcGxfZTEgLSAuTDBfcmVwbF9zMSkgLSAoLi4uCl4KPGlu c3RhbnRpYXRpb24+OjE6Mzc6IGVycm9yOiBpbnZhbGlkIHN5bWJvbCByZWRlZmluaXRpb24KLkww X29yaWdfczogY2FsbCAqZ2VuYXBpYys2NCglcmlwKTsgLkwwX29yaWdfZTogLkwwX2RpZmYgPSAo LkwwX3JlcGxfZTEgLSAuTDBfcmVwbF9zMSkgLSAoLi4uCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIF4KPGluc3RhbnRpYXRpb24+OjE6NjA6IGVycm9yOiBpbnZhbGlkIHJlYXNz aWdubWVudCBvZiBub24tYWJzb2x1dGUgdmFyaWFibGUgJy5MMF9kaWZmJwouTDBfb3JpZ19zOiBj YWxsICpnZW5hcGljKzY0KCVyaXApOyAuTDBfb3JpZ19lOiAuTDBfZGlmZiA9ICguTDBfcmVwbF9l MSAtIC5MMF9yZXBsX3MxKSAtICguLi4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBeCjxpbmxpbmUgYXNtPjoxOjI6IG5vdGU6IHdoaWxl IGluIG1hY3JvIGluc3RhbnRpYXRpb24KICAgICAgICBBTFRFUk5BVElWRSAiY2FsbCAqZ2VuYXBp Yys2NCglcmlwKSIsICJjYWxsIC4iLCBYODZfRkVBVFVSRV9MTQogICAgICAgIF4KPGluc3RhbnRp YXRpb24+OjE6MTU2OiBlcnJvcjogaW52YWxpZCBzeW1ib2wgcmVkZWZpbml0aW9uCiAgLi4uLSAo LkwwX29yaWdfZSAtIC5MMF9vcmlnX3MpOyBta25vcHMgKCgtKC5MMF9kaWZmID4gMCkpICogLkww X2RpZmYpOyAuTDBfb3JpZ19wOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXgo8aW5zdGFudGlhdGlvbj46MTg6 NTogZXJyb3I6IGludmFsaWQgc3ltYm9sIHJlZGVmaW5pdGlvbgogICAgLkwwX3JlcGxfczE6IGNh bGwgLjsgLkwwX3JlcGxfZTE6CiAgICBeCjxpbnN0YW50aWF0aW9uPjoxODoyNjogZXJyb3I6IGlu dmFsaWQgc3ltYm9sIHJlZGVmaW5pdGlvbgogICAgLkwwX3JlcGxfczE6IGNhbGwgLjsgLkwwX3Jl cGxfZTE6CiAgICAgICAgICAgICAgICAgICAgICAgICBeCjxpbnN0YW50aWF0aW9uPjoxOjE6IGVy cm9yOiBpbnZhbGlkIHN5bWJvbCByZWRlZmluaXRpb24KLkwwX29yaWdfczogY2FsbCAqZ2VuYXBp Yys2NCglcmlwKTsgLkwwX29yaWdfZTogLkwwX2RpZmYgPSAoLkwwX3JlcGxfZTEgLSAuTDBfcmVw bF9zMSkgLSAoLi4uCl4KPGluc3RhbnRpYXRpb24+OjE6Mzc6IGVycm9yOiBpbnZhbGlkIHN5bWJv bCByZWRlZmluaXRpb24KLkwwX29yaWdfczogY2FsbCAqZ2VuYXBpYys2NCglcmlwKTsgLkwwX29y aWdfZTogLkwwX2RpZmYgPSAoLkwwX3JlcGxfZTEgLSAuTDBfcmVwbF9zMSkgLSAoLi4uCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF4KPGluc3RhbnRpYXRpb24+OjE6NjA6IGVy cm9yOiBpbnZhbGlkIHJlYXNzaWdubWVudCBvZiBub24tYWJzb2x1dGUgdmFyaWFibGUgJy5MMF9k aWZmJwouTDBfb3JpZ19zOiBjYWxsICpnZW5hcGljKzY0KCVyaXApOyAuTDBfb3JpZ19lOiAuTDBf ZGlmZiA9ICguTDBfcmVwbF9lMSAtIC5MMF9yZXBsX3MxKSAtICguLi4KICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBeCjxpbmxpbmUgYXNt PjoxOjI6IG5vdGU6IHdoaWxlIGluIG1hY3JvIGluc3RhbnRpYXRpb24KICAgICAgICBBTFRFUk5B VElWRSAiY2FsbCAqZ2VuYXBpYys2NCglcmlwKSIsICJjYWxsIC4iLCBYODZfRkVBVFVSRV9MTQog ICAgICAgIF4KPGluc3RhbnRpYXRpb24+OjE6MTU2OiBlcnJvcjogaW52YWxpZCBzeW1ib2wgcmVk ZWZpbml0aW9uCiAgLi4uLSAoLkwwX29yaWdfZSAtIC5MMF9vcmlnX3MpOyBta25vcHMgKCgtKC5M MF9kaWZmID4gMCkpICogLkwwX2RpZmYpOyAuTDBfb3JpZ19wOgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXgo8 aW5zdGFudGlhdGlvbj46MTg6NTogZXJyb3I6IGludmFsaWQgc3ltYm9sIHJlZGVmaW5pdGlvbgog ICAgLkwwX3JlcGxfczE6IGNhbGwgLjsgLkwwX3JlcGxfZTE6CiAgICBeCjxpbnN0YW50aWF0aW9u PjoxODoyNjogZXJyb3I6IGludmFsaWQgc3ltYm9sIHJlZGVmaW5pdGlvbgogICAgLkwwX3JlcGxf czE6IGNhbGwgLjsgLkwwX3JlcGxfZTE6CiAgICAgICAgICAgICAgICAgICAgICAgICBeCjxpbnN0 YW50aWF0aW9uPjoxOjE6IGVycm9yOiBpbnZhbGlkIHN5bWJvbCByZWRlZmluaXRpb24KLkwwX29y aWdfczogY2FsbCAqZ2VuYXBpYys2NCglcmlwKTsgLkwwX29yaWdfZTogLkwwX2RpZmYgPSAoLkww X3JlcGxfZTEgLSAuTDBfcmVwbF9zMSkgLSAoLi4uCl4KPGluc3RhbnRpYXRpb24+OjE6Mzc6IGVy cm9yOiBpbnZhbGlkIHN5bWJvbCByZWRlZmluaXRpb24KLkwwX29yaWdfczogY2FsbCAqZ2VuYXBp Yys2NCglcmlwKTsgLkwwX29yaWdfZTogLkwwX2RpZmYgPSAoLkwwX3JlcGxfZTEgLSAuTDBfcmVw bF9zMSkgLSAoLi4uCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF4KPGluc3Rh bnRpYXRpb24+OjE6NjA6IGVycm9yOiBpbnZhbGlkIHJlYXNzaWdubWVudCBvZiBub24tYWJzb2x1 dGUgdmFyaWFibGUgJy5MMF9kaWZmJwouTDBfb3JpZ19zOiBjYWxsICpnZW5hcGljKzY0KCVyaXAp OyAuTDBfb3JpZ19lOiAuTDBfZGlmZiA9ICguTDBfcmVwbF9lMSAtIC5MMF9yZXBsX3MxKSAtICgu Li4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBeCjxpbmxpbmUgYXNtPjoxOjI6IG5vdGU6IHdoaWxlIGluIG1hY3JvIGluc3RhbnRpYXRp b24KICAgICAgICBBTFRFUk5BVElWRSAiY2FsbCAqZ2VuYXBpYys2NCglcmlwKSIsICJjYWxsIC4i LCBYODZfRkVBVFVSRV9MTQogICAgICAgIF4KPGluc3RhbnRpYXRpb24+OjE6MTU2OiBlcnJvcjog aW52YWxpZCBzeW1ib2wgcmVkZWZpbml0aW9uCiAgLi4uLSAoLkwwX29yaWdfZSAtIC5MMF9vcmln X3MpOyBta25vcHMgKCgtKC5MMF9kaWZmID4gMCkpICogLkwwX2RpZmYpOyAuTDBfb3JpZ19wOgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgXgo8aW5zdGFudGlhdGlvbj46MTg6NTogZXJyb3I6IGludmFsaWQgc3lt Ym9sIHJlZGVmaW5pdGlvbgogICAgLkwwX3JlcGxfczE6IGNhbGwgLjsgLkwwX3JlcGxfZTE6CiAg ICBeCjxpbnN0YW50aWF0aW9uPjoxODoyNjogZXJyb3I6IGludmFsaWQgc3ltYm9sIHJlZGVmaW5p dGlvbgogICAgLkwwX3JlcGxfczE6IGNhbGwgLjsgLkwwX3JlcGxfZTE6CiAgICAgICAgICAgICAg ICAgICAgICAgICBeCgpGaXhlczogNjdkMDFjZGI1ICgieDg2OiBpbmZyYXN0cnVjdHVyZSB0byBh bGxvdyBjb252ZXJ0aW5nIGNlcnRhaW4gaW5kaXJlY3QgY2FsbHMgdG8gZGlyZWN0IG9uZXMiKQpT aWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KLS0t CkNjOiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVyIDxh bmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNv bT4KLS0tCkNoYW5nZXMgc2luY2UgdjE6CiAtIEZpeCBzdWJqZWN0IGFuZCBjb21taXQgbWVzc2Fn ZS4KLS0tCiB4ZW4vaW5jbHVkZS9hc20teDg2L2FsdGVybmF0aXZlLmggfCA1ICsrLS0tCiAxIGZp bGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3hlbi9pbmNsdWRlL2FzbS14ODYvYWx0ZXJuYXRpdmUuaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYv YWx0ZXJuYXRpdmUuaAppbmRleCA2M2QwYTQ1MGJhLi45MmUzNTgxYmMyIDEwMDY0NAotLS0gYS94 ZW4vaW5jbHVkZS9hc20teDg2L2FsdGVybmF0aXZlLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4 Ni9hbHRlcm5hdGl2ZS5oCkBAIC0yMDIsOSArMjAyLDggQEAgZXh0ZXJuIHZvaWQgYWx0ZXJuYXRp dmVfYnJhbmNoZXModm9pZCk7CiAgICAgcmV0dHlwZSByZXRfOyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAogICAgIHJlZ2lzdGVyIHVuc2lnbmVkIGxv bmcgcjEwXyBhc20oInIxMCIpOyAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICByZWdpc3Rl ciB1bnNpZ25lZCBsb25nIHIxMV8gYXNtKCJyMTEiKTsgICAgICAgICAgICAgICAgICAgICAgICBc Ci0gICAgYXNtIHZvbGF0aWxlIChfX3N0cmluZ2lmeShBTFRFUk5BVElWRSAiY2FsbCAqJWNbYWRk cl0oJSVyaXApIiwgXAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ImNhbGwgLiIsICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFg4Nl9GRUFUVVJFX0FMV0FZUykgICAgICBcCisgICAgYXNtIHZvbGF0aWxl IChBTFRFUk5BVElWRSgiY2FsbCAqJWNbYWRkcl0oJSVyaXApIiwgImNhbGwgLiIsICAgXAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgWDg2X0ZFQVRVUkVfQUxXQVlTKSAgICAgICAgICAg ICAgICAgIFwKICAgICAgICAgICAgICAgICAgIDogQUxUX0NBTEwgIyMgbiAjIyBfT1VULCAiPWEi IChyZXRfKSwgICAgICAgICAgICBcCiAgICAgICAgICAgICAgICAgICAgICI9ciIgKHIxMF8pLCAi PXIiIChyMTFfKSBBU01fQ0FMTF9DT05TVFJBSU5UICAgXAogICAgICAgICAgICAgICAgICAgOiBb YWRkcl0gImkiICgmKGZ1bmMpKSwgImciIChmdW5jKSAgICAgICAgICAgICAgIFwKLS0gCjIuMjAu MSAoQXBwbGUgR2l0LTExNykKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9q ZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVu LWRldmVs