D56085.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D56085.diff
View Options

	diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
	--- a/sys/kern/imgact_elf.c
	+++ b/sys/kern/imgact_elf.c
	@@ -116,7 +116,7 @@

	#define ELF_NODE_OID __CONCAT(_kern_, ELF_ABI_ID)

	-int __elfN(fallback_brand) = -1;
	+static int __elfN(fallback_brand) = -1;
	SYSCTL_INT(ELF_NODE_OID, OID_AUTO,
	fallback_brand, CTLFLAG_RWTUN, &__elfN(fallback_brand), 0,
	ELF_ABI_NAME " brand of last resort");
	diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
	--- a/sys/kern/kern_mib.c
	+++ b/sys/kern/kern_mib.c
	@@ -777,9 +777,3 @@
	const int pcb_size = sizeof(struct pcb);
	SYSCTL_SIZEOF_STRUCT(pcb);

	-/* XXX compatibility, remove for 6.0 */
	-#include <sys/imgact.h>
	-#include <sys/imgact_elf.h>
	-SYSCTL_INT(_kern, OID_AUTO, fallback_elf_brand, CTLFLAG_RW,
	- &__elfN(fallback_brand), sizeof(__elfN(fallback_brand)),
	- "compatibility for kern.fallback_elf_brand");
	diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
	--- a/sys/sys/imgact_elf.h
	+++ b/sys/sys/imgact_elf.h
	@@ -131,7 +131,6 @@
	/* Machine specific function to dump per-thread information. */
	void __elfN(dump_thread)(struct thread , void , size_t *);

	-extern int __elfN(fallback_brand);
	extern const Elf_Brandnote __elfN(freebsd_brandnote);
	extern const Elf_Brandnote __elfN(kfreebsd_brandnote);
	#endif /* _KERNEL */
	diff --git a/tools/tools/sysdoc/tunables.mdoc b/tools/tools/sysdoc/tunables.mdoc
	--- a/tools/tools/sysdoc/tunables.mdoc
	+++ b/tools/tools/sysdoc/tunables.mdoc
	@@ -687,9 +687,6 @@
	---
	kern.elf32.fallback_brand

	----
	-kern.fallback_elf_brand
	-
	---
	kern.file
	struct