From patchwork Mon Jan 7 23:38:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154952 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4241356jaa; Mon, 7 Jan 2019 15:41:44 -0800 (PST) X-Google-Smtp-Source: ALg8bN77L51ae2DaFk/w3WKJfmAd4DkjOr6TvURSzAmzhTUQoBjzMC7tSh/6HaBJkEDGHipK1edd X-Received: by 2002:a17:902:4601:: with SMTP id o1mr37635828pld.243.1546904504136; Mon, 07 Jan 2019 15:41:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546904504; cv=none; d=google.com; s=arc-20160816; b=myUOE3CHqUlzNEmNfe45tULSZOXmnvdnfYvxSIquMjItoZMhVYC+Br5YgoPkrwCW/s MpEhGYAODmMUPSso+F2ZB0rQVPAkxgktz2XKL1gmcXBLc6cg93j3tP4QIrVFqiwUuseO e2M33bTeF9YEdrwb18V5z8Qn1sKfIDIoxLdXIO6gULctl8zk0Uwm/Ye+zLkF6JN5rQtf SuclRHOhk4pzUWOBFMqSvcsnMWzYlyQ+QvsGjPqj1hm4fgrms07iYh6ZVf8mtHoNSQzj QXA6tGFB0mAV5nVCJwB52y7fFlYtecLqqjyvnzxfpHFg/+OOOEJHARYb5Q0ui9igBP/3 pzLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=/YEFGu+SBlUdtiWVLWe7ax+bI2tOxreGEJ7URmQvSxc=; b=ccz3cC6ZMij+IUQYpFuxrPwYalr65w0J8pLbvdZqm3/tp9NV/25kE68ZVZIuLH8enQ ngNX1bZkaA0EX5fylWqQBnkt3MALfFHb5SL/mYhV70bgv03/F7aFhx9C+bW/dWJOSoEU I+PxzUFQQd6X3e5ogK98P8prJSCdhU0MwxlUKwBByY4AHwuj/gwUp3yr3HkN1HuaHZp4 ux30moGNdWRIIspPo+3skgmCQV+gnVkfY4sthbgwhOyfnsjcumzNOLPA5F7eccaNUVdf 5bACmLUztLl6j0EXYzdo+6Qi/NbnhdaDWFgjUIEiogT7kaB636KI7hFrfFEIcYvy/yk/ 17cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=mfEN9aPF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 4si65718438pfg.280.2019.01.07.15.41.43; Mon, 07 Jan 2019 15:41:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=mfEN9aPF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727177AbfAGXlm (ORCPT + 31 others); Mon, 7 Jan 2019 18:41:42 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:55358 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726667AbfAGXlm (ORCPT ); Mon, 7 Jan 2019 18:41:42 -0500 X-Greylist: delayed 77487 seconds by postgrey-1.27 at vger.kernel.org; Mon, 07 Jan 2019 18:41:40 EST Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-08.nifty.com with ESMTP id x07NcoMo005312; Tue, 8 Jan 2019 08:38:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x07NcoMo005312 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1546904332; bh=/YEFGu+SBlUdtiWVLWe7ax+bI2tOxreGEJ7URmQvSxc=; h=From:To:Cc:Subject:Date:From; b=mfEN9aPF8tUwL9rIW1L0UOimuU4zIlgLdR9pNYBrzw0omOecnFJrSWdV4PYOMXe+s bEP7Rt9EWVB/Kdmr4LWxfzJs0EPFthNyYpKz08g79W+SfGMHDno9FceKmzcyOnJAd3 lMad5gndv0y+CS0flNONDkUxpzjChmJDAm5GUcBJMmBBPp8iuv6auAJu8EUzkXV4Jj 7gT7hfIm+Ajzv2uycXtdCKgh1OrVhtfoa4CGkNiQD7L50j6OCkhifktg8YRLSNQOz+ mJpDhZ/+13J+fKj8FDDbPLH4nFIxMqzxpPrjtCYoXm42BdHr+3HTjRS+pp9d6tAY/6 jCbStusWX3gZA== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: Andrew Morton Cc: Michal Simek , Yoshinori Sato , Richard Kuo , linux-hexagon@vger.kernel.org, Geert Uytterhoeven , Guan Xuetao , linux-arch@vger.kernel.org, Nicolas Dichtel , Masahiro Yamada , Arnd Bergmann , Aurelien Jacquiot , linux-riscv@lists.infradead.org, Greentime Hu , linux-c6x-dev@linux-c6x.org, Guo Ren , Stafford Horne , Palmer Dabbelt , uclinux-h8-devel@lists.sourceforge.jp, Stefan Kristiansson , linux-m68k@lists.linux-m68k.org, openrisc@lists.librecores.org, Mark Salter , Albert Ou , Jonas Bonn , linux-kernel@vger.kernel.org, Vincent Chen Subject: [PATCH] arch: unexport asm/shmparam.h for all architectures Date: Tue, 8 Jan 2019 08:38:27 +0900 Message-Id: <1546904307-11124-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Most architectures do not export shmparam.h to user-space. $ find arch -name shmparam.h | sort arch/alpha/include/asm/shmparam.h arch/arc/include/asm/shmparam.h arch/arm64/include/asm/shmparam.h arch/arm/include/asm/shmparam.h arch/csky/include/asm/shmparam.h arch/ia64/include/asm/shmparam.h arch/mips/include/asm/shmparam.h arch/nds32/include/asm/shmparam.h arch/nios2/include/asm/shmparam.h arch/parisc/include/asm/shmparam.h arch/powerpc/include/asm/shmparam.h arch/s390/include/asm/shmparam.h arch/sh/include/asm/shmparam.h arch/sparc/include/asm/shmparam.h arch/x86/include/asm/shmparam.h arch/xtensa/include/asm/shmparam.h Strangely, some users of the asm-generic wrapper export shmparam.h $ git grep 'generic-y += shmparam.h' arch/c6x/include/uapi/asm/Kbuild:generic-y += shmparam.h arch/h8300/include/uapi/asm/Kbuild:generic-y += shmparam.h arch/hexagon/include/uapi/asm/Kbuild:generic-y += shmparam.h arch/m68k/include/uapi/asm/Kbuild:generic-y += shmparam.h arch/microblaze/include/uapi/asm/Kbuild:generic-y += shmparam.h arch/openrisc/include/uapi/asm/Kbuild:generic-y += shmparam.h arch/riscv/include/asm/Kbuild:generic-y += shmparam.h arch/unicore32/include/uapi/asm/Kbuild:generic-y += shmparam.h The newly added riscv correctly creates the asm-generic wrapper in the kernel space, but the others (c6x, h8300, hexagon, m68k, microblaze, openrisc, unicore32) create the one in the uapi directory. Digging into the git history, now I guess fcc8487d477a ("uapi: export all headers under uapi directories") was the misconversion. Prior to that commit, no architecture exported to shmparam.h As its commit description said, that commit exported shmparam.h for c6x, h8300, hexagon, m68k, openrisc, unicore32. 83f0124ad81e ("microblaze: remove asm-generic wrapper headers") accidentally exported shmparam.h for microblaze. This commit unexports shmparam.h for those architectures. There is no more reason to export include/uapi/asm-generic/shmparam.h, so it has been moved to include/asm-generic/shmparam.h Signed-off-by: Masahiro Yamada --- arch/c6x/include/asm/Kbuild | 1 + arch/c6x/include/uapi/asm/Kbuild | 1 - arch/h8300/include/asm/Kbuild | 1 + arch/h8300/include/uapi/asm/Kbuild | 1 - arch/hexagon/include/asm/Kbuild | 1 + arch/hexagon/include/uapi/asm/Kbuild | 1 - arch/m68k/include/asm/Kbuild | 1 + arch/m68k/include/uapi/asm/Kbuild | 1 - arch/microblaze/include/asm/Kbuild | 1 + arch/microblaze/include/uapi/asm/Kbuild | 1 - arch/openrisc/include/asm/Kbuild | 1 + arch/openrisc/include/uapi/asm/Kbuild | 1 - arch/unicore32/include/asm/Kbuild | 1 + arch/unicore32/include/uapi/asm/Kbuild | 1 - include/{uapi => }/asm-generic/shmparam.h | 0 15 files changed, 7 insertions(+), 7 deletions(-) rename include/{uapi => }/asm-generic/shmparam.h (100%) -- 2.7.4 Acked-by: Stafford Horne diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild index 33a2c94..63b4a17 100644 --- a/arch/c6x/include/asm/Kbuild +++ b/arch/c6x/include/asm/Kbuild @@ -30,6 +30,7 @@ generic-y += pgalloc.h generic-y += preempt.h generic-y += segment.h generic-y += serial.h +generic-y += shmparam.h generic-y += tlbflush.h generic-y += topology.h generic-y += trace_clock.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index 6c6f630..0febf1a 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -1,5 +1,4 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h -generic-y += shmparam.h generic-y += ucontext.h diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild index cd400d3..961c1dc 100644 --- a/arch/h8300/include/asm/Kbuild +++ b/arch/h8300/include/asm/Kbuild @@ -40,6 +40,7 @@ generic-y += preempt.h generic-y += scatterlist.h generic-y += sections.h generic-y += serial.h +generic-y += shmparam.h generic-y += sizes.h generic-y += spinlock.h generic-y += timex.h diff --git a/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index 6c6f630..0febf1a 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,5 +1,4 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h -generic-y += shmparam.h generic-y += ucontext.h diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 47c4da3..b25fd42 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -30,6 +30,7 @@ generic-y += rwsem.h generic-y += sections.h generic-y += segment.h generic-y += serial.h +generic-y += shmparam.h generic-y += sizes.h generic-y += topology.h generic-y += trace_clock.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index 61d955c..c1b06dc 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,4 +1,3 @@ include include/uapi/asm-generic/Kbuild.asm -generic-y += shmparam.h generic-y += ucontext.h diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index 9f1dd26..95f8f63 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild @@ -20,6 +20,7 @@ generic-y += mm-arch-hooks.h generic-y += percpu.h generic-y += preempt.h generic-y += sections.h +generic-y += shmparam.h generic-y += spinlock.h generic-y += topology.h generic-y += trace_clock.h diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index b8b3525..960bf1e 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generated-y += unistd_32.h generic-y += kvm_para.h -generic-y += shmparam.h diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild index 9c7d1d2..791cc8d5 100644 --- a/arch/microblaze/include/asm/Kbuild +++ b/arch/microblaze/include/asm/Kbuild @@ -26,6 +26,7 @@ generic-y += parport.h generic-y += percpu.h generic-y += preempt.h generic-y += serial.h +generic-y += shmparam.h generic-y += syscalls.h generic-y += topology.h generic-y += trace_clock.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 28823e3..97823ec 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,5 +2,4 @@ include include/uapi/asm-generic/Kbuild.asm generated-y += unistd_32.h generic-y += kvm_para.h -generic-y += shmparam.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index eb87cd8..1f04844b 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -34,6 +34,7 @@ generic-y += qrwlock_types.h generic-y += qrwlock.h generic-y += sections.h generic-y += segment.h +generic-y += shmparam.h generic-y += string.h generic-y += switch_to.h generic-y += topology.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 6c6f630..0febf1a 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,5 +1,4 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h -generic-y += shmparam.h generic-y += ucontext.h diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild index 1372553..1d1544b 100644 --- a/arch/unicore32/include/asm/Kbuild +++ b/arch/unicore32/include/asm/Kbuild @@ -28,6 +28,7 @@ generic-y += preempt.h generic-y += sections.h generic-y += segment.h generic-y += serial.h +generic-y += shmparam.h generic-y += sizes.h generic-y += syscalls.h generic-y += topology.h diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 6c6f630..0febf1a 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,5 +1,4 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h -generic-y += shmparam.h generic-y += ucontext.h diff --git a/include/uapi/asm-generic/shmparam.h b/include/asm-generic/shmparam.h similarity index 100% rename from include/uapi/asm-generic/shmparam.h rename to include/asm-generic/shmparam.h