diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2021-01-23 02:28:14 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2021-01-28 11:22:25 +0900 |
| commit | a9828646f01a485e648b4da2785d256a4de94659 (patch) | |
| tree | f8280eb6cc2ac405dd36fd65edf4499cc237366c | |
| parent | 631862a9302cd50949cdccc0ed6871b31db0aa6f (diff) | |
| download | linux-kbuild-testing5.tar.gz | |
mips: syscalls: unexport unistd_nr_{n32,n64,o32}.htesting5
These headers are only included from arch/mips/include/asm/unistd.h,
which is not exported.
I do not expect any userspace program to directly include them either
because they did not exist prior to commit 9bcbf97c6293 ("mips: add
system call table generation support").
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
| -rw-r--r-- | arch/mips/include/asm/Kbuild | 3 | ||||
| -rw-r--r-- | arch/mips/include/uapi/asm/Kbuild | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/syscalls/Makefile | 14 |
3 files changed, 10 insertions, 11 deletions
diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild index 70b15857369d9..258b105d16615 100644 --- a/arch/mips/include/asm/Kbuild +++ b/arch/mips/include/asm/Kbuild @@ -3,6 +3,9 @@ generated-y += syscall_table_n32.h generated-y += syscall_table_n64.h generated-y += syscall_table_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 += mcs_spinlock.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index 6db08385d3d87..4fe4a31ad63be 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,8 +2,4 @@ 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 diff --git a/arch/mips/kernel/syscalls/Makefile b/arch/mips/kernel/syscalls/Makefile index a12d66281b54a..26f8d2536a272 100644 --- a/arch/mips/kernel/syscalls/Makefile +++ b/arch/mips/kernel/syscalls/Makefile @@ -35,17 +35,17 @@ $(uapi)/unistd_o32.h: $(syscallo32) $(syshdr) FORCE sysnr_pfx_unistd_nr_n32 := N32 sysnr_offset_unistd_nr_n32 := 6000 -$(uapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) FORCE +$(kapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) FORCE $(call if_changed,sysnr) sysnr_pfx_unistd_nr_n64 := 64 sysnr_offset_unistd_nr_n64 := 5000 -$(uapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) FORCE +$(kapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) FORCE $(call if_changed,sysnr) sysnr_pfx_unistd_nr_o32 := O32 sysnr_offset_unistd_nr_o32 := 4000 -$(uapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) FORCE +$(kapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) FORCE $(call if_changed,sysnr) $(kapi)/syscall_table_n32.h: offset := 6000 @@ -62,11 +62,11 @@ $(kapi)/syscall_table_o32.h: $(syscallo32) $(systbl) FORCE uapisyshdr-y += unistd_n32.h \ unistd_n64.h \ - unistd_o32.h \ - unistd_nr_n32.h \ + unistd_o32.h +kapisyshdr-y += unistd_nr_n32.h \ unistd_nr_n64.h \ - unistd_nr_o32.h -kapisyshdr-y += syscall_table_n32.h \ + unistd_nr_o32.h \ + syscall_table_n32.h \ syscall_table_n64.h \ syscall_table_o32.h |