Commit ccb21774 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Thomas Bogendoerfer
Browse files

MIPS: UAPI: unexport unistd_nr_{n32,n64,o32}.h 



unistd_nr_{n32,n64,o32}.h are needed only by include/asm/unistd.h,
which is a kernel-side header file, and their contents is generally
not for userland use.
Move their target destination from include/generated/uapi/asm/ to
include/generated/asm/ to disable exporting them as UAPI headers.

Signed-off-by: default avatarAlexander Lobakin <alobakin@pm.me>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent c6f2a9e1

arch/mips/include/asm/Kbuild

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ generated-y += syscall_table_32_o32.h 
generated-y += syscall_table_64_n32.h

generated-y += syscall_table_64_n64.h

generated-y += syscall_table_64_o32.h

generated-y += unistd_nr_n32.h

generated-y += unistd_nr_n64.h

generated-y += unistd_nr_o32.h



generic-y += export.h

generic-y += kvm_para.h

generic-y += local64.h

arch/mips/include/uapi/asm/Kbuild

+0 −3
Original line number Diff line number Diff line
@@ -2,8 +2,5 @@ 
generated-y += unistd_n32.h

generated-y += unistd_n64.h

generated-y += unistd_o32.h

generated-y += unistd_nr_n32.h

generated-y += unistd_nr_n64.h

generated-y += unistd_nr_o32.h



generic-y += kvm_para.h

arch/mips/kernel/syscalls/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -44,17 +44,17 @@ $(uapi)/unistd_o32.h: $(syscallo32) $(syshdr) 


sysnr_pfx_unistd_nr_n32 := N32

sysnr_offset_unistd_nr_n32 := 6000

$(uapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr)

$(kapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr)

	$(call if_changed,sysnr)



sysnr_pfx_unistd_nr_n64 := 64

sysnr_offset_unistd_nr_n64 := 5000

$(uapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr)

$(kapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr)

	$(call if_changed,sysnr)



sysnr_pfx_unistd_nr_o32 := O32

sysnr_offset_unistd_nr_o32 := 4000

$(uapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr)

$(kapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr)

	$(call if_changed,sysnr)



systbl_abi_syscall_table_32_o32 := 32_o32
@@ -79,14 +79,14 @@ $(kapi)/syscall_table_64_o32.h: $(syscallo32) $(systbl) 


uapisyshdr-y		+= unistd_n32.h			\

			   unistd_n64.h			\

			   unistd_o32.h			\

			   unistd_nr_n32.h		\

			   unistd_nr_n64.h		\

			   unistd_nr_o32.h

			   unistd_o32.h

kapisyshdr-y		+= syscall_table_32_o32.h	\

			   syscall_table_64_n32.h	\

			   syscall_table_64_n64.h	\

			   syscall_table_64_o32.h

			   syscall_table_64_o32.h	\

			   unistd_nr_n32.h		\

			   unistd_nr_n64.h		\

			   unistd_nr_o32.h



targets	+= $(uapisyshdr-y) $(kapisyshdr-y)