Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by

Alexander Lobakin and committed by
Thomas Bogendoerfer
ccb21774 c6f2a9e1

+12 -11
+4
arch/mips/include/asm/Kbuild
··· 4 4 generated-y += syscall_table_64_n32.h 5 5 generated-y += syscall_table_64_n64.h 6 6 generated-y += syscall_table_64_o32.h 7 + generated-y += unistd_nr_n32.h 8 + generated-y += unistd_nr_n64.h 9 + generated-y += unistd_nr_o32.h 10 + 7 11 generic-y += export.h 8 12 generic-y += kvm_para.h 9 13 generic-y += local64.h
-3
arch/mips/include/uapi/asm/Kbuild
··· 2 2 generated-y += unistd_n32.h 3 3 generated-y += unistd_n64.h 4 4 generated-y += unistd_o32.h 5 - generated-y += unistd_nr_n32.h 6 - generated-y += unistd_nr_n64.h 7 - generated-y += unistd_nr_o32.h 8 5 9 6 generic-y += kvm_para.h
+8 -8
arch/mips/kernel/syscalls/Makefile
··· 44 44 45 45 sysnr_pfx_unistd_nr_n32 := N32 46 46 sysnr_offset_unistd_nr_n32 := 6000 47 - $(uapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) 47 + $(kapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) 48 48 $(call if_changed,sysnr) 49 49 50 50 sysnr_pfx_unistd_nr_n64 := 64 51 51 sysnr_offset_unistd_nr_n64 := 5000 52 - $(uapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) 52 + $(kapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) 53 53 $(call if_changed,sysnr) 54 54 55 55 sysnr_pfx_unistd_nr_o32 := O32 56 56 sysnr_offset_unistd_nr_o32 := 4000 57 - $(uapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) 57 + $(kapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) 58 58 $(call if_changed,sysnr) 59 59 60 60 systbl_abi_syscall_table_32_o32 := 32_o32 ··· 79 79 80 80 uapisyshdr-y += unistd_n32.h \ 81 81 unistd_n64.h \ 82 - unistd_o32.h \ 83 - unistd_nr_n32.h \ 84 - unistd_nr_n64.h \ 85 - unistd_nr_o32.h 82 + unistd_o32.h 86 83 kapisyshdr-y += syscall_table_32_o32.h \ 87 84 syscall_table_64_n32.h \ 88 85 syscall_table_64_n64.h \ 89 - syscall_table_64_o32.h 86 + syscall_table_64_o32.h \ 87 + unistd_nr_n32.h \ 88 + unistd_nr_n64.h \ 89 + unistd_nr_o32.h 90 90 91 91 targets += $(uapisyshdr-y) $(kapisyshdr-y) 92 92