Module Name: src
Committed By: ad
Date: Fri Nov 22 20:04:03 UTC 2019
Modified Files:
src/sys/arch/x86/x86: x86_tlb.c
src/sys/kern: sys_select.c
Log Message:
Minor correction to previous.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/x86_tlb.c
cvs rdiff -u -r1.49 -r1.50 src/sys/kern/sys_select.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/x86/x86/x86_tlb.c
diff -u src/sys/arch/x86/x86/x86_tlb.c:1.9 src/sys/arch/x86/x86/x86_tlb.c:1.10
--- src/sys/arch/x86/x86/x86_tlb.c:1.9 Thu Nov 21 21:48:33 2019
+++ src/sys/arch/x86/x86/x86_tlb.c Fri Nov 22 20:04:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_tlb.c,v 1.9 2019/11/21 21:48:33 ad Exp $ */
+/* $NetBSD: x86_tlb.c,v 1.10 2019/11/22 20:04:03 ad Exp $ */
/*-
* Copyright (c) 2008-2019 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_tlb.c,v 1.9 2019/11/21 21:48:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_tlb.c,v 1.10 2019/11/22 20:04:03 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -264,8 +264,7 @@ pmap_tlb_shootdown(struct pmap *pm, vadd
tp = (pmap_tlb_packet_t *)ci->ci_pmap_data;
/* Whole address flush will be needed if PTE_G is set. */
- CTASSERT(PTE_G == (uint16_t)PTE_G);
- tp->tp_global |= ((pte & PTE_G) != 0);;
+ tp->tp_global |= ((pte & PTE_G) != 0);
count = tp->tp_count;
if (count < TP_MAXVA && va != (vaddr_t)-1LL) {
Index: src/sys/kern/sys_select.c
diff -u src/sys/kern/sys_select.c:1.49 src/sys/kern/sys_select.c:1.50
--- src/sys/kern/sys_select.c:1.49 Thu Nov 21 21:42:30 2019
+++ src/sys/kern/sys_select.c Fri Nov 22 20:04:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_select.c,v 1.49 2019/11/21 21:42:30 ad Exp $ */
+/* $NetBSD: sys_select.c,v 1.50 2019/11/22 20:04:03 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2019 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.49 2019/11/21 21:42:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.50 2019/11/22 20:04:03 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -114,9 +114,9 @@ __KERNEL_RCSID(0, "$NetBSD: sys_select.c
/*
* Per-cluster state for select()/poll(). For a system with fewer
- * than 32 CPUs, this gives us per-CPU clusters.
+ * than 64 CPUs, this gives us per-CPU clusters.
*/
-#define SELCLUSTERS 32
+#define SELCLUSTERS 64
#define SELCLUSTERMASK (SELCLUSTERS - 1)
typedef struct selcluster {
