From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10AFD138334 for ; Thu, 12 Sep 2019 21:50:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB26CE0C7C; Thu, 12 Sep 2019 21:50:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C288AE0C7C for ; Thu, 12 Sep 2019 21:50:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 028DB34B0E5 for ; Thu, 12 Sep 2019 21:50:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89B547E9 for ; Thu, 12 Sep 2019 21:50:15 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1568325001.f2ab1916a056a89be7653b446502e0f4b5ab0c0e.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs-kmod/zfs-kmod-9999.ebuild X-VCS-Directories: sys-fs/zfs-kmod/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: f2ab1916a056a89be7653b446502e0f4b5ab0c0e X-VCS-Branch: master Date: Thu, 12 Sep 2019 21:50:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1eff7733-5999-469e-a414-8a31665453ba X-Archives-Hash: c28099b20baef09c27a10135fcc8a28c commit: f2ab1916a056a89be7653b446502e0f4b5ab0c0e Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Sep 12 21:44:50 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Sep 12 21:50:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ab1916 sys-fs/zfs-kmod: require !PREEMPT on arm64 only on >= 5.x kernels Bug: https://bugs.gentoo.org/693912 Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index a8669aea640..74333803107 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -63,7 +63,9 @@ pkg_setup() { DEVTMPFS " - use arm64 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT" + if use arm64; then + kernel_is -ge 5 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT" + fi kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"