From owner-dev-commits-src-all@freebsd.org Tue Mar 23 10:57:08 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4C2415AA69D; Tue, 23 Mar 2021 10:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F4SxH6tR4z4gJj; Tue, 23 Mar 2021 10:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD68A1FBA2; Tue, 23 Mar 2021 10:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12NAv7xo080672; Tue, 23 Mar 2021 10:57:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12NAv7vK080671; Tue, 23 Mar 2021 10:57:07 GMT (envelope-from git) Date: Tue, 23 Mar 2021 10:57:07 GMT Message-Id: <202103231057.12NAv7vK080671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: dd426d67647d - stable/13 - MFC 6eb60f5b7f7d: Use the word "LinuxKPI" instead of "Linux compatibility", to not confuse with user-space Linux compatibility support. No functional change. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd426d67647d8c819bf279040a0129af50cbdb66 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2021 10:57:08 -0000 The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=dd426d67647d8c819bf279040a0129af50cbdb66 commit dd426d67647d8c819bf279040a0129af50cbdb66 Author: Hans Petter Selasky AuthorDate: 2021-03-10 11:21:01 +0000 Commit: Hans Petter Selasky CommitDate: 2021-03-23 10:51:04 +0000 MFC 6eb60f5b7f7d: Use the word "LinuxKPI" instead of "Linux compatibility", to not confuse with user-space Linux compatibility support. No functional change. Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit 6eb60f5b7f7df1a59de139260aebfa0aa5f6d79e) --- sys/kern/kern_intr.c | 4 ++-- sys/sys/interrupt.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 0e11af2123e2..41667b57fd4f 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -783,8 +783,8 @@ intr_handler_barrier(struct intr_handler *handler) * Sleep until an ithread finishes executing an interrupt handler. * * XXX Doesn't currently handle interrupt filters or fast interrupt - * handlers. This is intended for compatibility with linux drivers - * only. Do not use in BSD code. + * handlers. This is intended for LinuxKPI drivers only. + * Do not use in BSD code. */ void _intr_drain(int irq) diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h index f1770fe64b0b..56952e45fe75 100644 --- a/sys/sys/interrupt.h +++ b/sys/sys/interrupt.h @@ -190,7 +190,7 @@ int intr_event_resume_handler(void *cookie); int intr_getaffinity(int irq, int mode, void *mask); void *intr_handler_source(void *cookie); int intr_setaffinity(int irq, int mode, void *mask); -void _intr_drain(int irq); /* Linux compat only. */ +void _intr_drain(int irq); /* LinuxKPI only. */ int swi_add(struct intr_event **eventp, const char *name, driver_intr_t handler, void *arg, int pri, enum intr_type flags, void **cookiep);