From 7abf30d339336cef02a293352e0a82181e75c2fb Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Tue, 3 Nov 2020 19:12:33 +0000 Subject: [PATCH] Make linux_errtbl[] static. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D27004 --- lib/libsysdecode/errno.c | 1 - sys/compat/linux/linux_emul.h | 2 -- sys/compat/linux/linux_errno.inc | 2 +- sys/modules/linux_common/Makefile | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/libsysdecode/errno.c b/lib/libsysdecode/errno.c index 037ad0380e4a..d66493ad739d 100644 --- a/lib/libsysdecode/errno.c +++ b/lib/libsysdecode/errno.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #if defined(__aarch64__) || defined(__amd64__) || defined(__i386__) #include -static #include #endif diff --git a/sys/compat/linux/linux_emul.h b/sys/compat/linux/linux_emul.h index daa92e15b502..9104892885bc 100644 --- a/sys/compat/linux/linux_emul.h +++ b/sys/compat/linux/linux_emul.h @@ -80,6 +80,4 @@ struct linux_pemuldata { struct linux_pemuldata *pem_find(struct proc *); -extern const int linux_errtbl[]; - #endif /* !_LINUX_EMUL_H_ */ diff --git a/sys/compat/linux/linux_errno.inc b/sys/compat/linux/linux_errno.inc index c4a3fb0f56a4..d8c61e9d5ce1 100644 --- a/sys/compat/linux/linux_errno.inc +++ b/sys/compat/linux/linux_errno.inc @@ -38,7 +38,7 @@ * XXX: The "XXX" comments below should be replaced with rationale * for the errno value chosen. */ -const int linux_errtbl[ELAST + 1] = { +static const int linux_errtbl[ELAST + 1] = { /* [0, 9] */ [0] = -0, [EPERM] = -LINUX_EPERM, diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 5b49a7409997..70f22ef10bae 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -9,7 +9,6 @@ SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ EXPORT_SYMS= EXPORT_SYMS+= linux_emul_path -EXPORT_SYMS+= linux_errtbl EXPORT_SYMS+= linux_ioctl_register_handler EXPORT_SYMS+= linux_ioctl_unregister_handler EXPORT_SYMS+= linux_get_osname