From: Eric Anholt Subject: [PATCH libdrm 2/6] headers: Sync up some header guard changes from drm-next. Date: Wed, 8 Nov 2017 11:34:43 -0800 Message-ID: <20171108193447.16444-3-eric@anholt.net> References: <20171108193447.16444-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id CCEB16E772 for ; Wed, 8 Nov 2017 19:34:53 +0000 (UTC) In-Reply-To: <20171108193447.16444-1-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBwdWxscyBpbiBwaWVjZXMgb2YgZHJtLW5leHQgZDY1ZDMxMzg4YTIzCigiTWVyZ2UgdGFn ICdkcm0tbWlzYy1uZXh0LWZpeGVzLTIwMTctMTEtMDcnIG9mCmdpdDovL2Fub25naXQuZnJlZWRl c2t0b3Aub3JnL2RybS9kcm0tbWlzYyBpbnRvIGRybS1uZXh0IikKClNpZ25lZC1vZmYtYnk6IEVy aWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+Ci0tLQogaW5jbHVkZS9kcm0vUkVBRE1FICAgICAg ICB8ICA0IC0tLS0KIGluY2x1ZGUvZHJtL21nYV9kcm0uaCAgICAgfCAgOCArKysrKysrKwogaW5j bHVkZS9kcm0vbm91dmVhdV9kcm0uaCB8IDEwICsrKysrKysrKysKIGluY2x1ZGUvZHJtL3F4bF9k cm0uaCAgICAgfCAgOCArKysrKysrKwogaW5jbHVkZS9kcm0vcjEyOF9kcm0uaCAgICB8IDEwICsr KysrKysrKysKIGluY2x1ZGUvZHJtL3NhdmFnZV9kcm0uaCAgfCAxMCArKysrKysrKysrCiBpbmNs dWRlL2RybS9zaXNfZHJtLmggICAgIHwgMTAgKysrKysrKysrKwogaW5jbHVkZS9kcm0vdGVncmFf ZHJtLmggICB8IDE0ICsrKysrKysrKysrLS0tCiBpbmNsdWRlL2RybS92aWFfZHJtLmggICAgIHwg IDggKysrKysrKysKIGluY2x1ZGUvZHJtL3Ztd2dmeF9kcm0uaCAgfCAgOSArKysrKysrKysKIDEw IGZpbGVzIGNoYW5nZWQsIDg0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvaW5jbHVkZS9kcm0vUkVBRE1FIGIvaW5jbHVkZS9kcm0vUkVBRE1FCmluZGV4IDg3MGIw YjViNmE4Ny4uNDdkODA5MjlhOGYxIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9SRUFETUUKKysr IGIvaW5jbHVkZS9kcm0vUkVBRE1FCkBAIC04NiwxMCArODYsNiBAQCBPdXRkYXRlZCBvciBCcm9r ZW4gSGVhZGVycwogVGhpcyBzZWN0aW9uIGNvbnRhaW5zIGEgbGlzdCBvZiBoZWFkZXJzIGFuZCB0 aGUgcmVzcGVjdGl2ZSAiaXNzdWVzIiB0aGV5IG1pZ2h0CiBoYXZlIHJlbGF0aXZlIHRvIHRoZWly IGtlcm5lbCBlcXVpdmFsZW50LgogCi1OZWFybHkgYWxsIGhlYWRlcnM6Ci0gLSBNaXNzaW5nIGV4 dGVybiBDIG5vdGF0aW9uLgotU3RhdHVzOiBUcml2aWFsLgotCiBNb3N0IFVNUyBoZWFkZXJzOgog IC0gTm90IHVzaW5nIGZpeGVkIHNpemUgaW50ZWdlcnMgLSBjb21wYXQgaW9jdGxzIGFyZSBicm9r ZW4uCiBTdGF0dXM6ID8KZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL21nYV9kcm0uaCBiL2luY2x1 ZGUvZHJtL21nYV9kcm0uaAppbmRleCBiNjMwZThmYWQ1NDguLmY1NGU3YTJlOTZhNCAxMDA2NDQK LS0tIGEvaW5jbHVkZS9kcm0vbWdhX2RybS5oCisrKyBiL2luY2x1ZGUvZHJtL21nYV9kcm0uaApA QCAtMzcsNiArMzcsMTAgQEAKIAogI2luY2x1ZGUgImRybS5oIgogCisjaWYgZGVmaW5lZChfX2Nw bHVzcGx1cykKK2V4dGVybiAiQyIgeworI2VuZGlmCisKIC8qIFdBUk5JTkc6IElmIHlvdSBjaGFu Z2UgYW55IG9mIHRoZXNlIGRlZmluZXMsIG1ha2Ugc3VyZSB0byBjaGFuZ2UgdGhlCiAgKiBkZWZp bmVzIGluIHRoZSBYc2VydmVyIGZpbGUgKG1nYV9zYXJlYS5oKQogICovCkBAIC00MTYsNCArNDIw LDggQEAgdHlwZWRlZiBzdHJ1Y3QgZHJtX21nYV9nZXRwYXJhbSB7CiAJdm9pZCAqdmFsdWU7CiB9 IGRybV9tZ2FfZ2V0cGFyYW1fdDsKIAorI2lmIGRlZmluZWQoX19jcGx1c3BsdXMpCit9CisjZW5k aWYKKwogI2VuZGlmCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9ub3V2ZWF1X2RybS5oIGIvaW5j bHVkZS9kcm0vbm91dmVhdV9kcm0uaAppbmRleCBlNDE4ZjlmMzg5OWYuLjU0MmE3MzJiZjA2NSAx MDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vbm91dmVhdV9kcm0uaAorKysgYi9pbmNsdWRlL2RybS9u b3V2ZWF1X2RybS5oCkBAIC0yNyw2ICsyNywxMiBAQAogCiAjZGVmaW5lIE5PVVZFQVVfRFJNX0hF QURFUl9QQVRDSExFVkVMIDE2CiAKKyNpbmNsdWRlICJkcm0uaCIKKworI2lmIGRlZmluZWQoX19j cGx1c3BsdXMpCitleHRlcm4gIkMiIHsKKyNlbmRpZgorCiBzdHJ1Y3QgZHJtX25vdXZlYXVfY2hh bm5lbF9hbGxvYyB7CiAJdWludDMyX3QgICAgIGZiX2N0eGRtYV9oYW5kbGU7CiAJdWludDMyX3Qg ICAgIHR0X2N0eGRtYV9oYW5kbGU7CkBAIC0yMDcsNCArMjEzLDggQEAgc3RydWN0IGRybV9ub3V2 ZWF1X3NhcmVhIHsKICNkZWZpbmUgRFJNX05PVVZFQVVfR0VNX0NQVV9GSU5JICAgICAgIDB4NDMK ICNkZWZpbmUgRFJNX05PVVZFQVVfR0VNX0lORk8gICAgICAgICAgIDB4NDQKIAorI2lmIGRlZmlu ZWQoX19jcGx1c3BsdXMpCit9CisjZW5kaWYKKwogI2VuZGlmIC8qIF9fTk9VVkVBVV9EUk1fSF9f ICovCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9xeGxfZHJtLmggYi9pbmNsdWRlL2RybS9xeGxf ZHJtLmgKaW5kZXggMWUzMzFhODY3YjUzLi5jY2Q4NDFiMTczZjAgMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUvZHJtL3F4bF9kcm0uaAorKysgYi9pbmNsdWRlL2RybS9xeGxfZHJtLmgKQEAgLTI3LDYgKzI3 LDEwIEBACiAjaW5jbHVkZSA8c3RkZGVmLmg+CiAjaW5jbHVkZSAiZHJtLmgiCiAKKyNpZiBkZWZp bmVkKF9fY3BsdXNwbHVzKQorZXh0ZXJuICJDIiB7CisjZW5kaWYKKwogLyogUGxlYXNlIG5vdGUg dGhhdCBtb2RpZmljYXRpb25zIHRvIGFsbCBzdHJ1Y3RzIGRlZmluZWQgaGVyZSBhcmUKICAqIHN1 YmplY3QgdG8gYmFja3dhcmRzLWNvbXBhdGliaWxpdHkgY29uc3RyYWludHMuCiAgKgpAQCAtMTQ5 LDQgKzE1Myw4IEBAIHN0cnVjdCBkcm1fcXhsX2FsbG9jX3N1cmYgewogCURSTV9JT1dSKERSTV9D T01NQU5EX0JBU0UgKyBEUk1fUVhMX0FMTE9DX1NVUkYsXAogCQlzdHJ1Y3QgZHJtX3F4bF9hbGxv Y19zdXJmKQogCisjaWYgZGVmaW5lZChfX2NwbHVzcGx1cykKK30KKyNlbmRpZgorCiAjZW5kaWYK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL3IxMjhfZHJtLmggYi9pbmNsdWRlL2RybS9yMTI4X2Ry bS5oCmluZGV4IGVkZTc4ZmY5ZDQxZi4uYmY0MzFhMDIzMzNkIDEwMDY0NAotLS0gYS9pbmNsdWRl L2RybS9yMTI4X2RybS5oCisrKyBiL2luY2x1ZGUvZHJtL3IxMjhfZHJtLmgKQEAgLTMzLDYgKzMz LDEyIEBACiAjaWZuZGVmIF9fUjEyOF9EUk1fSF9fCiAjZGVmaW5lIF9fUjEyOF9EUk1fSF9fCiAK KyNpbmNsdWRlICJkcm0uaCIKKworI2lmIGRlZmluZWQoX19jcGx1c3BsdXMpCitleHRlcm4gIkMi IHsKKyNlbmRpZgorCiAvKiBXQVJOSU5HOiBJZiB5b3UgY2hhbmdlIGFueSBvZiB0aGVzZSBkZWZp bmVzLCBtYWtlIHN1cmUgdG8gY2hhbmdlIHRoZQogICogZGVmaW5lcyBpbiB0aGUgWCBzZXJ2ZXIg ZmlsZSAocjEyOF9zYXJlYS5oKQogICovCkBAIC0zMjMsNCArMzI5LDggQEAgdHlwZWRlZiBzdHJ1 Y3QgZHJtX3IxMjhfZ2V0cGFyYW0gewogCXZvaWQgKnZhbHVlOwogfSBkcm1fcjEyOF9nZXRwYXJh bV90OwogCisjaWYgZGVmaW5lZChfX2NwbHVzcGx1cykKK30KKyNlbmRpZgorCiAjZW5kaWYKZGlm ZiAtLWdpdCBhL2luY2x1ZGUvZHJtL3NhdmFnZV9kcm0uaCBiL2luY2x1ZGUvZHJtL3NhdmFnZV9k cm0uaAppbmRleCBmN2E3NWVmZjAwN2YuLjI2ZjM4N2I3OGIxNSAxMDA2NDQKLS0tIGEvaW5jbHVk ZS9kcm0vc2F2YWdlX2RybS5oCisrKyBiL2luY2x1ZGUvZHJtL3NhdmFnZV9kcm0uaApAQCAtMjYs NiArMjYsMTIgQEAKICNpZm5kZWYgX19TQVZBR0VfRFJNX0hfXwogI2RlZmluZSBfX1NBVkFHRV9E Uk1fSF9fCiAKKyNpbmNsdWRlICJkcm0uaCIKKworI2lmIGRlZmluZWQoX19jcGx1c3BsdXMpCitl eHRlcm4gIkMiIHsKKyNlbmRpZgorCiAjaWZuZGVmIF9fU0FWQUdFX1NBUkVBX0RFRklORVNfXwog I2RlZmluZSBfX1NBVkFHRV9TQVJFQV9ERUZJTkVTX18KIApAQCAtMjA3LDQgKzIxMyw4IEBAIHVu aW9uIGRybV9zYXZhZ2VfY21kX2hlYWRlciB7CiAJfSBjbGVhcjE7CQkvKiBTQVZBR0VfQ01EX0NM RUFSIGRhdGEgKi8KIH07CiAKKyNpZiBkZWZpbmVkKF9fY3BsdXNwbHVzKQorfQorI2VuZGlmCisK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vc2lzX2RybS5oIGIvaW5jbHVkZS9kcm0v c2lzX2RybS5oCmluZGV4IDMwZjdiMzgyNzQ2Ni4uOGU1MWJiOWE1Y2FjIDEwMDY0NAotLS0gYS9p bmNsdWRlL2RybS9zaXNfZHJtLmgKKysrIGIvaW5jbHVkZS9kcm0vc2lzX2RybS5oCkBAIC0yNyw2 ICsyNywxMiBAQAogI2lmbmRlZiBfX1NJU19EUk1fSF9fCiAjZGVmaW5lIF9fU0lTX0RSTV9IX18K IAorI2luY2x1ZGUgImRybS5oIgorCisjaWYgZGVmaW5lZChfX2NwbHVzcGx1cykKK2V4dGVybiAi QyIgeworI2VuZGlmCisKIC8qIFNpUyBzcGVjaWZpYyBpb2N0bHMgKi8KICNkZWZpbmUgTk9UX1VT RURfMF8zCiAjZGVmaW5lIERSTV9TSVNfRkJfQUxMT0MJMHgwNApAQCAtNjQsNCArNzAsOCBAQCB0 eXBlZGVmIHN0cnVjdCB7CiAJdW5zaWduZWQgaW50IG9mZnNldCwgc2l6ZTsKIH0gZHJtX3Npc19m Yl90OwogCisjaWYgZGVmaW5lZChfX2NwbHVzcGx1cykKK30KKyNlbmRpZgorCiAjZW5kaWYJCQkJ LyogX19TSVNfRFJNX0hfXyAqLwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vdGVncmFfZHJtLmgg Yi9pbmNsdWRlL2RybS90ZWdyYV9kcm0uaAppbmRleCA3YzBmZTBlZDUxMWIuLjEyZjliZjg0OGRi MSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vdGVncmFfZHJtLmgKKysrIGIvaW5jbHVkZS9kcm0v dGVncmFfZHJtLmgKQEAgLTIwLDEwICsyMCwxNCBAQAogICogT1RIRVIgREVBTElOR1MgSU4gVEhF IFNPRlRXQVJFLgogICovCiAKLSNpZm5kZWYgX1VBUElfVEVHUkFfRFJNX0hfCi0jZGVmaW5lIF9V QVBJX1RFR1JBX0RSTV9IXworI2lmbmRlZiBfVEVHUkFfRFJNX0hfCisjZGVmaW5lIF9URUdSQV9E Uk1fSF8KIAotI2luY2x1ZGUgPGRybS5oPgorI2luY2x1ZGUgImRybS5oIgorCisjaWYgZGVmaW5l ZChfX2NwbHVzcGx1cykKK2V4dGVybiAiQyIgeworI2VuZGlmCiAKICNkZWZpbmUgRFJNX1RFR1JB X0dFTV9DUkVBVEVfVElMRUQgICAgICgxIDw8IDApCiAjZGVmaW5lIERSTV9URUdSQV9HRU1fQ1JF QVRFX0JPVFRPTV9VUCAoMSA8PCAxKQpAQCAtMTk4LDQgKzIwMiw4IEBAIHN0cnVjdCBkcm1fdGVn cmFfZ2VtX2dldF9mbGFncyB7CiAjZGVmaW5lIERSTV9JT0NUTF9URUdSQV9HRU1fU0VUX0ZMQUdT IERSTV9JT1dSKERSTV9DT01NQU5EX0JBU0UgKyBEUk1fVEVHUkFfR0VNX1NFVF9GTEFHUywgc3Ry dWN0IGRybV90ZWdyYV9nZW1fc2V0X2ZsYWdzKQogI2RlZmluZSBEUk1fSU9DVExfVEVHUkFfR0VN X0dFVF9GTEFHUyBEUk1fSU9XUihEUk1fQ09NTUFORF9CQVNFICsgRFJNX1RFR1JBX0dFTV9HRVRf RkxBR1MsIHN0cnVjdCBkcm1fdGVncmFfZ2VtX2dldF9mbGFncykKIAorI2lmIGRlZmluZWQoX19j cGx1c3BsdXMpCit9CisjZW5kaWYKKwogI2VuZGlmCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS92 aWFfZHJtLmggYi9pbmNsdWRlL2RybS92aWFfZHJtLmgKaW5kZXggMTgyZjg3OTJmYjQ2Li44YjY5 ZTgxOTdlYjMgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL3ZpYV9kcm0uaAorKysgYi9pbmNsdWRl L2RybS92aWFfZHJtLmgKQEAgLTI2LDYgKzI2LDEwIEBACiAKICNpbmNsdWRlICJkcm0uaCIKIAor I2lmIGRlZmluZWQoX19jcGx1c3BsdXMpCitleHRlcm4gIkMiIHsKKyNlbmRpZgorCiAvKiBXQVJO SU5HOiBUaGVzZSBkZWZpbmVzIG11c3QgYmUgdGhlIHNhbWUgYXMgd2hhdCB0aGUgWHNlcnZlciB1 c2VzLgogICogaWYgeW91IGNoYW5nZSB0aGVtLCB5b3UgbXVzdCBjaGFuZ2UgdGhlIGRlZmluZXMg aW4gdGhlIFhzZXJ2ZXIuCiAgKi8KQEAgLTI3Miw0ICsyNzYsOCBAQCB0eXBlZGVmIHN0cnVjdCBk cm1fdmlhX2RtYWJsaXQgewogCWRybV92aWFfYmxpdHN5bmNfdCBzeW5jOwogfSBkcm1fdmlhX2Rt YWJsaXRfdDsKIAorI2lmIGRlZmluZWQoX19jcGx1c3BsdXMpCit9CisjZW5kaWYKKwogI2VuZGlm CQkJCS8qIF9WSUFfRFJNX0hfICovCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS92bXdnZnhfZHJt LmggYi9pbmNsdWRlL2RybS92bXdnZnhfZHJtLmgKaW5kZXggNWI2OGI0ZDEwODg0Li5kMzI1YTQx MDc5MTYgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL3Ztd2dmeF9kcm0uaAorKysgYi9pbmNsdWRl L2RybS92bXdnZnhfZHJtLmgKQEAgLTMwLDYgKzMwLDEwIEBACiAKICNpbmNsdWRlICJkcm0uaCIK IAorI2lmIGRlZmluZWQoX19jcGx1c3BsdXMpCitleHRlcm4gIkMiIHsKKyNlbmRpZgorCiAjZGVm aW5lIERSTV9WTVdfTUFYX1NVUkZBQ0VfRkFDRVMgNgogI2RlZmluZSBEUk1fVk1XX01BWF9NSVBf TEVWRUxTIDI0CiAKQEAgLTEwODcsNCArMTA5MSw5IEBAIHVuaW9uIGRybV92bXdfZXh0ZW5kZWRf Y29udGV4dF9hcmcgewogCWVudW0gZHJtX3Ztd19leHRlbmRlZF9jb250ZXh0IHJlcTsKIAlzdHJ1 Y3QgZHJtX3Ztd19jb250ZXh0X2FyZyByZXA7CiB9OworCisjaWYgZGVmaW5lZChfX2NwbHVzcGx1 cykKK30KKyNlbmRpZgorCiAjZW5kaWYKLS0gCjIuMTUuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==