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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5C2FC677F1 for ; Wed, 18 Jan 2023 14:40:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229880AbjAROkC (ORCPT ); Wed, 18 Jan 2023 09:40:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231181AbjAROjc (ORCPT ); Wed, 18 Jan 2023 09:39:32 -0500 Received: from smtpout.efficios.com (unknown [IPv6:2607:5300:203:b2ee::31e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7691371F31; Wed, 18 Jan 2023 06:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1674052168; bh=s5FTFZUAsofXC14ZekJ4DUIt+9W4vk9LYk+7lyZybVA=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=ijNl1IyUFehlJE6H4lI5IceLmAHRXCeEW2NYwvXoiASmOx8zuxCDPPn1N34o8mxV5 1As/5znwqOdDqpyHj+oGj6bhvGsc987eVdqlltVQOFqTb2g8ZwvrYh1/0eMpjKTTbf 3z3gFmOlmnBUESkt00XjT8RGlLi7qWinU8Y5jKii7KCk/E+X+U/u/qCnFIyh7dJQ2/ wAa7ivo74BWfRZMP7sgDa2sOa2Y9nBVkKerSH/mSvpp9Oa7xPWkrm3EiSWP5pqTuJi AexCW8dy/xwxpRoFKEy5CFrCjD8UO65fxEfND4ua9OTHQGyU6aF+k5t878I7giNd2m MJf6KAaNg2FZw== Received: from [172.16.0.101] (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4Nxp6w2G03zgqQ; Wed, 18 Jan 2023 09:29:28 -0500 (EST) Message-ID: Date: Wed, 18 Jan 2023 09:30:01 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH] KVM: selftests: Fix build of rseq test Content-Language: en-US To: Mark Brown , Paolo Bonzini , Shuah Khan , Peter Zijlstra Cc: Oliver Upton , kvm@vger.kernel.org, linux-kselftest@vger.kernel.org References: <20230106-fix-kvm-rseq-build-v1-1-b704d9831d02@kernel.org> From: Mathieu Desnoyers In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 2023-01-18 08:37, Mark Brown wrote: > On Fri, Jan 06, 2023 at 07:24:19PM +0000, Mark Brown wrote: > >> The KVM rseq test is failing to build in -next due to a commit merged >> from the tip tree which adds a wrapper for sys_getcpu() to the rseq >> kselftests, conflicting with the wrapper already included in the KVM >> selftest: > > Any thoughts on this? The KVM tests are still failing to build > in -next: I'm OK with the fix you submitted in this email thread. Should it be routed through -tip ? Acked-by: Mathieu Desnoyers Thanks, Mathieu > > rseq_test.c:48:13: error: conflicting types for ‘sys_getcpu’ > 48 | static void sys_getcpu(unsigned *cpu) > | ^~~~~~~~~~ > In file included from rseq_test.c:23: > ../rseq/rseq.c:82:12: note: previous definition of ‘sys_getcpu’ was here > 82 | static int sys_getcpu(unsigned *cpu, unsigned *node) > | ^~~~~~~~~~ > > https://storage.kernelci.org/next/master/next-20230118/arm64/defconfig/gcc-10/logs/kselftest.log -- Mathieu Desnoyers EfficiOS Inc. https://www.efficios.com