From 406d2926f28831429a93083bf1b09634e8cad72a Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Sat, 1 Oct 2016 22:08:07 +0000 Subject: [PATCH] Expose kernel-only errno values if _WANT_KERNEL_ERRNO is defined. The kernel uses a few negative errno values for internal conditions such as requesting a system call restart. Normally these errno values are not exposed to userland. However, kdump needs access to these values as some of then can be present in a ktrace system call return record. Previously kdump was defining _KERNEL to gain access to ehse values, but was then having to manually declare 'errno' (and doing it incorrectly). Now, kdump uses _WANT_KERNEL_ERRNO instead of _KERNEL and uses the system-provided declaration of errno. --- sys/sys/errno.h | 2 +- usr.bin/kdump/kdump.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/sys/errno.h b/sys/sys/errno.h index 52efd3193a0e..b6056d2f4cb0 100644 --- a/sys/sys/errno.h +++ b/sys/sys/errno.h @@ -184,7 +184,7 @@ __END_DECLS #define ELAST 96 /* Must be equal largest errno */ #endif /* _POSIX_SOURCE */ -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_WANT_KERNEL_ERRNO) /* pseudo-errors returned inside kernel to modify return to process */ #define ERESTART (-1) /* restart syscall */ #define EJUSTRETURN (-2) /* don't modify regs, just return */ diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 1ee1c84a9e5c..199ecdd53837 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -41,10 +41,7 @@ static char sccsid[] = "@(#)kdump.c 8.1 (Berkeley) 6/6/93"; #include __FBSDID("$FreeBSD$"); -#define _KERNEL -extern int errno; -#include -#undef _KERNEL +#define _WANT_KERNEL_ERRNO #include #include #include