From nobody Thu May 09 23:20:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vb7Kp43PXz5KGbt; Thu, 09 May 2024 23:20:46 +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 4Vb7Kp1bgRz44Dl; Thu, 9 May 2024 23:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715296846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38b3c2n52llAcnR8aFzPlFCnLASr+tClrzoDaq/2itg=; b=gnxUMg071EvzvgL+exs8WbO8O52cbw9VMU9gtEubkVWx/GmLmIR2SKknhOKf/n8hT8oZj+ wAa6Lqi9f2b+GqDGyqZbxW8aKxEr0k7brtRwD4ncZQ0Svb9xNA+IQR8Jp/j4C9CLWooW1Z hCHt2HV1HJvsK2Af4Xbrzi9xC5NaMV317/k15qZvSerGXFjHJJeqVX7IdoW13ZTo8kaL50 zNn+ZUJ3WYqCxJmP+oDZni0Hp49PP56RHcL4mz7E5m5j/tmXpq3hGP8blcE+lHnUfueNQz I/xkqbd3M8vO6Ft/tmZXHrmED6VRhU3Lv4c74SRJGGEie9frFrxzdIHcoNgzFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715296846; a=rsa-sha256; cv=none; b=B4LEovBHOFdbxAGTLUKaBqIpGHBhT2lcTeh2xh0jE8gH/b8P1DuCuBJX9xy2+7qLrFlvt7 aRBmEYlb0sFsjFliq+WNb9ClaZk1r590LhAdEDhIwVfAh1XrRx7D48aPI1QdgIUrlQjHq0 Hc9T8JXK86pI3a3LjlPf0DJpbwIgFfka7DdWXJfX+QwefWpMhcDKcQV0ccrebpynVSWx6/ SmreMZRgZMT+MkYokSgWhaK40MBWb/y+q0gN4E9DixDCRpkjayOVsPx4GhU10cIO25WraU 1zQkAUqZchM+AkVTYG/EwEBqZHIB6864LvQ4qkoN7OZjbLp1ifK3gyJVUuOmsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715296846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38b3c2n52llAcnR8aFzPlFCnLASr+tClrzoDaq/2itg=; b=RXaec/KnHQiU8kmB9/z5mUxvEs2Dzy5bJcYJgsGkVkl96CD9rcWdZSt2yVwYQWcR7z8UI7 x3uo8upnc9SeJQ8vk135wzuYb20Qi7d3/tuIZe/ZfGQ3fZcspgG1pB/eAOQ2ohfdaXKdpT iJtnYUnZoXev/m/rO0mRtLsW7biSfG+047cNmeJ8KhEM4E1XK4G3m3doo5u+ID/+87AeL4 oy3pHHoAmD/ORMpJlnDA5yWMkNta3PDX86S9BJTwgNQonbw7SzX0Rg8ADJRoC2D5620NP3 vZHqLd+a2/vnWhKgpWSnoxmGUp8Ti+sAywMya/6ZgLeCFQhBK1C+/ZihggeLLw== 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 4Vb7Kp1CS3z1S3F; Thu, 9 May 2024 23:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 449NKkfv057613; Thu, 9 May 2024 23:20:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 449NKkmO057610; Thu, 9 May 2024 23:20:46 GMT (envelope-from git) Date: Thu, 9 May 2024 23:20:46 GMT Message-Id: <202405092320.449NKkmO057610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a9e0f316b3da - main - kern/intr: redeclare intr_setaffinity()'s third arg constant List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9e0f316b3da4144c654cf77542bc5c51632e896 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a9e0f316b3da4144c654cf77542bc5c51632e896 commit a9e0f316b3da4144c654cf77542bc5c51632e896 Author: Elliott Mitchell AuthorDate: 2024-05-09 23:04:35 +0000 Commit: Warner Losh CommitDate: 2024-05-09 23:14:35 +0000 kern/intr: redeclare intr_setaffinity()'s third arg constant This matches reality and allows removal of a __DECONST(). Fixes: 4c72d075a57 ("LinuxKPI: const argument to irq_set_affinity_hint()") Fixes: 9b33b154b53 ("Add support to cpuset for binding hardware interrupts") Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1126 --- sys/compat/linuxkpi/common/include/linux/interrupt.h | 2 +- sys/kern/kern_intr.c | 4 ++-- sys/sys/interrupt.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/interrupt.h b/sys/compat/linuxkpi/common/include/linux/interrupt.h index d5f9a0ae7a47..dfd9816da8be 100644 --- a/sys/compat/linuxkpi/common/include/linux/interrupt.h +++ b/sys/compat/linuxkpi/common/include/linux/interrupt.h @@ -133,7 +133,7 @@ irq_set_affinity_hint(int vector, const cpumask_t *mask) int error; if (mask != NULL) - error = intr_setaffinity(vector, CPU_WHICH_IRQ, __DECONST(cpumask_t *, mask)); + error = intr_setaffinity(vector, CPU_WHICH_IRQ, mask); else error = intr_setaffinity(vector, CPU_WHICH_IRQ, cpuset_root); diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 928bfabb5c61..9073e0d7af01 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -443,10 +443,10 @@ intr_lookup(int irq) } int -intr_setaffinity(int irq, int mode, void *m) +intr_setaffinity(int irq, int mode, const void *m) { struct intr_event *ie; - cpuset_t *mask; + const cpuset_t *mask; int cpu, n; mask = m; diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h index f3c67e43d428..899d65e386e0 100644 --- a/sys/sys/interrupt.h +++ b/sys/sys/interrupt.h @@ -188,7 +188,7 @@ int intr_event_suspend_handler(void *cookie); 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); +int intr_setaffinity(int irq, int mode, const void *mask); 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,