svn commit: r311708 - in stable: 10/sys/sys 10/usr.bin/kdump 11/sys/sys 11/usr.bin/kdump
John Baldwin
jhb at FreeBSD.org
Mon Jan 9 00:09:21 UTC 2017
Author: jhb
Date: Mon Jan 9 00:09:19 2017
New Revision: 311708
URL: https://svnweb.freebsd.org/changeset/base/311708
Log:
MFC 306564: 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.
Modified:
stable/10/sys/sys/errno.h
stable/10/usr.bin/kdump/kdump.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/sys/errno.h
stable/11/usr.bin/kdump/kdump.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/10/sys/sys/errno.h
==============================================================================
--- stable/10/sys/sys/errno.h Sun Jan 8 23:41:17 2017 (r311707)
+++ stable/10/sys/sys/errno.h Mon Jan 9 00:09:19 2017 (r311708)
@@ -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 */
Modified: stable/10/usr.bin/kdump/kdump.c
==============================================================================
--- stable/10/usr.bin/kdump/kdump.c Sun Jan 8 23:41:17 2017 (r311707)
+++ stable/10/usr.bin/kdump/kdump.c Mon Jan 9 00:09:19 2017 (r311708)
@@ -41,10 +41,7 @@ static char sccsid[] = "@(#)kdump.c 8.1
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#define _KERNEL
-extern int errno;
-#include <sys/errno.h>
-#undef _KERNEL
+#define _WANT_KERNEL_ERRNO
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/errno.h>
More information about the svn-src-all
mailing list