From mboxrd@z Thu Jan  1 00:00:00 1970
From: kaih.linux@gmail.com
Subject: [PATCH] xen: x86: remove duplicated
	IA32_FEATURE_CONTROL MSR macro
Date: Fri, 24 Jun 2016 22:45:07 +1200
Message-ID: <1466765107-29077-1-git-send-email-kai.huang@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <xen-devel-bounces@lists.xen.org>
List-Unsubscribe: <http://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: <http://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: jbeulich@suse.com, andrew.cooper3@citrix.com, kevin.tian@intel.com, xen-devel@lists.xen.org
Cc: Kai Huang <kai.huang@linux.intel.com>
List-Id: xen-devel@lists.xenproject.org

RnJvbTogS2FpIEh1YW5nIDxrYWkuaHVhbmdAbGludXguaW50ZWwuY29tPgoKQmVsb3cgY29tbWl0
IGludHJvZHVjZWQgYSBuZXcgbWFjcm8gTVNSX0lBMzJfRkVBVFVSRV9DT05UUk9MIGZvcgpJQTMy
X0ZFQVRVUkVfQ09OVFJPTCBNU1IgYnV0IGl0IGRpZG4ndCByZW1vdmUgb2xkIElBMzJfRkVBVFVS
RV9DT05UUk9MX01TUgptYWNyby4gVGhlIG5ldyBvbmUgaGFzIGJldHRlciBuYW1pbmcgY29udmVu
dGlvbiwgc28gcmVtb3ZlIHRoZSBvbGQgYXMKZHVwbGljYXRpb24gYW5kIHJlcGxhY2UgdGhlIHJl
bGV2YW50IGNvZGUgd2l0aCBuZXcgb25lLgoKICAgIG13YWl0LWlkbGU6IHByZXZlbnQgU0tMLUgg
Ym9vdCBmYWlsdXJlIHdoZW4gQzgrQzkrQzEwIGVuYWJsZWQKCiAgICBTb21lIFNLTC1IIGNvbmZp
Z3VyYXRpb25zIHJlcXVpcmUgIm1heF9jc3RhdGU9NyIgdG8gYm9vdC4KICAgIFdoaWxlIHRoYXQg
aXMgYW4gZWZmZWN0aXZlIHdvcmthcm91bmQsIGl0IGRpc2FibGVzIEMxMC4KCiAgICAuLi4uLi4K
CkFib3ZlIGNvbW1pdCBhbHNvIHVzZWQgU0dYX0VOQUJMRSAoYml0IDE4KSBpbiBJQTMyX0ZFQVRV
UkVfQ09OVFJPTCBNU1Igd2l0aG91dCBhCm1hY3JvIGZvciBpdC4gQSBuZXcgbWFjcm8gSUEzMl9G
RUFUVVJFX0NPTlRST0xfTVNSX1NHWF9FTkFCTEUgaXMgYWxzbyBhZGRlZCBmb3IKYmV0dGVyIGNv
ZGUgYW5kIGZ1dHVyZSB1c2UuCgpTaWduZWQtb2ZmLWJ5OiBLYWkgSHVhbmcgPGthaS5odWFuZ0Bs
aW51eC5pbnRlbC5jb20+Ci0tLQogeGVuL2FyY2gveDg2L2NwdS9td2FpdC1pZGxlLmMgICB8IDIg
Ky0KIHhlbi9hcmNoL3g4Ni9odm0vdm14L3ZtY3MuYyAgICAgfCA0ICsrLS0KIHhlbi9hcmNoL3g4
Ni9odm0vdm14L3ZteC5jICAgICAgfCA0ICsrLS0KIHhlbi9hcmNoL3g4Ni9odm0vdm14L3Z2bXgu
YyAgICAgfCAyICstCiB4ZW4vaW5jbHVkZS9hc20teDg2L21zci1pbmRleC5oIHwgNCArKy0tCiA1
IGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n
aXQgYS94ZW4vYXJjaC94ODYvY3B1L213YWl0LWlkbGUuYyBiL3hlbi9hcmNoL3g4Ni9jcHUvbXdh
aXQtaWRsZS5jCmluZGV4IGUwNjJlMjEuLmQ2NDg4ZjcgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4
Ni9jcHUvbXdhaXQtaWRsZS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9jcHUvbXdhaXQtaWRsZS5jCkBA
IC0xMDA2LDcgKzEwMDYsNyBAQCBzdGF0aWMgdm9pZCBfX2luaXQgc2tsaF9pZGxlX3N0YXRlX3Rh
YmxlX3VwZGF0ZSh2b2lkKQogCQlyZG1zcmwoTVNSX0lBMzJfRkVBVFVSRV9DT05UUk9MLCBtc3Ip
OwogCiAJCS8qIGlmIFNHWCBpcyBlbmFibGVkICovCi0JCWlmIChtc3IgJiAoMSA8PCAxOCkpCisJ
CWlmIChtc3IgJiBJQTMyX0ZFQVRVUkVfQ09OVFJPTF9NU1JfU0dYX0VOQUJMRSkKIAkJCXJldHVy
bjsKIAl9CiAKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdm14L3ZtY3MuYyBiL3hlbi9h
cmNoL3g4Ni9odm0vdm14L3ZtY3MuYwppbmRleCA4NDhhYzMzLi4zM2Q4M2ZjIDEwMDY0NAotLS0g
YS94ZW4vYXJjaC94ODYvaHZtL3ZteC92bWNzLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS92bXgv
dm1jcy5jCkBAIC02MDQsNyArNjA0LDcgQEAgaW50IHZteF9jcHVfdXAodm9pZCkKICAgICAgICAg
cmV0dXJuIC1FSU5WQUw7CiAgICAgfQogCi0gICAgcmRtc3IoSUEzMl9GRUFUVVJFX0NPTlRST0xf
TVNSLCBlYXgsIGVkeCk7CisgICAgcmRtc3IoTVNSX0lBMzJfRkVBVFVSRV9DT05UUk9MLCBlYXgs
IGVkeCk7CiAKICAgICBiaW9zX2xvY2tlZCA9ICEhKGVheCAmIElBMzJfRkVBVFVSRV9DT05UUk9M
X01TUl9MT0NLKTsKICAgICBpZiAoIGJpb3NfbG9ja2VkICkKQEAgLTYyMyw3ICs2MjMsNyBAQCBp
bnQgdm14X2NwdV91cCh2b2lkKQogICAgICAgICBlYXggfD0gSUEzMl9GRUFUVVJFX0NPTlRST0xf
TVNSX0VOQUJMRV9WTVhPTl9PVVRTSURFX1NNWDsKICAgICAgICAgaWYgKCB0ZXN0X2JpdChYODZf
RkVBVFVSRV9TTVgsICZib290X2NwdV9kYXRhLng4Nl9jYXBhYmlsaXR5KSApCiAgICAgICAgICAg
ICBlYXggfD0gSUEzMl9GRUFUVVJFX0NPTlRST0xfTVNSX0VOQUJMRV9WTVhPTl9JTlNJREVfU01Y
OwotICAgICAgICB3cm1zcihJQTMyX0ZFQVRVUkVfQ09OVFJPTF9NU1IsIGVheCwgMCk7CisgICAg
ICAgIHdybXNyKE1TUl9JQTMyX0ZFQVRVUkVfQ09OVFJPTCwgZWF4LCAwKTsKICAgICB9CiAKICAg
ICBpZiAoIChyYyA9IHZteF9pbml0X3ZtY3NfY29uZmlnKCkpICE9IDAgKQpkaWZmIC0tZ2l0IGEv
eGVuL2FyY2gveDg2L2h2bS92bXgvdm14LmMgYi94ZW4vYXJjaC94ODYvaHZtL3ZteC92bXguYwpp
bmRleCA1NGNkYjg2Li5jMjNiMWU5IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZteC92
bXguYworKysgYi94ZW4vYXJjaC94ODYvaHZtL3ZteC92bXguYwpAQCAtMjYyMiw3ICsyNjIyLDcg
QEAgc3RhdGljIGludCB2bXhfbXNyX3JlYWRfaW50ZXJjZXB0KHVuc2lnbmVkIGludCBtc3IsIHVp
bnQ2NF90ICptc3JfY29udGVudCkKICAgICBjYXNlIE1TUl9JQTMyX0RFQlVHQ1RMTVNSOgogICAg
ICAgICBfX3ZtcmVhZChHVUVTVF9JQTMyX0RFQlVHQ1RMLCBtc3JfY29udGVudCk7CiAgICAgICAg
IGJyZWFrOwotICAgIGNhc2UgSUEzMl9GRUFUVVJFX0NPTlRST0xfTVNSOgorICAgIGNhc2UgTVNS
X0lBMzJfRkVBVFVSRV9DT05UUk9MOgogICAgIGNhc2UgTVNSX0lBMzJfVk1YX0JBU0lDLi4uTVNS
X0lBMzJfVk1YX1ZNRlVOQzoKICAgICAgICAgaWYgKCAhbnZteF9tc3JfcmVhZF9pbnRlcmNlcHQo
bXNyLCBtc3JfY29udGVudCkgKQogICAgICAgICAgICAgZ290byBncF9mYXVsdDsKQEAgLTI4NDgs
NyArMjg0OCw3IEBAIHN0YXRpYyBpbnQgdm14X21zcl93cml0ZV9pbnRlcmNlcHQodW5zaWduZWQg
aW50IG1zciwgdWludDY0X3QgbXNyX2NvbnRlbnQpCiAKICAgICAgICAgYnJlYWs7CiAgICAgfQot
ICAgIGNhc2UgSUEzMl9GRUFUVVJFX0NPTlRST0xfTVNSOgorICAgIGNhc2UgTVNSX0lBMzJfRkVB
VFVSRV9DT05UUk9MOgogICAgIGNhc2UgTVNSX0lBMzJfVk1YX0JBU0lDLi4uTVNSX0lBMzJfVk1Y
X1RSVUVfRU5UUllfQ1RMUzoKICAgICAgICAgaWYgKCAhbnZteF9tc3Jfd3JpdGVfaW50ZXJjZXB0
KG1zciwgbXNyX2NvbnRlbnQpICkKICAgICAgICAgICAgIGdvdG8gZ3BfZmF1bHQ7CmRpZmYgLS1n
aXQgYS94ZW4vYXJjaC94ODYvaHZtL3ZteC92dm14LmMgYi94ZW4vYXJjaC94ODYvaHZtL3ZteC92
dm14LmMKaW5kZXggYzZhMzllOS4uNGI5ZWM2YSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2
bS92bXgvdnZteC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vdm14L3Z2bXguYwpAQCAtMTk0MSw3
ICsxOTQxLDcgQEAgaW50IG52bXhfbXNyX3JlYWRfaW50ZXJjZXB0KHVuc2lnbmVkIGludCBtc3Is
IHU2NCAqbXNyX2NvbnRlbnQpCiAgICAgICAgIGRhdGEgPSBnZW5fdm14X21zcihkYXRhLCBWTVhf
RU5UUllfQ1RMU19ERUZBVUxUMSwgaG9zdF9kYXRhKTsKICAgICAgICAgYnJlYWs7CiAKLSAgICBj
YXNlIElBMzJfRkVBVFVSRV9DT05UUk9MX01TUjoKKyAgICBjYXNlIE1TUl9JQTMyX0ZFQVRVUkVf
Q09OVFJPTDoKICAgICAgICAgZGF0YSA9IElBMzJfRkVBVFVSRV9DT05UUk9MX01TUl9MT0NLIHwg
CiAgICAgICAgICAgICAgICBJQTMyX0ZFQVRVUkVfQ09OVFJPTF9NU1JfRU5BQkxFX1ZNWE9OX09V
VFNJREVfU01YOwogICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14
ODYvbXNyLWluZGV4LmggYi94ZW4vaW5jbHVkZS9hc20teDg2L21zci1pbmRleC5oCmluZGV4IGUw
ZjdmOGQuLjU5NjJjYmYgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvbXNyLWluZGV4
LmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9tc3ItaW5kZXguaApAQCAtMTMzLDEyICsxMzMs
MTMgQEAKICNkZWZpbmUgTVNSX0lBMzJfVk1YX1RSVUVfRVhJVF9DVExTICAgICAgICAgICAgIDB4
NDhmCiAjZGVmaW5lIE1TUl9JQTMyX1ZNWF9UUlVFX0VOVFJZX0NUTFMgICAgICAgICAgICAweDQ5
MAogI2RlZmluZSBNU1JfSUEzMl9WTVhfVk1GVU5DICAgICAgICAgICAgICAgICAgICAgMHg0OTEK
LSNkZWZpbmUgSUEzMl9GRUFUVVJFX0NPTlRST0xfTVNSICAgICAgICAgICAgICAgIDB4M2EKKyNk
ZWZpbmUgTVNSX0lBMzJfRkVBVFVSRV9DT05UUk9MICAgICAgICAgICAgICAgIDB4M2EKICNkZWZp
bmUgSUEzMl9GRUFUVVJFX0NPTlRST0xfTVNSX0xPQ0sgICAgICAgICAgICAgICAgICAgICAweDAw
MDEKICNkZWZpbmUgSUEzMl9GRUFUVVJFX0NPTlRST0xfTVNSX0VOQUJMRV9WTVhPTl9JTlNJREVf
U01YICAweDAwMDIKICNkZWZpbmUgSUEzMl9GRUFUVVJFX0NPTlRST0xfTVNSX0VOQUJMRV9WTVhP
Tl9PVVRTSURFX1NNWCAweDAwMDQKICNkZWZpbmUgSUEzMl9GRUFUVVJFX0NPTlRST0xfTVNSX1NF
TlRFUl9QQVJBTV9DVEwgICAgICAgICAweDdmMDAKICNkZWZpbmUgSUEzMl9GRUFUVVJFX0NPTlRS
T0xfTVNSX0VOQUJMRV9TRU5URVIgICAgICAgICAgICAweDgwMDAKKyNkZWZpbmUgSUEzMl9GRUFU
VVJFX0NPTlRST0xfTVNSX1NHWF9FTkFCTEUgICAgICAgICAgICAgICAweDQwMDAwCiAKIC8qIEs3
L0s4IE1TUnMuIE5vdCBjb21wbGV0ZS4gU2VlIHRoZSBhcmNoaXRlY3R1cmUgbWFudWFsIGZvciBh
IG1vcmUKICAgIGNvbXBsZXRlIGxpc3QuICovCkBAIC0yODgsNyArMjg5LDYgQEAKICNkZWZpbmUg
TVNSX0lBMzJfUExBVEZPUk1fSUQJCTB4MDAwMDAwMTcKICNkZWZpbmUgTVNSX0lBMzJfRUJMX0NS
X1BPV0VST04JCTB4MDAwMDAwMmEKICNkZWZpbmUgTVNSX0lBMzJfRUJDX0ZSRVFVRU5DWV9JRAkw
eDAwMDAwMDJjCi0jZGVmaW5lIE1TUl9JQTMyX0ZFQVRVUkVfQ09OVFJPTAkweDAwMDAwMDNhCiAj
ZGVmaW5lIE1TUl9JQTMyX1RTQ19BREpVU1QJCTB4MDAwMDAwM2IKIAogI2RlZmluZSBNU1JfSUEz
Ml9BUElDQkFTRQkJMHgwMDAwMDAxYgotLSAKMi43LjQKCgpfX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl
bEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=