CVS commit: src/share/misc
Module Name:src
Committed By: riastradh
Date: Mon Sep 18 03:14:02 UTC 2017
Modified Files:
src/share/misc: acronyms
Log Message:
DM: direct message
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/share/misc/acronyms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.259 src/share/misc/acronyms:1.260
--- src/share/misc/acronyms:1.259 Sun Sep 17 00:54:16 2017
+++ src/share/misc/acronyms Mon Sep 18 03:14:02 2017
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.259 2017/09/17 00:54:16 ginsbach Exp $
+$NetBSD: acronyms,v 1.260 2017/09/18 03:14:02 riastradh Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -106,6 +106,7 @@ DBEYR don't believe everything you read
DIAFYO did I ask for your opinion?
DIY do it yourself
DKDC don't know, don't care
+DM direct message
DM dungeon master
DME durable medical equipment
DMEPOS durable medical equipment, prosthetics, orthotics and supplies
CVS commit: src/share/misc
Module Name:src Committed By: rtr Date: Sun Sep 17 21:55:07 UTC 2017 Modified Files: src/share/misc: acronyms.comp Log Message: GVFS git virtual file system To generate a diff of this commit: cvs rdiff -u -r1.184 -r1.185 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.184 src/share/misc/acronyms.comp:1.185 --- src/share/misc/acronyms.comp:1.184 Fri Aug 11 16:03:14 2017 +++ src/share/misc/acronyms.comp Sun Sep 17 21:55:07 2017 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.184 2017/08/11 16:03:14 ginsbach Exp $ +$NetBSD: acronyms.comp,v 1.185 2017/09/17 21:55:07 rtr Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -522,6 +522,7 @@ GRE generic routing encapsulation GSI global system interrupt GUI graphical user interface GUID globally unique identifier +GVFSgit virtual file system HA high availability HAL hardware abstraction layer HAT hashed array tree
CVS commit: src/lib/libcurses
Module Name:src Committed By: abhinav Date: Sun Sep 17 21:46:47 UTC 2017 Modified Files: src/lib/libcurses: curses_tty.3 Log Message: Fix typo To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libcurses/curses_tty.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/curses_tty.3 diff -u src/lib/libcurses/curses_tty.3:1.12 src/lib/libcurses/curses_tty.3:1.13 --- src/lib/libcurses/curses_tty.3:1.12 Fri Feb 17 11:23:21 2017 +++ src/lib/libcurses/curses_tty.3 Sun Sep 17 21:46:46 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_tty.3,v 1.12 2017/02/17 11:23:21 roy Exp $ +.\" $NetBSD: curses_tty.3,v 1.13 2017/09/17 21:46:46 abhinav Exp $ .\" .\" Copyright (c) 2002 .\" Brett Lymn (bl...@netbsd.org, brett_l...@yahoo.com.au) @@ -147,7 +147,7 @@ These functions manipulate curses termin .Pp The .Fn baudrate -function extrats the output speed of the terminal +function extracts the output speed of the terminal and returns it in bits per second. .Pp The
CVS commit: src/sys/net
Module Name:src
Committed By: christos
Date: Sun Sep 17 20:39:04 UTC 2017
Modified Files:
src/sys/net: if_ppp.c
Log Message:
Add one more not supported error
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/net/if_ppp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.158 src/sys/net/if_ppp.c:1.159
--- src/sys/net/if_ppp.c:1.158 Sun Oct 2 10:17:07 2016
+++ src/sys/net/if_ppp.c Sun Sep 17 16:39:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.158 2016/10/02 14:17:07 christos Exp $ */
+/* $NetBSD: if_ppp.c,v 1.159 2017/09/17 20:39:04 christos Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.158 2016/10/02 14:17:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.159 2017/09/17 20:39:04 christos Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -801,6 +801,8 @@ pppsioctl(struct ifnet *ifp, u_long cmd,
break;
#endif
default:
+ printf("%s: af%d not supported\n", ifp->if_xname,
+ ifa->ifa_addr->sa_family);
error = EAFNOSUPPORT;
break;
}
CVS commit: src/sys/modules/if_ppp
Module Name:src Committed By: christos Date: Sun Sep 17 20:37:17 UTC 2017 Modified Files: src/sys/modules/if_ppp: Makefile Log Message: This also needs INET6! XXX: pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/if_ppp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/if_ppp/Makefile diff -u src/sys/modules/if_ppp/Makefile:1.1 src/sys/modules/if_ppp/Makefile:1.2 --- src/sys/modules/if_ppp/Makefile:1.1 Sat Aug 6 02:06:54 2016 +++ src/sys/modules/if_ppp/Makefile Sun Sep 17 16:37:17 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/08/06 06:06:54 christos Exp $ +# $NetBSD: Makefile,v 1.2 2017/09/17 20:37:17 christos Exp $ .include "../Makefile.inc" @@ -8,7 +8,7 @@ KMOD= if_ppp IOCONF= ppp.ioconf SRCS= if_ppp.c ppp_tty.c -CPPFLAGS+= -DINET +CPPFLAGS+= -DINET -DINET6 CPPFLAGS+= -DPPP_FILTER CPPFLAGS+= -DPPP_DEFLATE CPPFLAGS+= -DPPP_BSDCOMP
CVS commit: src/sys/netinet6
Module Name:src
Committed By: christos
Date: Sun Sep 17 17:36:06 UTC 2017
Modified Files:
src/sys/netinet6: scope6.c
Log Message:
explain why in6_setscope fails...
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/netinet6/scope6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/scope6.c
diff -u src/sys/netinet6/scope6.c:1.17 src/sys/netinet6/scope6.c:1.18
--- src/sys/netinet6/scope6.c:1.17 Mon Jan 16 10:44:47 2017
+++ src/sys/netinet6/scope6.c Sun Sep 17 13:36:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: scope6.c,v 1.17 2017/01/16 15:44:47 christos Exp $ */
+/* $NetBSD: scope6.c,v 1.18 2017/09/17 17:36:06 christos Exp $ */
/* $KAME$ */
/*-
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.17 2017/01/16 15:44:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.18 2017/09/17 17:36:06 christos Exp $");
#include
#include
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1
#include
#include
+#include
#include
@@ -347,7 +348,7 @@ sa6_recoverscope(struct sockaddr_in6 *si
if (sin6->sin6_scope_id != 0) {
log(LOG_NOTICE,
- "sa6_recoverscope: assumption failure (non 0 ID): %s%%%d\n",
+ "%s: assumption failure (non 0 ID): %s%%%d\n", __func__,
IN6_PRINT(ip6buf, >sin6_addr), sin6->sin6_scope_id);
/* XXX: proceed anyway... */
}
@@ -393,20 +394,27 @@ in6_setscope(struct in6_addr *in6, const
uint32_t zoneid = 0;
const struct scope6_id *sid = SID(ifp);
- if (sid == NULL)
+ if (sid == NULL) {
+ log(LOG_NOTICE, "%s: no scope id for %s\n", __func__,
+ if_name(ifp));
return EINVAL;
+ }
/*
* special case: the loopback address can only belong to a loopback
* interface.
*/
if (IN6_IS_ADDR_LOOPBACK(in6)) {
- if (!(ifp->if_flags & IFF_LOOPBACK))
- return (EINVAL);
- else {
+ if (!(ifp->if_flags & IFF_LOOPBACK)) {
+ char ip6buf[INET6_ADDRSTRLEN];
+ log(LOG_NOTICE, "%s: can't set scope for not loopback "
+ "interface %s and loopback address %s\n",
+ __func__, if_name(ifp), IN6_PRINT(ip6buf, in6));
+ return EINVAL;
+ } else {
if (ret_id != NULL)
*ret_id = 0; /* there's no ambiguity */
- return (0);
+ return 0;
}
}
CVS commit: src/sys/netinet6
Module Name:src
Committed By: christos
Date: Sun Sep 17 17:35:10 UTC 2017
Modified Files:
src/sys/netinet6: in6_src.c
Log Message:
Skip the scope test for loopback addresses in non-loopback interfaces.
While this test is also done in in6_setscope, testing here allows us
to log an error for other callers.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/netinet6/in6_src.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6_src.c
diff -u src/sys/netinet6/in6_src.c:1.80 src/sys/netinet6/in6_src.c:1.81
--- src/sys/netinet6/in6_src.c:1.80 Sun Aug 27 08:34:21 2017
+++ src/sys/netinet6/in6_src.c Sun Sep 17 13:35:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_src.c,v 1.80 2017/08/27 12:34:21 christos Exp $ */
+/* $NetBSD: in6_src.c,v 1.81 2017/09/17 17:35:10 christos Exp $ */
/* $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.80 2017/08/27 12:34:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.81 2017/09/17 17:35:10 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -204,6 +204,12 @@ in6_select_best_ia(struct sockaddr_in6 *
continue;
}
src = ia->ia_addr.sin6_addr;
+
+ /* Skip the scope test in impossible cases */
+ if (!(ifp->if_flags & IFF_LOOPBACK) &&
+ IN6_IS_ADDR_LOOPBACK())
+ continue;
+
if (in6_setscope(, ifp, ) ||
in6_setscope(, ifp1, ) ||
osrczone != srczone) {
@@ -614,11 +620,11 @@ in6_selectroute(struct sockaddr_in6 *dst
dstsock->sin6_addr.s6_addr32[1] == 0 &&
!IN6_IS_ADDR_LOOPBACK(>sin6_addr)) {
char ip6buf[INET6_ADDRSTRLEN];
- printf("in6_selectroute: strange destination %s\n",
+ printf("%s: strange destination %s\n", __func__,
IN6_PRINT(ip6buf, >sin6_addr));
} else {
char ip6buf[INET6_ADDRSTRLEN];
- printf("in6_selectroute: destination = %s%%%d\n",
+ printf("%s: destination = %s%%%d\n", __func__,
IN6_PRINT(ip6buf, >sin6_addr),
dstsock->sin6_scope_id); /* for debug */
}
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Sun Sep 17 15:30:08 UTC 2017 Modified Files: src/doc: CHANGES Log Message: Note installation of scripts from the DTrace Toolkit in base. To generate a diff of this commit: cvs rdiff -u -r1.2317 -r1.2318 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2317 src/doc/CHANGES:1.2318 --- src/doc/CHANGES:1.2317 Fri Sep 15 17:19:44 2017 +++ src/doc/CHANGES Sun Sep 17 15:30:08 2017 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2317 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2318 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -62,3 +62,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0: VERIFIED_EXEC_FP_SHA1, and VERIFIED_EXEC_FP_RMD160 options. [sevan 20170913] acpi(4): Updated ACPICA to 20170831. [christos 20170915] + dtrace: Install dtruss, execsnoop, opensnoop, and procsystime from the + DTrace Toolkit if DTrace support is enabled. [sevan 20170917]
CVS commit: src/lib/libc/gen
Module Name:src Committed By: abhinav Date: Sun Sep 17 11:45:10 UTC 2017 Modified Files: src/lib/libc/gen: exec.3 Log Message: Add execlpe and execvpe to the NAME section To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/gen/exec.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/exec.3 diff -u src/lib/libc/gen/exec.3:1.27 src/lib/libc/gen/exec.3:1.28 --- src/lib/libc/gen/exec.3:1.27 Sat Dec 10 14:13:29 2016 +++ src/lib/libc/gen/exec.3 Sun Sep 17 11:45:10 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: exec.3,v 1.27 2016/12/10 14:13:29 rin Exp $ +.\" $NetBSD: exec.3,v 1.28 2017/09/17 11:45:10 abhinav Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -35,10 +35,12 @@ .Sh NAME .Nm execl , .Nm execlp , +.Nm execlpe , .Nm execle , .Nm exect , .Nm execv , -.Nm execvp +.Nm execvp , +.Nm execvpe .Nd execute a file .Sh LIBRARY .Lb libc
CVS commit: src/sys/arch/i386
Module Name:src Committed By: maxv Date: Sun Sep 17 09:59:23 UTC 2017 Modified Files: src/sys/arch/i386/i386: locore.S src/sys/arch/i386/include: frameasm.h Log Message: Declare INTRFASTEXIT as a function, like amd64; will be expanded soon. To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sys/arch/i386/i386/locore.S cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/include/frameasm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/i386/locore.S diff -u src/sys/arch/i386/i386/locore.S:1.151 src/sys/arch/i386/i386/locore.S:1.152 --- src/sys/arch/i386/i386/locore.S:1.151 Sat Aug 12 07:21:57 2017 +++ src/sys/arch/i386/i386/locore.S Sun Sep 17 09:59:23 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.151 2017/08/12 07:21:57 maxv Exp $ */ +/* $NetBSD: locore.S,v 1.152 2017/09/17 09:59:23 maxv Exp $ */ /* * Copyright-o-rama! @@ -128,7 +128,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.151 2017/08/12 07:21:57 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.152 2017/09/17 09:59:23 maxv Exp $"); #include "opt_copy_symtab.h" #include "opt_ddb.h" @@ -1367,3 +1367,20 @@ ENTRY(sse2_idlezero_page) popl %ebp ret END(sse2_idlezero_page) + +ENTRY(intrfastexit) + movw TF_GS(%esp),%gs + movw TF_FS(%esp),%fs + movw TF_ES(%esp),%es + movw TF_DS(%esp),%ds + movl TF_EDI(%esp),%edi + movl TF_ESI(%esp),%esi + movl TF_EBP(%esp),%ebp + movl TF_EBX(%esp),%ebx + movl TF_EDX(%esp),%edx + movl TF_ECX(%esp),%ecx + movl TF_EAX(%esp),%eax + addl $(TF_PUSHSIZE+8),%esp + iret +END(intrfastexit) + Index: src/sys/arch/i386/include/frameasm.h diff -u src/sys/arch/i386/include/frameasm.h:1.17 src/sys/arch/i386/include/frameasm.h:1.18 --- src/sys/arch/i386/include/frameasm.h:1.17 Sun Sep 17 09:04:51 2017 +++ src/sys/arch/i386/include/frameasm.h Sun Sep 17 09:59:23 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: frameasm.h,v 1.17 2017/09/17 09:04:51 maxv Exp $ */ +/* $NetBSD: frameasm.h,v 1.18 2017/09/17 09:59:23 maxv Exp $ */ #ifndef _I386_FRAMEASM_H_ #define _I386_FRAMEASM_H_ @@ -51,23 +51,8 @@ movl %eax,%fs ; \ cld -/* - * INTRFASTEXIT should be in sync with trap(), resume_iret and friends. - */ #define INTRFASTEXIT \ - movw TF_GS(%esp),%gs ; \ - movw TF_FS(%esp),%fs ; \ - movw TF_ES(%esp),%es ; \ - movw TF_DS(%esp),%ds ; \ - movl TF_EDI(%esp),%edi ; \ - movl TF_ESI(%esp),%esi ; \ - movl TF_EBP(%esp),%ebp ; \ - movl TF_EBX(%esp),%ebx ; \ - movl TF_EDX(%esp),%edx ; \ - movl TF_ECX(%esp),%ecx ; \ - movl TF_EAX(%esp),%eax ; \ - addl $(TF_PUSHSIZE+8),%esp ; \ - iret + jmp intrfastexit #define DO_DEFERRED_SWITCH \ cmpl $0, CPUVAR(WANT_PMAPLOAD) ; \
CVS commit: src/sys
Module Name:src
Committed By: maxv
Date: Sun Sep 17 09:41:35 UTC 2017
Modified Files:
src/sys/arch/amd64/amd64: netbsd32_machdep.c trap.c
src/sys/arch/amd64/include: cpu.h segments.h
src/sys/arch/i386/i386: compat_13_machdep.c compat_16_machdep.c
db_interface.c machdep.c process_machdep.c trap.c
src/sys/arch/i386/include: cpu.h segments.h
src/sys/arch/x86/x86: fpu.c kgdb_machdep.c
src/sys/compat/freebsd: freebsd_machdep.c
src/sys/compat/linux/arch/i386: linux_machdep.c
Log Message:
Remove the second argument from USERMODE and KERNELMODE, it is unused
now that we don't have vm86 anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amd64/include/cpu.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/include/segments.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/i386/compat_13_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/i386/compat_16_machdep.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/i386/i386/db_interface.c
cvs rdiff -u -r1.793 -r1.794 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/i386/i386/process_machdep.c
cvs rdiff -u -r1.290 -r1.291 src/sys/arch/i386/i386/trap.c
cvs rdiff -u -r1.178 -r1.179 src/sys/arch/i386/include/cpu.h
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/i386/include/segments.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/x86/fpu.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/kgdb_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/freebsd/freebsd_machdep.c
cvs rdiff -u -r1.164 -r1.165 src/sys/compat/linux/arch/i386/linux_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.108 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.109
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.108 Thu Aug 31 15:41:14 2017
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Sun Sep 17 09:41:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.108 2017/08/31 15:41:14 maxv Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.109 2017/09/17 09:41:35 maxv Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.108 2017/08/31 15:41:14 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.109 2017/09/17 09:41:35 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1061,7 +1061,7 @@ check_sigcontext32(struct lwp *l, const
if (__predict_false(pmap->pm_ldt != NULL)) {
/* Only when the LDT is user-set (with USER_LDT) */
- if (!USERMODE(scp->sc_cs, scp->sc_eflags))
+ if (!USERMODE(scp->sc_cs))
return EINVAL;
} else {
if (!VALID_USER_CSEL32(scp->sc_cs))
@@ -1098,7 +1098,7 @@ cpu_mcontext32_validate(struct lwp *l, c
#ifdef USER_LDT
/* Userland is allowed to have unfamiliar segment register values */
- if (!USERMODE(gr[_REG32_CS], gr[_REG32_EFL]))
+ if (!USERMODE(gr[_REG32_CS]))
return EINVAL;
#else
struct pcb *pcb = lwp_getpcb(l);
Index: src/sys/arch/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.100 src/sys/arch/amd64/amd64/trap.c:1.101
--- src/sys/arch/amd64/amd64/trap.c:1.100 Fri Sep 15 17:22:09 2017
+++ src/sys/arch/amd64/amd64/trap.c Sun Sep 17 09:41:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.100 2017/09/15 17:22:09 maxv Exp $ */
+/* $NetBSD: trap.c,v 1.101 2017/09/17 09:41:35 maxv Exp $ */
/*
* Copyright (c) 1998, 2000, 2017 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.100 2017/09/15 17:22:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.101 2017/09/17 09:41:35 maxv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -290,7 +290,7 @@ trap_user_kernelmode(struct trapframe *f
* The stack frame containing the user registers is
* still valid and pointed to by tf_rsp.
*/
- if (KERNELMODE(vframe->tf_cs, vframe->tf_eflags))
+ if (KERNELMODE(vframe->tf_cs))
return;
/* There is no valid address for the fault */
break;
@@ -354,7 +354,7 @@ trap(struct trapframe *frame)
}
type = frame->tf_trapno;
- if (!KERNELMODE(frame->tf_cs, frame->tf_rflags)) {
+ if (!KERNELMODE(frame->tf_cs)) {
type |= T_USER;
l->l_md.md_regs = frame;
LWP_CACHE_CREDS(l, p);
Index: src/sys/arch/amd64/include/cpu.h
diff -u src/sys/arch/amd64/include/cpu.h:1.60 src/sys/arch/amd64/include/cpu.h:1.61
--- src/sys/arch/amd64/include/cpu.h:1.60 Sat Jan 21 16:48:56 2012
+++ src/sys/arch/amd64/include/cpu.h Sun Sep 17 09:41:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.60 2012/01/21 16:48:56 chs Exp $ */
+/* $NetBSD: cpu.h,v 1.61 2017/09/17 09:41:35 maxv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: maxv Date: Sun Sep 17 09:11:19 UTC 2017 Removed Files: src/sys/arch/i386/include: tlog.h Log Message: Remove tlog.h - unused now. Note that it is not installed. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/sys/arch/i386/include/tlog.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: maxv Date: Sun Sep 17 09:04:52 UTC 2017 Modified Files: src/sys/arch/i386/i386: db_interface.c genassym.cf machdep.c src/sys/arch/i386/include: frameasm.h src/sys/arch/x86/x86: cpu.c src/sys/arch/xen/x86: cpu.c Log Message: Remove TRAPLOG from i386. Nowadays there are better instrumentation tools, in both software and hardware. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/arch/i386/i386/db_interface.c cvs rdiff -u -r1.103 -r1.104 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.792 -r1.793 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/include/frameasm.h cvs rdiff -u -r1.134 -r1.135 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.111 -r1.112 src/sys/arch/xen/x86/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/i386/db_interface.c diff -u src/sys/arch/i386/i386/db_interface.c:1.74 src/sys/arch/i386/i386/db_interface.c:1.75 --- src/sys/arch/i386/i386/db_interface.c:1.74 Tue Aug 15 09:16:59 2017 +++ src/sys/arch/i386/i386/db_interface.c Sun Sep 17 09:04:51 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: db_interface.c,v 1.74 2017/08/15 09:16:59 maxv Exp $ */ +/* $NetBSD: db_interface.c,v 1.75 2017/09/17 09:04:51 maxv Exp $ */ /* * Mach Operating System @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.74 2017/08/15 09:16:59 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.75 2017/09/17 09:04:51 maxv Exp $"); #include "opt_ddb.h" #include "opt_multiprocessor.h" @@ -276,10 +276,6 @@ kdb_trap(int type, int code, db_regs_t * regs->tf_ss = ddb_regs.tf_ss; } -#ifdef TRAPLOG - wrmsr(MSR_DEBUGCTLMSR, 0x1); -#endif - return (1); } Index: src/sys/arch/i386/i386/genassym.cf diff -u src/sys/arch/i386/i386/genassym.cf:1.103 src/sys/arch/i386/i386/genassym.cf:1.104 --- src/sys/arch/i386/i386/genassym.cf:1.103 Sat Aug 12 13:16:14 2017 +++ src/sys/arch/i386/i386/genassym.cf Sun Sep 17 09:04:51 2017 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.103 2017/08/12 13:16:14 maxv Exp $ +# $NetBSD: genassym.cf,v 1.104 2017/09/17 09:04:51 maxv Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -128,9 +128,6 @@ if NISA > 0 include endif -include - - include define PAGE_SIZE PAGE_SIZE @@ -268,9 +265,6 @@ define CPU_INFO_CC_SKEW offsetof(struct define CPU_INFO_VENDOR offsetof(struct cpu_info, ci_vendor[0]) define CPU_INFO_SIGNATURE offsetof(struct cpu_info, ci_signature) -define CPU_TLOG_OFFSET offsetof(struct cpu_info, ci_tlog_offset) -define CPU_TLOG_BASE offsetof(struct cpu_info, ci_tlog_base) - define CPU_INFO_GDT offsetof(struct cpu_info, ci_gdt) define CPU_INFO_IPENDING offsetof(struct cpu_info, ci_ipending) define CPU_INFO_IMASK offsetof(struct cpu_info, ci_imask) @@ -321,18 +315,6 @@ define IS_TYPE offsetof(struct intrsou define IS_MAXLEVEL offsetof(struct intrsource, is_maxlevel) define IS_LWP offsetof(struct intrsource, is_lwp) -define TREC_SP offsetof(struct trec, tr_sp) -define TREC_HPC offsetof(struct trec, tr_hpc) -define TREC_IPC offsetof(struct trec, tr_ipc) -define TREC_TSC offsetof(struct trec, tr_tsc) -define TREC_LBF offsetof(struct trec, tr_lbf) -define TREC_LBT offsetof(struct trec, tr_lbt) -define TREC_IBF offsetof(struct trec, tr_ibf) -define TREC_IBT offsetof(struct trec, tr_ibt) - -define SIZEOF_TREC sizeof(struct trec) -define SIZEOF_TLOG sizeof(struct tlog) - define IPL_NONE IPL_NONE define IPL_PREEMPT IPL_PREEMPT define IPL_SCHED IPL_SCHED Index: src/sys/arch/i386/i386/machdep.c diff -u src/sys/arch/i386/i386/machdep.c:1.792 src/sys/arch/i386/i386/machdep.c:1.793 --- src/sys/arch/i386/i386/machdep.c:1.792 Sun Aug 27 09:32:12 2017 +++ src/sys/arch/i386/i386/machdep.c Sun Sep 17 09:04:51 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.792 2017/08/27 09:32:12 maxv Exp $ */ +/* $NetBSD: machdep.c,v 1.793 2017/09/17 09:04:51 maxv Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009 @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.792 2017/08/27 09:32:12 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.793 2017/09/17 09:04:51 maxv Exp $"); #include "opt_beep.h" #include "opt_compat_freebsd.h" @@ -438,13 +438,6 @@ cpu_startup(void) multiboot_print_info(); #endif -#ifdef TRAPLOG - /* - * Enable recording of branch from/to in MSR's - */ - wrmsr(MSR_DEBUGCTLMSR, 0x1); -#endif - #if NCARDBUS > 0 /* Tell RBUS how much RAM we have, so it can use heuristics. */ rbus_min_start_hint(ctob((psize_t)physmem)); Index: src/sys/arch/i386/include/frameasm.h diff -u src/sys/arch/i386/include/frameasm.h:1.16 src/sys/arch/i386/include/frameasm.h:1.17 --- src/sys/arch/i386/include/frameasm.h:1.16 Wed Jun 14 17:09:00 2017 +++ src/sys/arch/i386/include/frameasm.h Sun Sep 17
CVS commit: src/lib/libedit
Module Name:src
Committed By: kre
Date: Sun Sep 17 08:10:08 UTC 2017
Modified Files:
src/lib/libedit: readline.c
Log Message:
PR lib/52547 - read_history (readline.c) should now sets history_length.
Patch from Yen Chi Hsuan in the PR, extracted from Apple's version of
readline.c, then modified by me to be consistent about what the return
value really is.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/lib/libedit/readline.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.143 src/lib/libedit/readline.c:1.144
--- src/lib/libedit/readline.c:1.143 Tue Sep 5 18:07:59 2017
+++ src/lib/libedit/readline.c Sun Sep 17 08:10:08 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.143 2017/09/05 18:07:59 christos Exp $ */
+/* $NetBSD: readline.c,v 1.144 2017/09/17 08:10:08 kre Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.143 2017/09/05 18:07:59 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.144 2017/09/17 08:10:08 kre Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -1355,8 +1355,14 @@ read_history(const char *filename)
rl_initialize();
if (filename == NULL && (filename = _default_history_file()) == NULL)
return errno;
- return history(h, , H_LOAD, filename) == -1 ?
- (errno ? errno : EINVAL) : 0;
+ errno = 0;
+ if (history(h, , H_LOAD, filename) == -1)
+ return errno ? errno : EINVAL;
+ if (history(h, , H_GETSIZE) == 0)
+ history_length = ev.num;
+ if (history_length < 0)
+ return EINVAL;
+ return 0;
}
