From nobody Wed Feb 8 00:26:18 2023 X-Original-To: dev-commits-src-all@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 4PBLQL5C99z3p970; Wed, 8 Feb 2023 00:26:18 +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 4PBLQL4PQXz41ZC; Wed, 8 Feb 2023 00:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675815978; 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=cd/RU3Wusx/J4GguSPWhO5mFdz2VTfRYDVg3hD/rTZw=; b=y28Jla3iKsSi4bv5+CsV9zAq2A8FtoYFUgH7DQhBE8YSK6vo0cwmA2g8hy99eE8c1oc+i5 W/OKe1iFffpHlpF5Qgwx7Kk/rJ5dafBTkA/3be2pzA2P0yuiCtbnOOlMs6EEP227pVPP55 P9cnNaM/Vwk4Fu7FZrbTc+DBlrUCVClswyA7R8eSy39mFufORQcM8Nz1j60c9Q/igZ7lno B3VICiaOm/Wdj77KmhiObQDdbSbc0eofmsQ7UVE4VuGFpSRCENwExWZLyVbVd5F5agatlX TRNLoVQBRdHQtbYIpuMD6OeymwThArzeo3lr5ieAxNBqeIlRDVLIrZCAbL1kig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675815978; 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=cd/RU3Wusx/J4GguSPWhO5mFdz2VTfRYDVg3hD/rTZw=; b=cnYahEei9lz3GrbeFWQ4tQeM7hg90MAV88CAUyg9KUX8jOfH2NoKmoU+uwhHduCjbgu21u CnTX59BUouQ0FE1uQLrzd8MqucNaix+SkBotSe9wIRa2Lmgki3OqVbunDLNu9wRJ1CMxtx HeKyBoTWrgAtzCGAiNueKCzBLRqeau+85nCkIjY2lH5NXqCs66cQiKIp5qjBrmc7UfVMWF AojiL1htpelb1/CSgiFf+IWyYCzUhFw0m/kfLbhqm+dZlP5CVLodtN5badH6dFuZMFomEF LWHXFJHa7vl+CoGKeFQvliTpiJIX61a35UStIokOcS4rkKu+J3pY89rs9IbG4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675815978; a=rsa-sha256; cv=none; b=qYlJ0Q03uOmgqLKLSC0UfhU/TFF1OPyZNpWjn1Xhyk7q77jynpplWl6EObDgvqKpRLdgjt rYnnrKvqCHrlSeWqRJzFHrA5xtDaMD485YxbQfGnHyr6jJweRQgSgFzsSE2WVjG8GX9OCv KLdh7j9vkucWbwP+o739QuN0ngomq5zc6cyawwBhFuoNH9bXIDyaiKSX0MavHbDSDjjUod tnUEP1C17KChCHsNxgwL25ii95d4tDzQfRDPeex22/1jAQ7U/IHgzz+jrcypLtrKW8PRN3 fG2IA/LQdLk7cLzQp+ktj48AgAwe1MlZj7i2tXlFWfN4E5Eo3QJkvYorUABsjQ== 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 4PBLQL2qTYzckL; Wed, 8 Feb 2023 00:26:18 +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 3180QIuW096176; Wed, 8 Feb 2023 00:26:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3180QIJd096175; Wed, 8 Feb 2023 00:26:18 GMT (envelope-from git) Date: Wed, 8 Feb 2023 00:26:18 GMT Message-Id: <202302080026.3180QIJd096175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: e894da6d9a1d - stable/13 - irdma(4): hide tasklet-related definitions to avoid redefines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e894da6d9a1d3a96bdac5f330c3c94d75be8f83b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=e894da6d9a1d3a96bdac5f330c3c94d75be8f83b commit e894da6d9a1d3a96bdac5f330c3c94d75be8f83b Author: Bartosz Sobczak AuthorDate: 2023-01-23 10:17:53 +0000 Commit: Eric Joyner CommitDate: 2023-02-08 00:24:01 +0000 irdma(4): hide tasklet-related definitions to avoid redefines checking if either from_tasklet or tasklet_setup exists before defining irdma's own version. This is a result of changes introduced in: f2978460c7fd ("LinuxKPI: tasklet add (*callback) support", 2022-11-08) The code should be kept until the from_timer and tasklet_setup is defined in linuxkpi's interrupt.h This is a direct commit to the stable/13 branch. Signed-off-by: Bartosz Sobczak Signed-off-by: Eric Joyner --- sys/dev/irdma/fbsd_kcompat.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/irdma/fbsd_kcompat.h b/sys/dev/irdma/fbsd_kcompat.h index 179229d6be03..60be5e74d91d 100644 --- a/sys/dev/irdma/fbsd_kcompat.h +++ b/sys/dev/irdma/fbsd_kcompat.h @@ -40,12 +40,15 @@ #define TASKLET_DATA_TYPE unsigned long #define TASKLET_FUNC_TYPE void (*)(TASKLET_DATA_TYPE) +#ifndef tasklet_setup #define tasklet_setup(tasklet, callback) \ tasklet_init((tasklet), (TASKLET_FUNC_TYPE)(callback), \ (TASKLET_DATA_TYPE)(tasklet)) - +#endif +#ifndef from_tasklet #define from_tasklet(var, callback_tasklet, tasklet_fieldname) \ container_of(callback_tasklet, typeof(*var), tasklet_fieldname) +#endif #define IRDMA_SET_RDMA_OBJ_SIZE(ib_struct, drv_struct, member) \ (sizeof(struct drv_struct) + \