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=-13.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 73803C31E4B for ; Fri, 14 Jun 2019 16:48:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 481CA217F9 for ; Fri, 14 Jun 2019 16:48:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CzmUm//x" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 481CA217F9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=freebox.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LXBSs1jdwJYwdyjEqIywOOnDof8yWxomNGiSUpaRBNI=; b=CzmUm//xOMIql2 vSm4gf8hOzBvBDULvCOtg4UdYB+h8703PVnLGsD1Zb4iE0RoMAqwUbesqo7c5EaN2qTGfigEDGU1O lLVMZnEmHMAz2UjsER7s5m6aMlPBJ98iKfJ2dBw/PrHqYhHH8B9rGxLnWd3Er/OpC63wLhp26NjUB 2iINwnCGiLUSAp5dom02ZWzgCEwzbNRPw46Elpz2UM2324nUKnm80vbA772JevI8APRS2+uhgq4o1 JAGIsSoN2ZaNc1+QIQrAcnfSHdj3Ux1xijuwI/z1jP0PWr2RW5v8WFFSlxaTi2G23PFKXbVhRARFm Vcyc7Dw6/9HKB8UfqkVQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hbpNQ-0006AD-Fe; Fri, 14 Jun 2019 16:48:32 +0000 Received: from smtp3-g21.free.fr ([2a01:e0c:1:1599::12]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hbpLW-0003lZ-7b for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2019 16:46:36 +0000 Received: from anisse-station.iliad.local (unknown [213.36.7.13]) by smtp3-g21.free.fr (Postfix) with ESMTPS id 2882B13F8B6; Fri, 14 Jun 2019 18:46:03 +0200 (CEST) From: Anisse Astier To: Will Deacon , Dave Martin , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] arm64/sve: should not depend on Date: Fri, 14 Jun 2019 18:46:00 +0200 Message-Id: <20190614164600.36966-1-aastier@freebox.fr> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190613163801.21949-1-aastier@freebox.fr> References: <20190613163801.21949-1-aastier@freebox.fr> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190614_094634_447799_AE143B15 X-CRM114-Status: UNSURE ( 9.77 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Anisse Astier , Catalin Marinas , Rich Felker , linux-kernel@vger.kernel.org, Kristina Martsenko , "Dmitry V . Levin" , Ricardo Salveti , Richard Henderson Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Otherwise this will create userspace build issues for any program (strace, qemu) that includes both (with musl libc) and (which then includes ), like this: error: redefinition of 'struct prctl_mm_map' struct prctl_mm_map { See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 for a public example of people working around this issue. Copying the defines is a bit imperfect here, but better than creating a whole other header for just two defines that would never change, as part of the kernel ABI. Fixes: 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support") Cc: stable@vger.kernel.org Signed-off-by: Anisse Astier --- Changes since v1: - made a bit more explicit that we copied defined symbols, in commit and code. - Use Fixes: tag in commit message Thanks to Dave Martin and Will Deacon for the review. --- arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h index d78623acb649..438759e7e8a7 100644 --- a/arch/arm64/include/uapi/asm/ptrace.h +++ b/arch/arm64/include/uapi/asm/ptrace.h @@ -65,8 +65,6 @@ #ifndef __ASSEMBLY__ -#include - /* * User structures for general purpose, floating point and debug registers. */ @@ -113,10 +111,10 @@ struct user_sve_header { /* * Common SVE_PT_* flags: - * These must be kept in sync with prctl interface in + * These must be kept in sync with prctl interface in */ -#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) -#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) +#define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_VL_INHERIT */ >> 16) +#define SVE_PT_VL_ONEXEC ((1 << 18) /* PR_SVE_SET_VL_ONEXEC */ >> 16) /* -- 2.19.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel