CVS commit: src/sys/arch/x86/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Oct 13 13:53:54 UTC 2017

Modified Files:
src/sys/arch/x86/include: specialreg.h

Log Message:
 Add the following instruction bits in Structured Extended Flags Enumeration
Leaf from "Intel Architecture Instruction Set Extensions and Future Features
Programming Reference" (319433-030):
AVX512_IFMA
AVX512_VBMI
AVX512_VBMI2
GFNI
VAES
VPCLMULQDQ
AVX512_VNNI
AVX512_BITALG
AVX512_VPOPCNTDQ
AVX512_4VNNIW
AVX512_4FMAPS


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/x86/include/specialreg.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/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.102 src/sys/arch/x86/include/specialreg.h:1.103
--- src/sys/arch/x86/include/specialreg.h:1.102	Thu Sep  7 06:40:42 2017
+++ src/sys/arch/x86/include/specialreg.h	Fri Oct 13 13:53:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.102 2017/09/07 06:40:42 msaitoh Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.103 2017/10/13 13:53:54 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -345,6 +345,7 @@
 #define CPUID_SEF_RDSEED	__BIT(18)
 #define CPUID_SEF_ADX		__BIT(19)
 #define CPUID_SEF_SMAP		__BIT(20)
+#define CPUID_SEF_AVX512_IFMA	__BIT(21)
 #define CPUID_SEF_CLFLUSHOPT	__BIT(23)
 #define CPUID_SEF_CLWB		__BIT(24)
 #define CPUID_SEF_PT		__BIT(25)
@@ -361,24 +362,41 @@
 	"\11" "BMI2"	"\12" "ERMS"	"\13" "INVPCID"	"\14" "RTM"	\
 	"\15" "QM"	"\16" "FPUCSDS"	"\17" "MPX"	"\20" "PQE"	\
 	"\21" "AVX512F"	"\22" "AVX512DQ" "\23" "RDSEED"	"\24" "ADX"	\
-	"\25" "SMAP"	"\30" "CLFLUSHOPT" \
+	"\25" "SMAP"	"\26" "AVX512_IFMA"		"\30" "CLFLUSHOPT" \
 	"\31" "CLWB"	"\32" "PT"	"\33" "AVX512PF" "\34" "AVX512ER" \
 	"\35" "AVX512CD""\36" "SHA"	"\37" "AVX512BW" "\40" "AVX512VL"
 
 /* %ecx */
 #define CPUID_SEF_PREFETCHWT1	__BIT(0)
+#define CPUID_SEF_AVX512_VBMI	__BIT(1)
 #define CPUID_SEF_UMIP		__BIT(2)
 #define CPUID_SEF_PKU		__BIT(3)
 #define CPUID_SEF_OSPKE		__BIT(4)
+#define CPUID_SEF_AVX512_VBMI2	__BIT(6)
+#define CPUID_SEF_GFNI		__BIT(8)
+#define CPUID_SEF_VAES		__BIT(9)
+#define CPUID_SEF_VPCLMULQDQ	__BIT(10)
+#define CPUID_SEF_AVX512_VNNI	__BIT(11)
+#define CPUID_SEF_AVX512_BITALG	__BIT(12)
+#define CPUID_SEF_AVX512_VPOPCNTDQ __BIT(14)
 #define CPUID_SEF_RDPID		__BIT(22)
 #define CPUID_SEF_SGXLC		__BIT(30)
 
 #define CPUID_SEF_FLAGS1	"\20" \
-	"\1" "PREFETCHWT1"		"\3" "UMIP"	"\4" "PKU"	\
-	"\5" "OSPKE"			\
+	"\1" "PREFETCHWT1" "\2" "AVX512_VBMI" "\3" "UMIP" "\4" "PKU"	\
+	"\5" "OSPKE"			"\7" "AVX512_VBMI2"		\
+	"\11" "GFNI"	"\12" "VAES"	"\13" "VPCLMULQDQ" "\14" "AVX512_VNNI"\
+	"\15" "AVX512_BITALG"		"\17" "AVX512_VPOPCNTDQ"	\
 	"\27" "RDPID"			\
 	"\37" "SGXLC"
 
+/* %edx */
+#define CPUID_SEF_AVX512_4VNNIW	__BIT(2)
+#define CPUID_SEF_AVX512_4FMAPS	__BIT(3)
+
+#define CPUID_SEF_FLAGS2	"\20" \
+"\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS"
+
 /*
  * CPUID Processor extended state Enumeration Fn000d
  *

CVS commit: src/sys/lib/libsa

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Oct 13 10:39:27 UTC 2017

Modified Files:
src/sys/lib/libsa: loadfile_elf32.c

Log Message:
Introduce two functions, and dedup code.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/lib/libsa/loadfile_elf32.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/lib/libsa/loadfile_elf32.c
diff -u src/sys/lib/libsa/loadfile_elf32.c:1.46 src/sys/lib/libsa/loadfile_elf32.c:1.47
--- src/sys/lib/libsa/loadfile_elf32.c:1.46	Fri Oct 13 10:04:27 2017
+++ src/sys/lib/libsa/loadfile_elf32.c	Fri Oct 13 10:39:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_elf32.c,v 1.46 2017/10/13 10:04:27 maxv Exp $ */
+/* $NetBSD: loadfile_elf32.c,v 1.47 2017/10/13 10:39:26 maxv Exp $ */
 
 /*
  * Copyright (c) 1997, 2008, 2017 The NetBSD Foundation, Inc.
@@ -268,6 +268,62 @@ externalize_shdr(Elf_Byte bo, Elf_Shdr *
 #define KERNALIGN 4096	/* XXX should depend on marks[] */
 
 /*
+ * Read some data from a file, and put it in the bootloader memory (local).
+ */
+static int
+ELFNAMEEND(readfile_local)(int fd, Elf_Off elfoff, void *addr, size_t size)
+{
+	ssize_t nr;
+
+	if (lseek(fd, elfoff, SEEK_SET) == -1)  {
+		WARN(("lseek section headers"));
+		return -1;
+	}
+	nr = read(fd, addr, size);
+	if (nr == -1) {
+		WARN(("read section headers"));
+		return -1;
+	}
+	if (nr != (ssize_t)size) {
+		errno = EIO;
+		WARN(("read section headers"));
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * Read some data from a file, and put it in wherever in memory (global).
+ */
+static int
+ELFNAMEEND(readfile_global)(int fd, u_long offset, Elf_Off elfoff,
+Elf_Addr addr, size_t size)
+{
+	ssize_t nr;
+
+	/* some ports dont use the offset */
+	(void)
+
+	if (lseek(fd, elfoff, SEEK_SET) == -1) {
+		WARN(("lseek section"));
+		return -1;
+	}
+	nr = READ(fd, addr, size);
+	if (nr == -1) {
+		WARN(("read section"));
+		return -1;
+	}
+	if (nr != (ssize_t)size) {
+		errno = EIO;
+		WARN(("read section"));
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
  * Load a dynamic ELF binary into memory. Layout of the memory:
  * ++-+-+--+
  * | ELF HEADER | SECTION HEADERS | KERNEL SECTIONS | SYM+REL SECTIONS |
@@ -287,32 +343,19 @@ ELFNAMEEND(loadfile_dynamic)(int fd, Elf
 	Elf_Shdr *shdr;
 	Elf_Addr shpp, addr;
 	int i, j, loaded;
-	size_t size;
-	ssize_t sz, nr;
+	size_t size, shdrsz;
 	Elf_Addr maxp, elfp = 0;
-
-	/* some ports dont use the offset */
-	(void)
+	int ret;
 
 	maxp = marks[MARK_END];
 
 	internalize_ehdr(elf->e_ident[EI_DATA], elf);
 
 	/* Create a local copy of the SECTION HEADERS. */
-	sz = elf->e_shnum * sizeof(Elf_Shdr);
-	shdr = ALLOC(sz);
-	if (lseek(fd, elf->e_shoff, SEEK_SET) == -1)  {
-		WARN(("lseek section headers"));
-		goto out;
-	}
-	nr = read(fd, shdr, sz);
-	if (nr == -1) {
-		WARN(("read section headers"));
-		goto out;
-	}
-	if (nr != sz) {
-		errno = EIO;
-		WARN(("read section headers"));
+	shdrsz = elf->e_shnum * sizeof(Elf_Shdr);
+	shdr = ALLOC(shdrsz);
+	ret = ELFNAMEEND(readfile_local)(fd, elf->e_shoff, shdr, shdrsz);
+	if (ret == -1) {
 		goto out;
 	}
 
@@ -337,7 +380,7 @@ ELFNAMEEND(loadfile_dynamic)(int fd, Elf
 
 	/* Save location of the SECTION HEADERS. */
 	shpp = maxp;
-	maxp += roundup(sz, ELFROUND);
+	maxp += roundup(shdrsz, ELFROUND);
 
 	/*
 	 * Load the KERNEL SECTIONS.
@@ -355,21 +398,11 @@ ELFNAMEEND(loadfile_dynamic)(int fd, Elf
 			loaded = 1;
 			break;
 		case SHT_PROGBITS:
-			if (lseek(fd, shdr[i].sh_offset, SEEK_SET) == -1) {
-WARN(("lseek section"));
-goto out;
-			}
-			nr = READ(fd, addr, size);
-			if (nr == -1) {
-WARN(("read section"));
+			ret = ELFNAMEEND(readfile_global)(fd, offset,
+			shdr[i].sh_offset, addr, size);
+			if (ret == -1) {
 goto out;
 			}
-			if (nr != (ssize_t)size) {
-errno = EIO;
-WARN(("read section"));
-goto out;
-			}
-
 			loaded = 1;
 			break;
 		default:
@@ -409,21 +442,11 @@ ELFNAMEEND(loadfile_dynamic)(int fd, Elf
 		case SHT_REL:
 		case SHT_RELA:
 		case SHT_SYMTAB:
-			if (lseek(fd, shdr[i].sh_offset, SEEK_SET) == -1) {
-WARN(("lseek symbols"));
+			ret = ELFNAMEEND(readfile_global)(fd, offset,
+			shdr[i].sh_offset, addr, size);
+			if (ret == -1) {
 goto out;
 			}
-			nr = READ(fd, addr, size);
-			if (nr == -1) {
-WARN(("read symbols"));
-goto out;
-			}
-			if (nr != (ssize_t)size) {
-errno = EIO;
-WARN(("read symbols"));
-goto out;
-			}
-
 			shdr[i].sh_offset = maxp - elfp;
 			maxp += roundup(size, ELFROUND);
 			break;
@@ -438,9 +461,9 @@ ELFNAMEEND(loadfile_dynamic)(int fd, Elf
 	for (i = 0; i < elf->e_shnum; i++)
 		externalize_shdr(elf->e_ident[EI_DATA], [i]);
 #endif
-	BCOPY(shdr, shpp, sz);
+	BCOPY(shdr, shpp, shdrsz);
 
-	DEALLOC(shdr, sz);
+	DEALLOC(shdr, shdrsz);
 
 	/*
 	 * Just update MARK_SYM and MARK_END without touching the rest.
@@ -450,7 

CVS commit: src/sys/lib/libsa

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Fri Oct 13 10:04:27 UTC 2017

Modified Files:
src/sys/lib/libsa: loadfile_elf32.c

Log Message:
Constify offset, it must not change.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/lib/libsa/loadfile_elf32.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/lib/libsa/loadfile_elf32.c
diff -u src/sys/lib/libsa/loadfile_elf32.c:1.45 src/sys/lib/libsa/loadfile_elf32.c:1.46
--- src/sys/lib/libsa/loadfile_elf32.c:1.45	Sun Oct  8 13:51:31 2017
+++ src/sys/lib/libsa/loadfile_elf32.c	Fri Oct 13 10:04:27 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_elf32.c,v 1.45 2017/10/08 13:51:31 maxv Exp $ */
+/* $NetBSD: loadfile_elf32.c,v 1.46 2017/10/13 10:04:27 maxv Exp $ */
 
 /*
  * Copyright (c) 1997, 2008, 2017 The NetBSD Foundation, Inc.
@@ -283,13 +283,13 @@ externalize_shdr(Elf_Byte bo, Elf_Shdr *
 static int
 ELFNAMEEND(loadfile_dynamic)(int fd, Elf_Ehdr *elf, u_long *marks, int flags)
 {
+	const u_long offset = 0;
 	Elf_Shdr *shdr;
 	Elf_Addr shpp, addr;
 	int i, j, loaded;
 	size_t size;
 	ssize_t sz, nr;
 	Elf_Addr maxp, elfp = 0;
-	u_long offset = 0;
 
 	/* some ports dont use the offset */
 	(void)
@@ -463,13 +463,13 @@ static int
 ELFNAMEEND(loadsym)(int fd, Elf_Ehdr *elf, Elf_Addr maxp, Elf_Addr elfp,
 u_long *marks, int flags, Elf_Addr *nmaxp)
 {
+	const u_long offset = marks[MARK_START];
 	int boot_load_ctf = 1;
 	Elf_Shdr *shp;
 	Elf_Addr shpp;
 	char *shstr = NULL;
 	ssize_t nr, sz;
 	size_t i, j, shstrsz = 0;
-	u_long offset = marks[MARK_START];
 	struct __packed {
 		Elf_Nhdr nh;
 		uint8_t name[ELF_NOTE_NETBSD_NAMESZ + 1];
@@ -679,11 +679,11 @@ out:
 static int
 ELFNAMEEND(loadfile_static)(int fd, Elf_Ehdr *elf, u_long *marks, int flags)
 {
+	const u_long offset = marks[MARK_START];
 	Elf_Phdr *phdr;
 	int i, first;
 	ssize_t sz;
 	Elf_Addr minp = ~0, maxp = 0, pos = 0, elfp = 0;
-	u_long offset = marks[MARK_START];
 	ssize_t nr;
 
 	/* some ports dont use the offset */

CVS commit: src/external/bsd/tmux/dist

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Fri Oct 13 09:43:50 UTC 2017

Modified Files:
src/external/bsd/tmux/dist: window-client.c window-tree.c

Log Message:
cast pointers to uintptr_t, not uint64_t - then allow integer promotions
take care of any size differences.

Should fix builds of systems with 32 bit pointers (i386 et al).


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tmux/dist/window-client.c \
src/external/bsd/tmux/dist/window-tree.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/tmux/dist/window-client.c
diff -u src/external/bsd/tmux/dist/window-client.c:1.1.1.1 src/external/bsd/tmux/dist/window-client.c:1.2
--- src/external/bsd/tmux/dist/window-client.c:1.1.1.1	Thu Oct 12 21:59:49 2017
+++ src/external/bsd/tmux/dist/window-client.c	Fri Oct 13 09:43:50 2017
@@ -204,7 +204,7 @@ window_client_build(void *modedata, u_in
 		}
 
 		text = format_single(NULL, data->format, c, NULL, NULL, NULL);
-		mode_tree_add(data->data, NULL, item, (uint64_t)c, c->name,
+		mode_tree_add(data->data, NULL, item, (uintptr_t)c, c->name,
 		text, -1);
 		free(text);
 	}
Index: src/external/bsd/tmux/dist/window-tree.c
diff -u src/external/bsd/tmux/dist/window-tree.c:1.1.1.1 src/external/bsd/tmux/dist/window-tree.c:1.2
--- src/external/bsd/tmux/dist/window-tree.c:1.1.1.1	Thu Oct 12 21:59:49 2017
+++ src/external/bsd/tmux/dist/window-tree.c	Fri Oct 13 09:43:50 2017
@@ -235,7 +235,7 @@ window_tree_build_pane(struct session *s
 	text = format_single(NULL, data->format, NULL, s, wl, wp);
 	xasprintf(, "%u", idx);
 
-	mode_tree_add(data->data, parent, item, (uint64_t)wp, name, text, -1);
+	mode_tree_add(data->data, parent, item, (uintptr_t)wp, name, text, -1);
 	free(text);
 	free(name);
 }
@@ -283,7 +283,7 @@ window_tree_build_window(struct session 
 		expanded = 0;
 	else
 		expanded = 1;
-	mti = mode_tree_add(data->data, parent, item, (uint64_t)wl, name, text,
+	mti = mode_tree_add(data->data, parent, item, (uintptr_t)wl, name, text,
 	expanded);
 	free(text);
 	free(name);
@@ -354,7 +354,7 @@ window_tree_build_session(struct session
 		expanded = 0;
 	else
 		expanded = 1;
-	mti = mode_tree_add(data->data, NULL, item, (uint64_t)s, s->name, text,
+	mti = mode_tree_add(data->data, NULL, item, (uintptr_t)s, s->name, text,
 	expanded);
 	free(text);
 
@@ -428,13 +428,13 @@ window_tree_build(void *modedata, u_int 
 	case WINDOW_TREE_NONE:
 		break;
 	case WINDOW_TREE_SESSION:
-		*tag = (uint64_t)data->fs.s;
+		*tag = (uintptr_t)data->fs.s;
 		break;
 	case WINDOW_TREE_WINDOW:
-		*tag = (uint64_t)data->fs.wl;
+		*tag = (uintptr_t)data->fs.wl;
 		break;
 	case WINDOW_TREE_PANE:
-		*tag = (uint64_t)data->fs.wp;
+		*tag = (uintptr_t)data->fs.wp;
 		break;
 	}
 }

CVS commit: src/sys/dev/pci/ixgbe

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Oct 13 08:17:44 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe_common.c ixgbe_vf.c ixv.c

Log Message:
 Show 2.5GBASE-T and 5GBASE-T correctly on ixv(4). Tested on a virtual function
on X550 T1.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/ixgbe/ixv.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/dev/pci/ixgbe/ixgbe_common.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_common.c:1.14 src/sys/dev/pci/ixgbe/ixgbe_common.c:1.15
--- src/sys/dev/pci/ixgbe/ixgbe_common.c:1.14	Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_common.c	Fri Oct 13 08:17:44 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_common.c,v 1.14 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_common.c,v 1.15 2017/10/13 08:17:44 msaitoh Exp $ */
 
 /**
 
@@ -4248,7 +4248,7 @@ s32 ixgbe_check_mac_link_generic(struct 
 		break;
 	case IXGBE_LINKS_SPEED_100_82599:
 		*speed = IXGBE_LINK_SPEED_100_FULL;
-		if (hw->mac.type == ixgbe_mac_X550) {
+		if (hw->mac.type >= ixgbe_mac_X550) {
 			if (links_reg & IXGBE_LINKS_SPEED_NON_STD)
 *speed = IXGBE_LINK_SPEED_5GB_FULL;
 		}

Index: src/sys/dev/pci/ixgbe/ixgbe_vf.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_vf.c:1.13 src/sys/dev/pci/ixgbe/ixgbe_vf.c:1.14
--- src/sys/dev/pci/ixgbe/ixgbe_vf.c:1.13	Wed Aug 30 08:49:18 2017
+++ src/sys/dev/pci/ixgbe/ixgbe_vf.c	Fri Oct 13 08:17:44 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_vf.c,v 1.13 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_vf.c,v 1.14 2017/10/13 08:17:44 msaitoh Exp $ */
 
 /**
 
@@ -630,7 +630,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe
 		break;
 	case IXGBE_LINKS_SPEED_100_82599:
 		*speed = IXGBE_LINK_SPEED_100_FULL;
-		if (hw->mac.type == ixgbe_mac_X550) {
+		if (hw->mac.type >= ixgbe_mac_X550) {
 			if (links_reg & IXGBE_LINKS_SPEED_NON_STD)
 *speed = IXGBE_LINK_SPEED_5GB_FULL;
 		}

Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.70 src/sys/dev/pci/ixgbe/ixv.c:1.71
--- src/sys/dev/pci/ixgbe/ixv.c:1.70	Fri Oct 13 04:52:40 2017
+++ src/sys/dev/pci/ixgbe/ixv.c	Fri Oct 13 08:17:44 2017
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.70 2017/10/13 04:52:40 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.71 2017/10/13 08:17:44 msaitoh Exp $*/
 
 /**
 
@@ -955,6 +955,12 @@ ixv_media_status(struct ifnet *ifp, stru
 		case IXGBE_LINK_SPEED_10GB_FULL:
 			ifmr->ifm_active |= IFM_10G_T | IFM_FDX;
 			break;
+		case IXGBE_LINK_SPEED_5GB_FULL:
+			ifmr->ifm_active |= IFM_5000_T | IFM_FDX;
+			break;
+		case IXGBE_LINK_SPEED_2_5GB_FULL:
+			ifmr->ifm_active |= IFM_2500_T | IFM_FDX;
+			break;
 		case IXGBE_LINK_SPEED_1GB_FULL:
 			ifmr->ifm_active |= IFM_1000_T | IFM_FDX;
 			break;

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:17:26 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
301


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-8.0

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-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.65 src/doc/CHANGES-8.0:1.1.2.66
--- src/doc/CHANGES-8.0:1.1.2.65	Wed Oct 11 22:55:18 2017
+++ src/doc/CHANGES-8.0	Fri Oct 13 08:17:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.65 2017/10/11 22:55:18 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.66 2017/10/13 08:17:26 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -6237,3 +6237,9 @@ distrib/sets/lists/comp/mi			1.2149-1.21
 	Don't install stdatomic.h if we don't have gcccmds.
 	[christos, ticket #319]
 
+sys/sys/kernhist.h1.19-1.20
+
+	Call sysctl_kernhist_new for KERNHIST_LINK_STATIC.
+	Can get usbhist from vmstat(1) again.
+	[pgoyette, ticket #301]
+

CVS commit: [netbsd-8] src/sys/sys

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:14:51 UTC 2017

Modified Files:
src/sys/sys [netbsd-8]: kernhist.h

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #301):
sys/sys/kernhist.h: revision 1.19-1.20
Call sysctl_kernhist_new for KERNHIST_LINK_STATIC.  I can get usbhist
from vmstat(1) again.
--
Use do {...} while 0; construct for KERNHIST_LINK_STATIC()
NFCI


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/sys/kernhist.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/sys/kernhist.h
diff -u src/sys/sys/kernhist.h:1.18 src/sys/sys/kernhist.h:1.18.8.1
--- src/sys/sys/kernhist.h:1.18	Tue Jan 10 00:50:57 2017
+++ src/sys/sys/kernhist.h	Fri Oct 13 08:14:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernhist.h,v 1.18 2017/01/10 00:50:57 pgoyette Exp $	*/
+/*	$NetBSD: kernhist.h,v 1.18.8.1 2017/10/13 08:14:51 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -147,6 +147,12 @@ extern	struct kern_history_head kern_his
 #define KERNHIST_DECL(NAME) extern struct kern_history NAME
 #define KERNHIST_DEFINE(NAME) struct kern_history NAME
 
+#define KERNHIST_LINK_STATIC(NAME) \
+do { \
+	LIST_INSERT_HEAD(_histories, &(NAME), list); \
+	sysctl_kernhist_new(&(NAME)); \
+} while (/*CONSTCOND*/ 0)
+
 #define KERNHIST_INIT(NAME,N) \
 do { \
 	(NAME).name = __STRING(NAME); \
@@ -156,8 +162,7 @@ do { \
 	(NAME).e = (struct kern_history_ent *) \
 		kmem_zalloc(sizeof(struct kern_history_ent) * (N), KM_SLEEP); \
 	(NAME).s = 0; \
-	LIST_INSERT_HEAD(_histories, &(NAME), list); \
-	sysctl_kernhist_new(&(NAME)); \
+	KERNHIST_LINK_STATIC(NAME); \
 } while (/*CONSTCOND*/ 0)
 
 #define KERNHIST_INITIALIZER(NAME,BUF) \
@@ -171,9 +176,6 @@ do { \
 	/* BUF will inititalized to zeroes by being in .bss */ \
 }
 
-#define KERNHIST_LINK_STATIC(NAME) \
-	LIST_INSERT_HEAD(_histories, &(NAME), list)
-
 #define KERNHIST_INIT_STATIC(NAME,BUF) \
 do { \
 	(NAME).name = __STRING(NAME); \
@@ -184,7 +186,6 @@ do { \
 	(NAME).s = 0; \
 	memset((NAME).e, 0, sizeof(struct kern_history_ent) * (NAME).n); \
 	KERNHIST_LINK_STATIC(NAME); \
-	sysctl_kernhist_new(&(NAME)); \
 } while (/*CONSTCOND*/ 0)
 
 #ifndef KERNHIST_DELAY

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:12:44 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
1503


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.49 -r1.1.2.50 src/doc/CHANGES-7.2

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-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.49 src/doc/CHANGES-7.2:1.1.2.50
--- src/doc/CHANGES-7.2:1.1.2.49	Sun Oct  1 17:14:39 2017
+++ src/doc/CHANGES-7.2	Fri Oct 13 08:12:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.49 2017/10/01 17:14:39 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.50 2017/10/13 08:12:44 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -4705,3 +4705,11 @@ sys/dev/usb/usb.c1.166
 	Add a missing break that should've been included in 1.163.
 	[skrll, ticket #1502]
 
+sys/dev/usb/uhidev.c1.71
+sys/dev/usb/ukbd.c1.137-1.138
+
+	Fix memory leak in report parsing error paths.
+	Support more varieties of USB keyboard reports.
+	Always try to set USB HID devices into Report Protocol.
+	[jakllsch, ticket #1503]
+

CVS commit: [netbsd-7] src/sys/dev/usb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:11:20 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7]: uhidev.c ukbd.c

Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #1503):
sys/dev/usb/uhidev.c: revision 1.71
sys/dev/usb/ukbd.c: revision 1.137-1.138
Fix memory leak in report parsing error paths.
--
Support more varieties of USB keyboard reports.
The previous code asssumed reports would closely match the Bootstrap
Keyboard Protocol.  This is no longer always the case, particularly
with higher-end keyboards.
--
Always try to set USB HID devices into Report Protocol.  (Unless the
device is known to be quirky.)
Some of the most-widely-compatible methods of implementing USB Keyboard
NKRO depend on this Request to function as designed.
Issuing this Request is recommended by the HID 1.11 spec (7.2.6):
... "the host should not make any assumptions about the device's state
and should set the desired protocol whenever initializing a device."


To generate a diff of this commit:
cvs rdiff -u -r1.61.2.3 -r1.61.2.4 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.129.4.2 -r1.129.4.3 src/sys/dev/usb/ukbd.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/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.61.2.3 src/sys/dev/usb/uhidev.c:1.61.2.4
--- src/sys/dev/usb/uhidev.c:1.61.2.3	Wed Apr  5 19:54:20 2017
+++ src/sys/dev/usb/uhidev.c	Fri Oct 13 08:11:20 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhidev.c,v 1.61.2.3 2017/04/05 19:54:20 snj Exp $	*/
+/*	$NetBSD: uhidev.c,v 1.61.2.4 2017/10/13 08:11:20 snj Exp $	*/
 
 /*
  * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.61.2.3 2017/04/05 19:54:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.61.2.4 2017/10/13 08:11:20 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -152,12 +152,9 @@ uhidev_attach(device_t parent, device_t 
 		aprint_error_dev(self, "couldn't establish power handler\n");
 
 	(void)usbd_set_idle(iface, 0, 0);
-#if 0
 
-	if ((usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_NO_SET_PROTO) == 0 &&
-	id->bInterfaceSubClass != UISUBCLASS_BOOT)
+	if ((usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_NO_SET_PROTO) == 0)
 		(void)usbd_set_protocol(iface, 1);
-#endif
 
 	maxinpktsize = 0;
 	sc->sc_iep_addr = sc->sc_oep_addr = -1;

Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.129.4.2 src/sys/dev/usb/ukbd.c:1.129.4.3
--- src/sys/dev/usb/ukbd.c:1.129.4.2	Wed Apr  5 19:54:20 2017
+++ src/sys/dev/usb/ukbd.c	Fri Oct 13 08:11:20 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: ukbd.c,v 1.129.4.2 2017/04/05 19:54:20 snj Exp $*/
+/*  $NetBSD: ukbd.c,v 1.129.4.3 2017/10/13 08:11:20 snj Exp $*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.129.4.2 2017/04/05 19:54:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.129.4.3 2017/10/13 08:11:20 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -83,12 +83,11 @@ int	ukbddebug = 0;
 #define DPRINTFN(n,x)
 #endif
 
-#define MAXKEYCODE 6
-#define MAXMOD 8		/* max 32 */
+#define MAXKEYCODE 32
+#define MAXKEYS 256
 
 struct ukbd_data {
-	uint32_t	modifiers;
-	uint8_t		keycode[MAXKEYCODE];
+	uint8_t		keys[MAXKEYS/NBBY];
 };
 
 #define PRESS0x000
@@ -234,19 +233,14 @@ Static const uint8_t ukbd_trtab[256] = {
 
 #define KEY_ERROR 0x01
 
-#define MAXKEYS (MAXMOD+2*MAXKEYCODE)
-
 struct ukbd_softc {
 	struct uhidev sc_hdev;
 
 	struct ukbd_data sc_ndata;
 	struct ukbd_data sc_odata;
-	struct hid_location sc_modloc[MAXMOD];
-	u_int sc_nmod;
-	struct {
-		uint32_t mask;
-		uint8_t key;
-	} sc_mods[MAXMOD];
+	struct hid_location sc_keyloc[MAXKEYS];
+	uint8_t sc_keyuse[MAXKEYS];
+	u_int sc_nkeyloc;
 
 	struct hid_location sc_keycodeloc;
 	u_int sc_nkeycode;
@@ -307,15 +301,17 @@ void ukbdtracedump(void);
 void
 ukbdtracedump(void)
 {
-	int i;
+	size_t i, j;
 	for (i = 0; i < UKBDTRACESIZE; i++) {
 		struct ukbdtraceinfo *p =
 		[(i+ukbdtraceindex)%UKBDTRACESIZE];
-		printf("%"PRIu64".%06"PRIu64": mod=0x%02x key0=0x%02x key1=0x%02x "
-		   "key2=0x%02x key3=0x%02x\n",
-		   p->tv.tv_sec, (uint64_t)p->tv.tv_usec,
-		   p->ud.modifiers, p->ud.keycode[0], p->ud.keycode[1],
-		   p->ud.keycode[2], p->ud.keycode[3]);
+		printf("%"PRIu64".%06"PRIu64":", p->tv.tv_sec,
+		(uint64_t)p->tv.tv_usec);
+		for (j = 0; j < MAXKEYS; j++) {
+			if (isset(p->ud.keys, j))
+printf(" %zu", j);
+		}
+		printf(".\n");
 	}
 }
 #endif
@@ -438,7 +434,7 @@ ukbd_attach(device_t parent, device_t se
 #endif
 
 #ifdef DIAGNOSTIC
-	aprint_normal(": %d modifier keys, %d key codes", sc->sc_nmod,
+	aprint_normal(": %d Variable keys, %d Array codes", sc->sc_nkeyloc,
 	   sc->sc_nkeycode);
 	if (sc->sc_flags & FLAG_APPLE_FN)
 		aprint_normal(", apple fn key");

CVS commit: [netbsd-6] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:06:09 UTC 2017

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
1504-1506


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.310 -r1.1.2.311 src/doc/CHANGES-6.2

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-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.310 src/doc/CHANGES-6.2:1.1.2.311
--- src/doc/CHANGES-6.2:1.1.2.310	Mon Sep 11 04:46:21 2017
+++ src/doc/CHANGES-6.2	Fri Oct 13 08:06:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.310 2017/09/11 04:46:21 snj Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.311 2017/10/13 08:06:09 snj Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -20926,3 +20926,19 @@ crypto/external/bsd/heimdal/include/roke
 	  getpw*() internal buffers.
 	[mlelstv, ticket #1503]
 
+usr.sbin/syslogd/syslogd.c			1.124
+
+	Use looked up remote host for remote message without a hostname
+	[ginsbach, ticket #1504]
+
+sys/arch/i386/i386/i386_trap.S			1.12 via patch
+
+	use %ss instead of %ds in trap06
+	[maxv, ticket #1505]
+
+sys/fs/msdosfs/msdosfs_vfsops.c			1.128
+
+	Add more sanity checks for BPB parameters. Handle FAT12 format
+	for media with sectors >= 32kByte.  PR 52485.
+	[mlelstv, ticket #1506]
+

CVS commit: [netbsd-6] src/sys/fs/msdosfs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:05:30 UTC 2017

Modified Files:
src/sys/fs/msdosfs [netbsd-6]: msdosfs_vfsops.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1506):
sys/fs/msdosfs/msdosfs_vfsops.c: revision 1.128
Add more sanity checks for BPB parameters. Handle FAT12 format for media
with sectors >= 32kByte.
Does fix PR 52485.


To generate a diff of this commit:
cvs rdiff -u -r1.93.6.3 -r1.93.6.4 src/sys/fs/msdosfs/msdosfs_vfsops.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/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.93.6.3 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.93.6.4
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.93.6.3	Sun Nov  9 06:37:00 2014
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c	Fri Oct 13 08:05:30 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_vfsops.c,v 1.93.6.3 2014/11/09 06:37:00 msaitoh Exp $	*/
+/*	$NetBSD: msdosfs_vfsops.c,v 1.93.6.4 2017/10/13 08:05:30 snj Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.93.6.3 2014/11/09 06:37:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.93.6.4 2017/10/13 08:05:30 snj Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -479,6 +479,7 @@ msdosfs_mountfs(struct vnode *devvp, str
 	int	ronly, error, BlkPerSec;
 	uint64_t psize;
 	unsigned secsize;
+	u_long fatbytes, fatblocksecs;
 
 	/* Flush out any old buffers remaining from a previous use. */
 	if ((error = vinvalbuf(devvp, V_SAVE, l->l_cred, l, 0, 0)) != 0)
@@ -708,12 +709,40 @@ msdosfs_mountfs(struct vnode *devvp, str
 			pmp->pm_fatdiv = 1;
 		}
 	}
-	if (FAT12(pmp))
-		pmp->pm_fatblocksize = 3 * pmp->pm_BytesPerSec;
-	else
+
+	/* validate cluster count against FAT */
+	if ((pmp->pm_maxcluster & pmp->pm_fatmask) != pmp->pm_maxcluster) {
+		DPRINTF("maxcluster %lu outside of mask %#lx\n",
+			pmp->pm_maxcluster, pmp->pm_fatmask);
+		error = EINVAL;
+		goto error_exit;
+	}
+
+	/* validate FAT size */
+	fatbytes = (pmp->pm_maxcluster+1) * pmp->pm_fatmult / pmp->pm_fatdiv;
+	fatblocksecs = howmany(fatbytes, pmp->pm_BytesPerSec);
+
+	if (pmp->pm_FATsecs != fatblocksecs) {
+		DPRINTF("FATsecs %lu != real %lu\n", pmp->pm_FATsecs,
+			fatblocksecs);
+		error = EINVAL;
+		goto error_exit;
+	}
+
+	if (FAT12(pmp)) {
+		/*
+		 * limit block size to what is needed to read a FAT block
+		 * to not exceed MAXBSIZE
+		 */
+		pmp->pm_fatblocksec = min(3, fatblocksecs);
+		pmp->pm_fatblocksize = pmp->pm_fatblocksec
+			* pmp->pm_BytesPerSec;
+	} else {
 		pmp->pm_fatblocksize = MAXBSIZE;
+		pmp->pm_fatblocksec = pmp->pm_fatblocksize
+			/ pmp->pm_BytesPerSec;
+	}
 
-	pmp->pm_fatblocksec = pmp->pm_fatblocksize / pmp->pm_BytesPerSec;
 	pmp->pm_bnshift = ffs(pmp->pm_BytesPerSec) - 1;
 
 	/*

CVS commit: [netbsd-6-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:04:27 UTC 2017

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.7

Log Message:
1505


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.117 -r1.1.2.118 src/doc/CHANGES-6.0.7

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-6.0.7
diff -u src/doc/CHANGES-6.0.7:1.1.2.117 src/doc/CHANGES-6.0.7:1.1.2.118
--- src/doc/CHANGES-6.0.7:1.1.2.117	Mon Sep 11 04:46:47 2017
+++ src/doc/CHANGES-6.0.7	Fri Oct 13 08:04:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.7,v 1.1.2.117 2017/09/11 04:46:47 snj Exp $
+# $NetBSD: CHANGES-6.0.7,v 1.1.2.118 2017/10/13 08:04:27 snj Exp $
 
 A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7
 release:
@@ -15158,3 +15158,8 @@ crypto/external/bsd/heimdal/include/roke
 	  getpw*() internal buffers.
 	[mlelstv, ticket #1503]
 
+sys/arch/i386/i386/i386_trap.S			1.12 via patch
+
+	use %ss instead of %ds in trap06
+	[maxv, ticket #1505]
+

CVS commit: [netbsd-6-1] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:04:37 UTC 2017

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.6

Log Message:
1505


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-6.1.6

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-6.1.6
diff -u src/doc/CHANGES-6.1.6:1.1.2.114 src/doc/CHANGES-6.1.6:1.1.2.115
--- src/doc/CHANGES-6.1.6:1.1.2.114	Mon Sep 11 04:46:35 2017
+++ src/doc/CHANGES-6.1.6	Fri Oct 13 08:04:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.114 2017/09/11 04:46:35 snj Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.115 2017/10/13 08:04:37 snj Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -14831,3 +14831,8 @@ crypto/external/bsd/heimdal/include/roke
 	  getpw*() internal buffers.
 	[mlelstv, ticket #1503]
 
+sys/arch/i386/i386/i386_trap.S			1.12 via patch
+
+	use %ss instead of %ds in trap06
+	[maxv, ticket #1505]
+

CVS commit: [netbsd-6-1] src/sys/arch/i386/i386

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:03:02 UTC 2017

Modified Files:
src/sys/arch/i386/i386 [netbsd-6-1]: vector.S

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1505):
sys/arch/i386/i386/i386_trap.S: revision 1.12 via patch
Pfff, use %ss and not %ds. The latter is controlled by userland, the former
contains the kernel value (flat); FreeBSD fixed this too a few weeks ago.
As I said earlier, this dtrace code is complete bullshit.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.14.1 src/sys/arch/i386/i386/vector.S

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/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.59 src/sys/arch/i386/i386/vector.S:1.59.14.1
--- src/sys/arch/i386/i386/vector.S:1.59	Sun Jun 12 03:35:42 2011
+++ src/sys/arch/i386/i386/vector.S	Fri Oct 13 08:03:02 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vector.S,v 1.59 2011/06/12 03:35:42 rmind Exp $	*/
+/*	$NetBSD: vector.S,v 1.59.14.1 2017/10/13 08:03:02 snj Exp $	*/
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.59 2011/06/12 03:35:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.59.14.1 2017/10/13 08:03:02 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -773,7 +773,7 @@ IDTVEC(trap05)
 	SUPERALIGN_TEXT
 IDTVEC(trap06)
 	/* Check if there is no DTrace hook registered. */
-	cmpl	$0,dtrace_invop_jump_addr
+	cmpl	$0,%ss:dtrace_invop_jump_addr
 	je	norm_ill
 
 	/* Check if this is a user fault. */

CVS commit: [netbsd-6-0] src/sys/arch/i386/i386

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:03:00 UTC 2017

Modified Files:
src/sys/arch/i386/i386 [netbsd-6-0]: vector.S

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1505):
sys/arch/i386/i386/i386_trap.S: revision 1.12 via patch
Pfff, use %ss and not %ds. The latter is controlled by userland, the former
contains the kernel value (flat); FreeBSD fixed this too a few weeks ago.
As I said earlier, this dtrace code is complete bullshit.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.12.1 src/sys/arch/i386/i386/vector.S

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/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.59 src/sys/arch/i386/i386/vector.S:1.59.12.1
--- src/sys/arch/i386/i386/vector.S:1.59	Sun Jun 12 03:35:42 2011
+++ src/sys/arch/i386/i386/vector.S	Fri Oct 13 08:03:00 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vector.S,v 1.59 2011/06/12 03:35:42 rmind Exp $	*/
+/*	$NetBSD: vector.S,v 1.59.12.1 2017/10/13 08:03:00 snj Exp $	*/
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.59 2011/06/12 03:35:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.59.12.1 2017/10/13 08:03:00 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -773,7 +773,7 @@ IDTVEC(trap05)
 	SUPERALIGN_TEXT
 IDTVEC(trap06)
 	/* Check if there is no DTrace hook registered. */
-	cmpl	$0,dtrace_invop_jump_addr
+	cmpl	$0,%ss:dtrace_invop_jump_addr
 	je	norm_ill
 
 	/* Check if this is a user fault. */

CVS commit: [netbsd-6] src/sys/arch/i386/i386

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 08:03:04 UTC 2017

Modified Files:
src/sys/arch/i386/i386 [netbsd-6]: vector.S

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1505):
sys/arch/i386/i386/i386_trap.S: revision 1.12 via patch
Pfff, use %ss and not %ds. The latter is controlled by userland, the former
contains the kernel value (flat); FreeBSD fixed this too a few weeks ago.
As I said earlier, this dtrace code is complete bullshit.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.8.1 src/sys/arch/i386/i386/vector.S

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/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.59 src/sys/arch/i386/i386/vector.S:1.59.8.1
--- src/sys/arch/i386/i386/vector.S:1.59	Sun Jun 12 03:35:42 2011
+++ src/sys/arch/i386/i386/vector.S	Fri Oct 13 08:03:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vector.S,v 1.59 2011/06/12 03:35:42 rmind Exp $	*/
+/*	$NetBSD: vector.S,v 1.59.8.1 2017/10/13 08:03:03 snj Exp $	*/
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.59 2011/06/12 03:35:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.59.8.1 2017/10/13 08:03:03 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -773,7 +773,7 @@ IDTVEC(trap05)
 	SUPERALIGN_TEXT
 IDTVEC(trap06)
 	/* Check if there is no DTrace hook registered. */
-	cmpl	$0,dtrace_invop_jump_addr
+	cmpl	$0,%ss:dtrace_invop_jump_addr
 	je	norm_ill
 
 	/* Check if this is a user fault. */

CVS commit: [netbsd-6] src/usr.sbin/syslogd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 13 07:57:51 UTC 2017

Modified Files:
src/usr.sbin/syslogd [netbsd-6]: syslogd.c

Log Message:
Pull up following revision(s) (requested by ginsbach in ticket #1504):
usr.sbin/syslogd/syslogd.c: revision 1.124
Use looked up remote host for remote message without a hostname
An incoming remote message may not necessarily have a hostname
between the timestamp and the message. The the source of the remote
sender is already looked up so use that hostname/IP address rather
than the local hostname.


To generate a diff of this commit:
cvs rdiff -u -r1.105.4.2 -r1.105.4.3 src/usr.sbin/syslogd/syslogd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.105.4.2 src/usr.sbin/syslogd/syslogd.c:1.105.4.3
--- src/usr.sbin/syslogd/syslogd.c:1.105.4.2	Thu Aug 31 15:10:29 2017
+++ src/usr.sbin/syslogd/syslogd.c	Fri Oct 13 07:57:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: syslogd.c,v 1.105.4.2 2017/08/31 15:10:29 martin Exp $	*/
+/*	$NetBSD: syslogd.c,v 1.105.4.3 2017/10/13 07:57:51 snj Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: syslogd.c,v 1.105.4.2 2017/08/31 15:10:29 martin Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.105.4.3 2017/10/13 07:57:51 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -1272,7 +1272,7 @@ printline_bsdsyslog(const char *hname, c
 		} else if (*p == '[' || (*p == ':'
 			&& (*(p+1) == ' ' || *(p+1) == '\0'))) {
 			/* no host in message */
-			buffer->host = LocalFQDN;
+			buffer->host = strdup(hname);
 			buffer->prog = strndup(start, p - start);
 			break;
 		} else {

CVS commit: src

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Fri Oct 13 07:04:58 UTC 2017

Modified Files:
src: UPDATING

Log Message:
Note possible need to clean objdir (or depends at least) for
external/bsd/acpica/bin/iasl after build structure change a few days ago.


To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 src/UPDATING

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/UPDATING
diff -u src/UPDATING:1.286 src/UPDATING:1.287
--- src/UPDATING:1.286	Tue Aug 22 10:04:44 2017
+++ src/UPDATING	Fri Oct 13 07:04:58 2017
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.286 2017/08/22 10:04:44 mrg Exp $
+$NetBSD: UPDATING,v 1.287 2017/10/13 07:04:58 kre Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,11 @@ See also: BUILDING, build.sh, Makefile.
 Recent changes:
 ^^^
 
+20171010:
+	a change to the build structure of external/bsd/acpica/bin/iasl
+	means that its objdir (or *.d and .depend at least) might need
+	to be manually removed - or a build done once without -u.
+
 20170822:
 	a new version of GMP has been imported and probably
 	will break parts of builds related to themselves or GCC, both