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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F710C4332F for ; Thu, 14 Oct 2021 21:26:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 211E1610EA for ; Thu, 14 Oct 2021 21:26:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 211E1610EA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=axtens.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 5E7346B006C; Thu, 14 Oct 2021 17:26:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 596C26B0071; Thu, 14 Oct 2021 17:26:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45DAA6B0072; Thu, 14 Oct 2021 17:26:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0047.hostedemail.com [216.40.44.47]) by kanga.kvack.org (Postfix) with ESMTP id 356D06B006C for ; Thu, 14 Oct 2021 17:26:28 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id D1A4E2A03D for ; Thu, 14 Oct 2021 21:26:27 +0000 (UTC) X-FDA: 78696326814.25.0581390 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf24.hostedemail.com (Postfix) with ESMTP id 75B23B00009F for ; Thu, 14 Oct 2021 21:26:26 +0000 (UTC) Received: by mail-pj1-f43.google.com with SMTP id om14so5710165pjb.5 for ; Thu, 14 Oct 2021 14:26:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=CLaFJ0M9ufD0uCBwTkgOwQCLYTA2acJBA4tvaXF3j60=; b=nySJqlSwO+ULk3udlcOszY6Ia0XQFeH789zFbu7K9HOE2rbb+01FRBlzqYTOfLe01Y UjBibChKl+lLjdMq7H2G6UmdoL4DkJBBd2xPkhVd/NnmKnnR8gnnU7EkmSiSJ0GL6yHC xyAObJJcyavoFkvMN+kslHElYwm+54tEYY9dA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=CLaFJ0M9ufD0uCBwTkgOwQCLYTA2acJBA4tvaXF3j60=; b=fvKN/iuDLy8ocdJnzcRjvmOK8kUvzH8Dq02SG+IIaHxMZXQxsH4WxXSZSzayMtQwik nhxiiQJV1n/yW3/9c3tAxWi5c8O6l506ACPWtNI9y9pzMPNHnBdO0xp1v9+TVfCKnh5Z ql/w/afUDiMdBNxAICdx6o+EHLdWbXcWgJy7EZJmbFLqwaYdKOQ/8AdKdISuIRxOsR9W ehiQ/0zqo6+VbroWkP4sAzET8e6mzojfN7N6jF/rGfMss8xtAn15WNXc08IxM+QHinYJ X/U5oMpNwD5FQBAEMnX2YPyTbgIUwy+e4e9SYj9NIbTVxsc0d/ycXzzhS0smtABjb8co RBWA== X-Gm-Message-State: AOAM531jFLlNIwXG8LhsCe0CCRjAT15zf9kM7TwExRNVY+maI8mDgeee RYXkc5NgSaAvEFdDoUKKDr5cFQ== X-Google-Smtp-Source: ABdhPJw845LVBzEpWwR4bMZtD/PFJA96pgIe4GSulaOTJBUImwok7XHbH5FT4bUDZgXBEMZc0+GWdQ== X-Received: by 2002:a17:90a:6a8f:: with SMTP id u15mr22641531pjj.212.1634246786410; Thu, 14 Oct 2021 14:26:26 -0700 (PDT) Received: from localhost ([2001:4479:e300:600:4901:2fb9:ed97:3a3e]) by smtp.gmail.com with ESMTPSA id i128sm3261169pfc.47.2021.10.14.14.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 14:26:25 -0700 (PDT) From: Daniel Axtens To: Christophe Leroy , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Arnd Bergmann , Kees Cook , Greg Kroah-Hartman Cc: linux-arch@vger.kernel.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-api@vger.kernel.org Subject: Re: [PATCH v2 01/13] powerpc: Move 'struct ppc64_opd_entry' back into asm/elf.h In-Reply-To: <42d2a571677e60082c0a5b3e52e855aa58c0b1fc.1634190022.git.christophe.leroy@csgroup.eu> References: <42d2a571677e60082c0a5b3e52e855aa58c0b1fc.1634190022.git.christophe.leroy@csgroup.eu> Date: Fri, 15 Oct 2021 08:26:22 +1100 Message-ID: <87czo747sx.fsf@dja-thinkpad.axtens.net> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 75B23B00009F X-Stat-Signature: eskfigrfjmr3uxwximi75x9rf97nrxb8 Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=axtens.net header.s=google header.b=nySJqlSw; spf=pass (imf24.hostedemail.com: domain of dja@axtens.net designates 209.85.216.43 as permitted sender) smtp.mailfrom=dja@axtens.net; dmarc=none X-HE-Tag: 1634246786-798897 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Christophe, > 'struct ppc64_opd_entry' doesn't belong to uapi/asm/elf.h > > It was initially in module_64.c and commit 2d291e902791 ("Fix compile > failure with non modular builds") moved it into asm/elf.h > > But it was by mistake added outside of __KERNEL__ section, > therefore commit c3617f72036c ("UAPI: (Scripted) Disintegrate > arch/powerpc/include/asm") moved it to uapi/asm/elf.h As Michael said on v1, I'm a little nervous about moving it out of uAPI after so long, although I do take the points of Arnd and Kees that we're not breaking compiled binaries, nor should people be using this struct to begin with... I've cc:ed the linux-api@ list. Kind regards, Daniel > Move it back into asm/elf.h, this brings it back in line with > IA64 and PARISC architectures. > > Fixes: 2d291e902791 ("Fix compile failure with non modular builds") > Reviewed-by: Kees Cook > Signed-off-by: Christophe Leroy > --- > arch/powerpc/include/asm/elf.h | 6 ++++++ > arch/powerpc/include/uapi/asm/elf.h | 8 -------- > 2 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h > index b8425e3cfd81..a4406714c060 100644 > --- a/arch/powerpc/include/asm/elf.h > +++ b/arch/powerpc/include/asm/elf.h > @@ -176,4 +176,10 @@ do { \ > /* Relocate the kernel image to @final_address */ > void relocate(unsigned long final_address); > > +/* There's actually a third entry here, but it's unused */ > +struct ppc64_opd_entry { > + unsigned long funcaddr; > + unsigned long r2; > +}; > + > #endif /* _ASM_POWERPC_ELF_H */ > diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h > index 860c59291bfc..308857123a08 100644 > --- a/arch/powerpc/include/uapi/asm/elf.h > +++ b/arch/powerpc/include/uapi/asm/elf.h > @@ -289,12 +289,4 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG]; > /* Keep this the last entry. */ > #define R_PPC64_NUM 253 > > -/* There's actually a third entry here, but it's unused */ > -struct ppc64_opd_entry > -{ > - unsigned long funcaddr; > - unsigned long r2; > -}; > - > - > #endif /* _UAPI_ASM_POWERPC_ELF_H */ > -- > 2.31.1