Date: Mon, 3 Oct 2016 20:15:11 +0200 From: Torfinn Ingolfsen <torfinn.ingolfsen@getmail.no> To: freebsd-stable@freebsd.org Subject: Re: aibs(4) / atk0110 support for newer systems Message-ID: <20161003201511.7258687453f12c44a46a361a@getmail.no> In-Reply-To: <7a868c22-e0bd-f677-e4ad-2bdf6f3605d0@FreeBSD.org> References: <86cf8380-ac6f-55f0-f0f8-16000d7f04b2@FreeBSD.org> <20160930145704.4dbc9d90011154b38493964e@getmail.no> <7d498084-ec05-d4c9-5f49-6aef32495caf@FreeBSD.org> <20160930205928.77d7e74f7bd1a35fcf1aa50a@getmail.no> <7a868c22-e0bd-f677-e4ad-2bdf6f3605d0@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Multipart=_Mon__3_Oct_2016_20_15_11_+0200_g5LD_y6Cjh_zPMGO Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Sat, 1 Oct 2016 00:08:15 +0300 Andriy Gapon <avg@FreeBSD.org> wrote: > On 30/09/2016 21:59, Torfinn Ingolfsen wrote: > > As I used '-C' as an argument to patch, there isn't one: > > root@kg-core1# l /sys/dev/acpi_support/atk0110.c.rej > > ls: /sys/dev/acpi_support/atk0110.c.rej: No such file or directory > > Right. So, I guess I have to specifically ask to not use -C option? :-) Sorry for the delay. I was distracted by other things. root@kg-core1# cd / root@kg-core1# patch -p1 < /home/tingo/dl/aibs-ggrp-gitm.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/sys/dev/acpi_support/atk0110.c b/sys/dev/acpi_support/atk0110.c |index e79a0e00e3577..743684100f737 100644 |--- a/sys/dev/acpi_support/atk0110.c |+++ b/sys/dev/acpi_support/atk0110.c -------------------------- Patching file sys/dev/acpi_support/atk0110.c using Plan A... Hunk #1 succeeded at 28. Hunk #2 succeeded at 52. Hunk #3 succeeded at 78. Hunk #4 succeeded at 124. Hunk #5 succeeded at 362. Hunk #6 succeeded at 370. Hunk #7 failed at 391. Hunk #8 succeeded at 435. Hunk #9 succeeded at 450. Hunk #10 failed at 488. 2 out of 10 hunks failed--saving rejects to sys/dev/acpi_support/atk0110.c.rej HTH -- Torfinn Ingolfsen <torfinn.ingolfsen@getmail.no> --Multipart=_Mon__3_Oct_2016_20_15_11_+0200_g5LD_y6Cjh_zPMGO Content-Type: application/octet-stream; name="atk0110.c.rej" Content-Disposition: attachment; filename="atk0110.c.rej" Content-Transfer-Encoding: base64 KioqKioqKioqKioqKioqCioqKiAxOTMsMjY4ICoqKioKICAJCWRldmljZV9wcmludGYoc2MtPnNj X2RldiwgIiVzOiBubyBtZW1iZXJzIGluIHRoZSBwYWNrYWdlXG4iLAogIAkJICAgIG5hbWUpOwog IAkJQWNwaU9zRnJlZShiLlBvaW50ZXIpOwotIAkJcmV0dXJuOwogIAl9CiAgCi0gCWFzID0gbWFs bG9jKHNpemVvZigqYXMpICogbiwgTV9ERVZCVUYsIE1fTk9XQUlUIHwgTV9aRVJPKTsKLSAJaWYg KGFzID09IE5VTEwpIHsKLSAJCWRldmljZV9wcmludGYoc2MtPnNjX2RldiwgIiVzOiBtYWxsb2Mg ZmFpbFxuIiwgbmFtZSk7Ci0gCQlBY3BpT3NGcmVlKGIuUG9pbnRlcik7Ci0gCQlyZXR1cm47Ci0g CX0KICAJc3dpdGNoIChzdCkgewotIAljYXNlIEFJQlNfVk9MVDoKICAJCXNjLT5zY19hc2Vuc192 b2x0ID0gYXM7CiAgCQlicmVhazsKLSAJY2FzZSBBSUJTX1RFTVA6CiAgCQlzYy0+c2NfYXNlbnNf dGVtcCA9IGFzOwogIAkJYnJlYWs7Ci0gCWNhc2UgQUlCU19GQU46CiAgCQlzYy0+c2NfYXNlbnNf ZmFuID0gYXM7CiAgCQlicmVhazsKICAJfQogIAogIAkvKiBzeXNjdGwgc3VidHJlZSBmb3Igc2Vu c29ycyBvZiB0aGlzIHR5cGUgKi8KLSAJc28gPSBTWVNDVExfQUREX05PREUoZGV2aWNlX2dldF9z eXNjdGxfY3R4KHNjLT5zY19kZXYpLAogIAkgICAgU1lTQ1RMX0NISUxEUkVOKGRldmljZV9nZXRf c3lzY3RsX3RyZWUoc2MtPnNjX2RldikpLCBzdCwKICAJICAgIG5vZGUsIENUTEZMQUdfUkQsIE5V TEwsIE5VTEwpOwogIAogIAlmb3IgKGkgPSAwLCBvKys7IGkgPCBuOyBpKyssIG8rKykgewotIAkJ QUNQSV9PQkpFQ1QJKm9pOwotIAkJY2hhcgkJc2lbM107Ci0gCQljb25zdCBjaGFyCSpkZXNjOwot IAotIAkJLyogYWNwaWNhNSBhdXRvbWF0aWNhbGx5IGV2YWx1YXRlcyB0aGUgcmVmZXJlbmNlZCBw YWNrYWdlICovCi0gCQlpZiAob1swXS5UeXBlICE9IEFDUElfVFlQRV9QQUNLQUdFKSB7Ci0gCQkJ ZGV2aWNlX3ByaW50ZihzYy0+c2NfZGV2LAotIAkJCSAgICAiJXM6ICVpOiBub3QgYSBwYWNrYWdl OiAlaSB0eXBlXG4iLAotIAkJCSAgICBuYW1lLCBpLCBvWzBdLlR5cGUpOwotIAkJCWNvbnRpbnVl OwotIAkJfQotIAkJb2kgPSBvWzBdLlBhY2thZ2UuRWxlbWVudHM7Ci0gCQlpZiAob1swXS5QYWNr YWdlLkNvdW50ICE9IDUgfHwKLSAJCSAgICBvaVswXS5UeXBlICE9IEFDUElfVFlQRV9JTlRFR0VS IHx8Ci0gCQkgICAgb2lbMV0uVHlwZSAhPSBBQ1BJX1RZUEVfU1RSSU5HIHx8Ci0gCQkgICAgb2lb Ml0uVHlwZSAhPSBBQ1BJX1RZUEVfSU5URUdFUiB8fAotIAkJICAgIG9pWzNdLlR5cGUgIT0gQUNQ SV9UWVBFX0lOVEVHRVIgfHwKLSAJCSAgICBvaVs0XS5UeXBlICE9IEFDUElfVFlQRV9JTlRFR0VS KSB7Ci0gCQkJZGV2aWNlX3ByaW50ZihzYy0+c2NfZGV2LAotIAkJCSAgICAiJXM6ICVpOiBpbnZh bGlkIHBhY2thZ2VcbiIsCi0gCQkJICAgIG5hbWUsIGkpOwotIAkJCWNvbnRpbnVlOwotIAkJfQot IAkJYXNbaV0uaSA9IG9pWzBdLkludGVnZXIuVmFsdWU7Ci0gCQlkZXNjID0gb2lbMV0uU3RyaW5n LlBvaW50ZXI7Ci0gCQlhc1tpXS5sID0gb2lbMl0uSW50ZWdlci5WYWx1ZTsKLSAJCWFzW2ldLmgg PSBvaVszXS5JbnRlZ2VyLlZhbHVlOwotIAkJYXNbaV0udCA9IHN0OwotICNpZmRlZiBBSUJTX1ZF UkJPU0UKLSAJCWRldmljZV9wcmludGYoc2MtPnNjX2RldiwgIiVjJWk6ICIKLSAJCSAgICAiMHgl MDgiUFJJeDY0IiAlMjBzICU1IlBSSWk2NCIgLyAlNSJQUklpNjQiICAiCi0gCQkgICAgIjB4JSJQ Ukl4NjQiXG4iLAotIAkJICAgIG5hbWVbMF0sIGksCi0gCQkgICAgKHVpbnQ2NF90KWFzW2ldLmks IGRlc2MsIChpbnQ2NF90KWFzW2ldLmwsCi0gCQkgICAgKGludDY0X3QpYXNbaV0uaCwgKHVpbnQ2 NF90KW9pWzRdLkludGVnZXIuVmFsdWUpOwotICNlbmRpZgotIAkJc25wcmludGYoc2ksIHNpemVv ZihzaSksICIlaSIsIGkpOwotIAkJU1lTQ1RMX0FERF9QUk9DKGRldmljZV9nZXRfc3lzY3RsX2N0 eChzYy0+c2NfZGV2KSwKLSAJCSAgICBTWVNDVExfQ0hJTERSRU4oc28pLCBpLCBzaSwgQ1RMVFlQ RV9JTlQgfCBDVExGTEFHX1JELAotIAkJICAgIHNjLCBzdCwgYWlic19zeXNjdGwsIHN0ID09IEFJ QlNfVEVNUCA/ICJJSyIgOiAiSSIsIGRlc2MpOwogIAl9CiAgCiAgCUFjcGlPc0ZyZWUoYi5Qb2lu dGVyKTsKICB9CiAgCiAgc3RhdGljIGludAotLS0gMzkxLDQyNyAtLS0tCiAgCQlkZXZpY2VfcHJp bnRmKHNjLT5zY19kZXYsICIlczogbm8gbWVtYmVycyBpbiB0aGUgcGFja2FnZVxuIiwKICAJCSAg ICBuYW1lKTsKICAJCUFjcGlPc0ZyZWUoYi5Qb2ludGVyKTsKKyAJCXJldHVybiAoRU5YSU8pOzsK ICAJfQogIAorIAlhcyA9IG1hbGxvYyhzaXplb2YoKmFzKSAqIG4sIE1fREVWQlVGLCBNX1dBSVRP SyB8IE1fWkVSTyk7CiAgCXN3aXRjaCAoc3QpIHsKKyAJY2FzZSBBSUJTX1NFTlNfVFlQRV9WT0xU OgogIAkJc2MtPnNjX2FzZW5zX3ZvbHQgPSBhczsKICAJCWJyZWFrOworIAljYXNlIEFJQlNfU0VO U19UWVBFX1RFTVA6CiAgCQlzYy0+c2NfYXNlbnNfdGVtcCA9IGFzOwogIAkJYnJlYWs7CisgCWNh c2UgQUlCU19TRU5TX1RZUEVfRkFOOgogIAkJc2MtPnNjX2FzZW5zX2ZhbiA9IGFzOwogIAkJYnJl YWs7CiAgCX0KICAKICAJLyogc3lzY3RsIHN1YnRyZWUgZm9yIHNlbnNvcnMgb2YgdGhpcyB0eXBl ICovCisgCSpzbyA9IFNZU0NUTF9BRERfTk9ERShkZXZpY2VfZ2V0X3N5c2N0bF9jdHgoc2MtPnNj X2RldiksCiAgCSAgICBTWVNDVExfQ0hJTERSRU4oZGV2aWNlX2dldF9zeXNjdGxfdHJlZShzYy0+ c2NfZGV2KSksIHN0LAogIAkgICAgbm9kZSwgQ1RMRkxBR19SRCwgTlVMTCwgTlVMTCk7CiAgCiAg CWZvciAoaSA9IDAsIG8rKzsgaSA8IG47IGkrKywgbysrKSB7CisgCQljb25zdCBjaGFyCSpkZXNj cjsKKyAKKyAJCWVyciA9IGFpYnNfYWRkX3NlbnNvcihzYywgMCwgJmFzW2ldLCAmZGVzY3IpOwor IAkJaWYgKGVyciA9PSAwKQorIAkJCWFpYnNfc2Vuc29yX2FkZGVkKHNjLCAqc28sIG5vZGUsIGks ICZhc1tpXSwgZGVzY3IpOwogIAl9CiAgCiAgCUFjcGlPc0ZyZWUoYi5Qb2ludGVyKTsKKyAJcmV0 dXJuICgwKTs7CiAgfQogIAogIHN0YXRpYyBpbnQKKioqKioqKioqKioqKioqCioqKiAzMzMsMzU4 ICoqKioKICAJCSAgICAiJXM6ICVpOiBldmFsdWF0aW9uIGZhaWxlZFxuIiwKICAJCSAgICBuYW1l LCBpKTsKICAJCUFDUElfU0VSSUFMX0VORChhaWJzKTsKLSAJCXJldHVybiBFSU87CiAgCX0KICAJ YnAgPSBiLlBvaW50ZXI7CiAgCXYgPSBicC0+SW50ZWdlci5WYWx1ZTsKICAJQWNwaU9zRnJlZShi LlBvaW50ZXIpOwogIAlBQ1BJX1NFUklBTF9FTkQoYWlicyk7CiAgCi0gCXN3aXRjaCAoc3QpIHsK LSAJY2FzZSBBSUJTX1ZPTFQ6CiAgCQlicmVhazsKLSAJY2FzZSBBSUJTX1RFTVA6CiAgCQl2ICs9 IDI3MzE7CiAgCQlsICs9IDI3MzE7CiAgCQloICs9IDI3MzE7CiAgCQlicmVhazsKLSAJY2FzZSBB SUJTX0ZBTjoKICAJCWJyZWFrOwogIAl9CiAgCXNvWzBdID0gdjsKICAJc29bMV0gPSBsOwogIAlz b1syXSA9IGg7Ci0gCXJldHVybiBzeXNjdGxfaGFuZGxlX29wYXF1ZShvaWRwLCAmc28sIHNpemVv ZihzbyksIHJlcSk7CiAgfQotLS0gNDg4LDU3OCAtLS0tCiAgCQkgICAgIiVzOiAlaTogZXZhbHVh dGlvbiBmYWlsZWRcbiIsCiAgCQkgICAgbmFtZSwgaSk7CiAgCQlBQ1BJX1NFUklBTF9FTkQoYWli cyk7CisgCQlyZXR1cm4gKEVJTyk7CiAgCX0KICAJYnAgPSBiLlBvaW50ZXI7CiAgCXYgPSBicC0+ SW50ZWdlci5WYWx1ZTsKICAJQWNwaU9zRnJlZShiLlBvaW50ZXIpOwogIAlBQ1BJX1NFUklBTF9F TkQoYWlicyk7CiAgCisgCXN3aXRjaCAoc2Vuc29yLT50KSB7CisgCWNhc2UgQUlCU19TRU5TX1RZ UEVfVk9MVDoKKyAJCWJyZWFrOworIAljYXNlIEFJQlNfU0VOU19UWVBFX1RFTVA6CisgCQl2ICs9 IDI3MzE7CisgCQlsICs9IDI3MzE7CisgCQloICs9IDI3MzE7CisgCQlicmVhazsKKyAJY2FzZSBB SUJTX1NFTlNfVFlQRV9GQU46CisgCQlicmVhazsKKyAJfQorIAlzb1swXSA9IHY7CisgCXNvWzFd ID0gbDsKKyAJc29bMl0gPSBoOworIAlyZXR1cm4gKHN5c2N0bF9oYW5kbGVfb3BhcXVlKG9pZHAs ICZzbywgc2l6ZW9mKHNvKSwgcmVxKSk7CisgfQorIAorIHN0YXRpYyBpbnQKKyBhaWJzX3N5c2N0 bF9nZ3JwKFNZU0NUTF9IQU5ETEVSX0FSR1MpCisgeworIAlzdHJ1Y3QgYWlic19zb2Z0Ywkqc2Mg PSBhcmcxOworIAlzdHJ1Y3QgYWlic19zZW5zb3IJKnNlbnNvciA9ICh2b2lkICopYXJnMjsKKyAJ QUNQSV9TVEFUVVMJCXJzOworIAlBQ1BJX09CSkVDVAkJcCwgKmJwOworIAlBQ1BJX09CSkVDVF9M SVNUCWFyZzsKKyAJQUNQSV9CVUZGRVIJCWJ1ZjsKKyAJQUNQSV9JTlRFR0VSCQl2LCBsLCBoOwor IAlpbnQJCQlzb1szXTsKKyAJdWludDMyX3QJCSpyZXQ7CisgCXVpbnQzMl90CQljbWRbM107Cisg CisgCWNtZFswXSA9IHNlbnNvci0+aTsKKyAJY21kWzFdID0gMDsKKyAJY21kWzJdID0gMDsKKyAJ cC5UeXBlID0gQUNQSV9UWVBFX0JVRkZFUjsKKyAJcC5CdWZmZXIuUG9pbnRlciA9ICh2b2lkICop Y21kOworIAlwLkJ1ZmZlci5MZW5ndGggPSBzaXplb2YoY21kKTsKKyAJYXJnLkNvdW50ID0gMTsK KyAJYXJnLlBvaW50ZXIgPSAmcDsKKyAJYnVmLlBvaW50ZXIgPSBOVUxMOworIAlidWYuTGVuZ3Ro ID0gQUNQSV9BTExPQ0FURV9CVUZGRVI7CisgCUFDUElfU0VSSUFMX0JFR0lOKGFpYnMpOworIAly cyA9IEFjcGlFdmFsdWF0ZU9iamVjdFR5cGVkKHNjLT5zY19haCwgIkdJVE0iLCAmYXJnLCAmYnVm LAorIAkgICAgQUNQSV9UWVBFX0JVRkZFUik7CisgCUFDUElfU0VSSUFMX0VORChhaWJzKTsKKyAJ aWYgKEFDUElfRkFJTFVSRShycykpIHsKKyAJCWRldmljZV9wcmludGYoc2MtPnNjX2RldiwgIkdJ VE0gZXZhbHVhdGlvbiBmYWlsZWRcbiIpOworIAkJcmV0dXJuIChFSU8pOworIAl9CisgCWJwID0g YnVmLlBvaW50ZXI7CisgCWlmIChicC0+QnVmZmVyLkxlbmd0aCA8IDgpIHsKKyAJCWRldmljZV9w cmludGYoc2MtPnNjX2RldiwgIkdJVE0gcmV0dXJuZWQgc2hvcnQgYnVmZmVyXG4iKTsKKyAJCXJl dHVybiAoRUlPKTsKKyAJfQorIAlyZXQgPSAodWludDMyX3QgKilicC0+QnVmZmVyLlBvaW50ZXI7 CisgCWlmIChyZXRbMF0gPT0gMCkgeworIAkJZGV2aWNlX3ByaW50ZihzYy0+c2NfZGV2LCAiR0lU TSByZXR1cm5lZCBlcnJvciBzdGF0dXNcbiIpOworIAkJcmV0dXJuIChFSU5WQUwpOworIAl9Cisg CXYgPSByZXRbMV07CisgCUFjcGlPc0ZyZWUoYnVmLlBvaW50ZXIpOworIAorIAlsID0gc2Vuc29y LT5sOworIAloID0gc2Vuc29yLT5oOworIAorIAlzd2l0Y2ggKHNlbnNvci0+dCkgeworIAljYXNl IEFJQlNfU0VOU19UWVBFX1ZPTFQ6CiAgCQlicmVhazsKKyAJY2FzZSBBSUJTX1NFTlNfVFlQRV9U RU1QOgogIAkJdiArPSAyNzMxOwogIAkJbCArPSAyNzMxOwogIAkJaCArPSAyNzMxOwogIAkJYnJl YWs7CisgCWNhc2UgQUlCU19TRU5TX1RZUEVfRkFOOgogIAkJYnJlYWs7CiAgCX0KICAJc29bMF0g PSB2OwogIAlzb1sxXSA9IGw7CiAgCXNvWzJdID0gaDsKKyAJcmV0dXJuIChzeXNjdGxfaGFuZGxl X29wYXF1ZShvaWRwLCAmc28sIHNpemVvZihzbyksIHJlcSkpOwogIH0K --Multipart=_Mon__3_Oct_2016_20_15_11_+0200_g5LD_y6Cjh_zPMGO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20161003201511.7258687453f12c44a46a361a>