Skip to content

Commit 36c0f7f

Browse files
masahir0ytorvalds
masahir0y
authored and
torvalds
committed
arch: unexport asm/shmparam.h for all architectures
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 fcc8487 ("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. 83f0124 ("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 Link: http://lkml.kernel.org/r/1546904307-11124-1-git-send-email-yamada.masahiro@socionext.com Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Stafford Horne <shorne@gmail.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Michal Simek <monstr@monstr.eu> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Aurelien Jacquiot <jacquiot.aurelien@gmail.com> Cc: Greentime Hu <green.hu@gmail.com> Cc: Guo Ren <guoren@kernel.org> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Cc: Mark Salter <msalter@redhat.com> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Jonas Bonn <jonas@southpole.se> Cc: Vincent Chen <deanbo422@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 1fde6f2 commit 36c0f7f

File tree

14 files changed

+7
-7
lines changed

14 files changed

+7
-7
lines changed

‎arch/c6x/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ generic-y += pgalloc.h
3030
generic-y += preempt.h
3131
generic-y += segment.h
3232
generic-y += serial.h
33+
generic-y += shmparam.h
3334
generic-y += tlbflush.h
3435
generic-y += topology.h
3536
generic-y += trace_clock.h

‎arch/c6x/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
include include/uapi/asm-generic/Kbuild.asm
22

33
generic-y += kvm_para.h
4-
generic-y += shmparam.h
54
generic-y += ucontext.h

‎arch/h8300/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ generic-y += preempt.h
4040
generic-y += scatterlist.h
4141
generic-y += sections.h
4242
generic-y += serial.h
43+
generic-y += shmparam.h
4344
generic-y += sizes.h
4445
generic-y += spinlock.h
4546
generic-y += timex.h

‎arch/h8300/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
include include/uapi/asm-generic/Kbuild.asm
22

33
generic-y += kvm_para.h
4-
generic-y += shmparam.h
54
generic-y += ucontext.h

‎arch/hexagon/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ generic-y += rwsem.h
3030
generic-y += sections.h
3131
generic-y += segment.h
3232
generic-y += serial.h
33+
generic-y += shmparam.h
3334
generic-y += sizes.h
3435
generic-y += topology.h
3536
generic-y += trace_clock.h

‎arch/hexagon/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
include include/uapi/asm-generic/Kbuild.asm
22

3-
generic-y += shmparam.h
43
generic-y += ucontext.h

‎arch/m68k/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ generic-y += mm-arch-hooks.h
2020
generic-y += percpu.h
2121
generic-y += preempt.h
2222
generic-y += sections.h
23+
generic-y += shmparam.h
2324
generic-y += spinlock.h
2425
generic-y += topology.h
2526
generic-y += trace_clock.h

‎arch/m68k/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm
22

33
generated-y += unistd_32.h
44
generic-y += kvm_para.h
5-
generic-y += shmparam.h

‎arch/microblaze/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ generic-y += parport.h
2626
generic-y += percpu.h
2727
generic-y += preempt.h
2828
generic-y += serial.h
29+
generic-y += shmparam.h
2930
generic-y += syscalls.h
3031
generic-y += topology.h
3132
generic-y += trace_clock.h

‎arch/microblaze/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ include include/uapi/asm-generic/Kbuild.asm
22

33
generated-y += unistd_32.h
44
generic-y += kvm_para.h
5-
generic-y += shmparam.h
65
generic-y += ucontext.h

‎arch/openrisc/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ generic-y += qrwlock_types.h
3434
generic-y += qrwlock.h
3535
generic-y += sections.h
3636
generic-y += segment.h
37+
generic-y += shmparam.h
3738
generic-y += string.h
3839
generic-y += switch_to.h
3940
generic-y += topology.h

‎arch/openrisc/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
include include/uapi/asm-generic/Kbuild.asm
22

33
generic-y += kvm_para.h
4-
generic-y += shmparam.h
54
generic-y += ucontext.h

‎arch/unicore32/include/asm/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ generic-y += preempt.h
2828
generic-y += sections.h
2929
generic-y += segment.h
3030
generic-y += serial.h
31+
generic-y += shmparam.h
3132
generic-y += sizes.h
3233
generic-y += syscalls.h
3334
generic-y += topology.h

‎arch/unicore32/include/uapi/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
include include/uapi/asm-generic/Kbuild.asm
22

33
generic-y += kvm_para.h
4-
generic-y += shmparam.h
54
generic-y += ucontext.h

0 commit comments

Comments
 (0)