From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10BA7C31E5C for ; Mon, 17 Jun 2019 21:21:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF1E72133F for ; Mon, 17 Jun 2019 21:21:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806476; bh=oAUOUWEhdKBN4khXPD+Q8RvK53Yw50WUgHO41gXbvZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vCZyfyprm+UahHS0u/XBXbWGVdF1PZgqgqVlTGI0udWLyPvP/bU3vKinyak9OgYE4 yastZWyRmR2kmk+dfPcBa9Mg25JYFMqOqzXliYmmDZPk7v98uIyBsEFDRNGIgI+M9+ 12NGef/FgJhRaZsmuzycL/0NHBRv3lhM9Y4n1vpA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729321AbfFQVVP (ORCPT ); Mon, 17 Jun 2019 17:21:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:45728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729310AbfFQVVN (ORCPT ); Mon, 17 Jun 2019 17:21:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CAD742089E; Mon, 17 Jun 2019 21:21:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806473; bh=oAUOUWEhdKBN4khXPD+Q8RvK53Yw50WUgHO41gXbvZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BSl7637gm1bFzFXIxbp/U0hGqCHTogMlwhqgVaHacsexa6W2poljtI8qc7MoiIfds sBKIjmF5Dq4RkZLj9XBRvx1996ZLKqdIMsJaDyfbR0iqSEqRV/74sPzyRq3Q/9fxa3 cnFdzItXJAV42m4E4JbB0cvb9EzT9M+O5fd5bd2k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Sasha Levin Subject: [PATCH 5.1 064/115] selftests/bpf: fix bpf_get_current_task Date: Mon, 17 Jun 2019 23:09:24 +0200 Message-Id: <20190617210803.459510549@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210759.929316339@linuxfoundation.org> References: <20190617210759.929316339@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 7ed4b4e60bb1dd3df7a45dfbde3a96efce9df7eb ] Fix bpf_get_current_task() declaration. Signed-off-by: Alexei Starovoitov Acked-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/bpf_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h index c81fc350f7ad..a43a52cdd3f0 100644 --- a/tools/testing/selftests/bpf/bpf_helpers.h +++ b/tools/testing/selftests/bpf/bpf_helpers.h @@ -246,7 +246,7 @@ static int (*bpf_skb_change_type)(void *ctx, __u32 type) = (void *) BPF_FUNC_skb_change_type; static unsigned int (*bpf_get_hash_recalc)(void *ctx) = (void *) BPF_FUNC_get_hash_recalc; -static unsigned long long (*bpf_get_current_task)(void *ctx) = +static unsigned long long (*bpf_get_current_task)(void) = (void *) BPF_FUNC_get_current_task; static int (*bpf_skb_change_tail)(void *ctx, __u32 len, __u64 flags) = (void *) BPF_FUNC_skb_change_tail; -- 2.20.1