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=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 CFDA1C31E45 for ; Thu, 13 Jun 2019 16:38:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABD432175B for ; Thu, 13 Jun 2019 16:38:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404080AbfFMQij (ORCPT ); Thu, 13 Jun 2019 12:38:39 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:11951 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392729AbfFMQic (ORCPT ); Thu, 13 Jun 2019 12:38:32 -0400 Received: from anisse-station.iliad.local (unknown [213.36.7.13]) by smtp3-g21.free.fr (Postfix) with ESMTPS id 3D8A813F8F2; Thu, 13 Jun 2019 18:38:05 +0200 (CEST) From: Anisse Astier To: Catalin Marinas , Will Deacon , Dave Martin , linux-arm-kernel@lists.infradead.org Cc: Kristina Martsenko , Richard Henderson , Mark Rutland , linux-kernel@vger.kernel.org, Rich Felker , "Dmitry V . Levin" , Ricardo Salveti , Anisse Astier Subject: [PATCH] arm64/sve: should not depend on Date: Thu, 13 Jun 2019 18:38:01 +0200 Message-Id: <20190613163801.21949-1-aastier@freebox.fr> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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. This fixes an UAPI regression introduced in commit 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support"). Cc: stable@vger.kernel.org Signed-off-by: Anisse Astier --- 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..03b6d6f029fc 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 << 1) /* PR_SVE_VL_INHERIT */ +#define SVE_PT_VL_ONEXEC (1 << 2) /* PR_SVE_SET_VL_ONEXEC */ /* -- 2.19.1