Skip to content

Commit

Permalink
arch: unexport asm/shmparam.h for all architectures
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@masahir0y @torvalds
masahir0y authored and torvalds committed Feb 1, 2019
1 parent 1fde6f2 commit 36c0f7f
Show file tree
Hide file tree
Showing 14 changed files with 7 additions and 7 deletions.
1 change: 1 addition & 0 deletions arch/c6x/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/c6x/include/uapi/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
include include/uapi/asm-generic/Kbuild.asm

generic-y += kvm_para.h
generic-y += shmparam.h
generic-y += ucontext.h
1 change: 1 addition & 0 deletions arch/h8300/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/h8300/include/uapi/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
include include/uapi/asm-generic/Kbuild.asm

generic-y += kvm_para.h
generic-y += shmparam.h
generic-y += ucontext.h
1 change: 1 addition & 0 deletions arch/hexagon/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/hexagon/include/uapi/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include include/uapi/asm-generic/Kbuild.asm

generic-y += shmparam.h
generic-y += ucontext.h
1 change: 1 addition & 0 deletions arch/m68k/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/m68k/include/uapi/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions arch/microblaze/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/microblaze/include/uapi/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions arch/openrisc/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/openrisc/include/uapi/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
include include/uapi/asm-generic/Kbuild.asm

generic-y += kvm_para.h
generic-y += shmparam.h
generic-y += ucontext.h
1 change: 1 addition & 0 deletions arch/unicore32/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/unicore32/include/uapi/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
include include/uapi/asm-generic/Kbuild.asm

generic-y += kvm_para.h
generic-y += shmparam.h
generic-y += ucontext.h

0 comments on commit 36c0f7f

Please sign in to comment.