CVS commit: src/lib/libpthread
Module Name:src
Committed By: kamil
Date: Sun Aug 19 02:10:42 UTC 2018
Modified Files:
src/lib/libpthread: pthread.c
Log Message:
Drop a duplicate instruction line
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/lib/libpthread/pthread.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/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.151 src/lib/libpthread/pthread.c:1.152
--- src/lib/libpthread/pthread.c:1.151 Fri Dec 8 09:24:31 2017
+++ src/lib/libpthread/pthread.c Sun Aug 19 02:10:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.151 2017/12/08 09:24:31 kre Exp $ */
+/* $NetBSD: pthread.c,v 1.152 2018/08/19 02:10:42 kamil Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread.c,v 1.151 2017/12/08 09:24:31 kre Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.152 2018/08/19 02:10:42 kamil Exp $");
#define __EXPOSE_STACK 1
@@ -1322,7 +1322,6 @@ pthread__initmainstack(void)
for (aux = _dlauxinfo(); aux->a_type != AT_NULL; ++aux) {
if (aux->a_type == AT_STACKBASE) {
- pthread__main->pt_stack.ss_sp = (void *)aux->a_v;
#ifdef __MACHINE_STACK_GROWS_UP
pthread__main->pt_stack.ss_sp = (void *)aux->a_v;
#else
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: riastradh
Date: Sun Aug 19 01:33:27 UTC 2018
Modified Files:
src/sys/arch/xen/xen: xpci_xenbus.c
Log Message:
This makes no sense static. (Can't break unused code anyway!)
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/xen/xen/xpci_xenbus.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/xen/xen/xpci_xenbus.c
diff -u src/sys/arch/xen/xen/xpci_xenbus.c:1.17 src/sys/arch/xen/xen/xpci_xenbus.c:1.18
--- src/sys/arch/xen/xen/xpci_xenbus.c:1.17 Mon Aug 13 15:48:21 2018
+++ src/sys/arch/xen/xen/xpci_xenbus.c Sun Aug 19 01:33:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xpci_xenbus.c,v 1.17 2018/08/13 15:48:21 maxv Exp $ */
+/* $NetBSD: xpci_xenbus.c,v 1.18 2018/08/19 01:33:26 riastradh Exp $ */
/*
* Copyright (c) 2009 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.17 2018/08/13 15:48:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.18 2018/08/19 01:33:26 riastradh Exp $");
#include "opt_xen.h"
@@ -454,7 +454,7 @@ xpci_conf_read(pci_chipset_tag_t pc, pci
pcireg_t
pci_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg)
{
- static pcireg_t v; /* XXXSMP: why static? */
+ pcireg_t v;
xpci_conf_read(pc, tag, reg, 4, );
return v;
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src
Committed By: kre
Date: Sat Aug 18 23:35:18 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: crypto.map
Log Message:
Revert previous and do it the way it is supposed to be done.
Thanks to the heads up from rjs@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map:1.2 Sat Aug 18 17:37:25 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map Sat Aug 18 23:35:18 2018
@@ -752,9 +752,6 @@ OPENSSL_1_1_0 {
CONF_parse_list;
CONF_set_default_method;
CONF_set_nconf;
-conf_ssl_get;
-conf_ssl_get_cmd;
-conf_ssl_name_find;
CRL_DIST_POINTS_free;
CRL_DIST_POINTS_new;
CRYPTO_128_unwrap;
@@ -4070,7 +4067,13 @@ OPENSSL_1_1_0g {
global:
CRYPTO_secure_clear_free;
EVP_PKEY_set1_engine;
-local: *;
} OPENSSL_1_1_0f;
+OPENSSL_1_1_0i {
+global:
+conf_ssl_get;
+conf_ssl_get_cmd;
+conf_ssl_name_find;
+local: *;
+} OPENSSL_1_1_0g;
CVS commit: src/sys/external/bsd/gnu-efi/dist/inc
Module Name:src Committed By: jmcneill Date: Sat Aug 18 20:17:51 UTC 2018 Modified Files: src/sys/external/bsd/gnu-efi/dist/inc/aarch64: efibind.h src/sys/external/bsd/gnu-efi/dist/inc/arm: efibind.h Log Message: Use sys/stdint.h instead of stdint.h on NetBSD To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efibind.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/gnu-efi/dist/inc/arm/efibind.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/external/bsd/gnu-efi/dist/inc/aarch64/efibind.h diff -u src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efibind.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efibind.h:1.2 --- src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efibind.h:1.1.1.1 Thu Aug 16 18:17:47 2018 +++ src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efibind.h Sat Aug 18 20:17:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: efibind.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */ +/* $NetBSD: efibind.h,v 1.2 2018/08/18 20:17:51 jmcneill Exp $ */ /* * Copright (C) 2014 - 2015 Linaro Ltd. @@ -30,6 +30,8 @@ typedef short int16_t; typedef unsigned char uint8_t; typedef signed char int8_t; // unqualified 'char' is unsigned on ARM +#elif defined(__NetBSD__) +#include #else #include #endif Index: src/sys/external/bsd/gnu-efi/dist/inc/arm/efibind.h diff -u src/sys/external/bsd/gnu-efi/dist/inc/arm/efibind.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/arm/efibind.h:1.2 --- src/sys/external/bsd/gnu-efi/dist/inc/arm/efibind.h:1.1.1.1 Thu Aug 16 18:17:47 2018 +++ src/sys/external/bsd/gnu-efi/dist/inc/arm/efibind.h Sat Aug 18 20:17:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: efibind.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */ +/* $NetBSD: efibind.h,v 1.2 2018/08/18 20:17:51 jmcneill Exp $ */ /* * Copright (C) 2014 - 2015 Linaro Ltd. @@ -30,6 +30,8 @@ typedef short int16_t; typedef unsigned char uint8_t; typedef signed char int8_t; // unqualified 'char' is unsigned on ARM +#elif defined(__NetBSD__) +#include #else #include #endif
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src
Committed By: kre
Date: Sat Aug 18 17:37:25 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: crypto.map
Log Message:
Allow the symbols in the newly added conf_ssl.c to be exposed as globals.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map:1.1 Thu Feb 8 22:48:55 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map Sat Aug 18 17:37:25 2018
@@ -752,6 +752,9 @@ OPENSSL_1_1_0 {
CONF_parse_list;
CONF_set_default_method;
CONF_set_nconf;
+conf_ssl_get;
+conf_ssl_get_cmd;
+conf_ssl_name_find;
CRL_DIST_POINTS_free;
CRL_DIST_POINTS_new;
CRYPTO_128_unwrap;
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src
Committed By: rjs
Date: Sat Aug 18 16:40:02 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: conf.inc
Log Message:
Add conf_ssl.c to build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/conf.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/conf.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/conf.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/conf.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/conf.inc:1.1 Sun Jul 19 23:30:43 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/conf.inc Sat Aug 18 16:40:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: conf.inc,v 1.1 2009/07/19 23:30:43 christos Exp $
+# $NetBSD: conf.inc,v 1.2 2018/08/18 16:40:02 rjs Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -9,7 +9,7 @@
CONF_SRCS = conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \
- conf_mall.c conf_sap.c
+ conf_mall.c conf_sap.c conf_ssl.c
SRCS += ${CONF_SRCS}
.for cryptosrc in ${CONF_SRCS}
CVS commit: src/sys/arch/ia64/stand/efi/libefi
Module Name:src
Committed By: kre
Date: Sat Aug 18 15:55:19 UTC 2018
Modified Files:
src/sys/arch/ia64/stand/efi/libefi: efinet.c
Log Message:
More fallout from new gnu-efi ... EFI_SIMPLE_NETWORK_PROTOCOL
is now EFI_SIMPLE_NETWORK_PROTOCOL_GUID
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/efi/libefi/efinet.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/ia64/stand/efi/libefi/efinet.c
diff -u src/sys/arch/ia64/stand/efi/libefi/efinet.c:1.7 src/sys/arch/ia64/stand/efi/libefi/efinet.c:1.8
--- src/sys/arch/ia64/stand/efi/libefi/efinet.c:1.7 Thu Aug 4 16:22:40 2016
+++ src/sys/arch/ia64/stand/efi/libefi/efinet.c Sat Aug 18 15:55:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efinet.c,v 1.7 2016/08/04 16:22:40 scole Exp $ */
+/* $NetBSD: efinet.c,v 1.8 2018/08/18 15:55:19 kre Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
@@ -231,7 +231,7 @@ efinet_init_driver(void)
{
EFI_STATUS status;
UINTN sz;
- static EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL;
+ static EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
EFI_HANDLE *handles;
int nifs, i;
#define MAX_INTERFACES 4
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Aug 18 14:18:58 UTC 2018 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention acpica 20180810 To generate a diff of this commit: cvs rdiff -u -r1.1552 -r1.1553 src/doc/3RDPARTY cvs rdiff -u -r1.2426 -r1.2427 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1552 src/doc/3RDPARTY:1.1553 --- src/doc/3RDPARTY:1.1552 Sat Aug 18 05:00:28 2018 +++ src/doc/3RDPARTY Sat Aug 18 10:18:58 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1552 2018/08/18 09:00:28 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1553 2018/08/18 14:18:58 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -40,7 +40,7 @@ # Package: acpica -Version: 20180427 +Version: 20180810 Current Vers: 20180810 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2426 src/doc/CHANGES:1.2427 --- src/doc/CHANGES:1.2426 Sat Aug 18 05:00:28 2018 +++ src/doc/CHANGES Sat Aug 18 10:18:58 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2426 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2427 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -202,3 +202,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: kernel: Remove etherip(4), replaced by l2tp(4). [maxv 20180814] gnu-efi: Import version 3.0.8. [jmcneill 20180816] OpenSSL: Imported 1.1.0i. [christos 20180818] + acpi(4): Updated ACPICA to 20180810. [christos 20180818]
CVS commit: src/sys/external/bsd/acpica/dist
Module Name:src
Committed By: christos
Date: Sat Aug 18 14:17:56 UTC 2018
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslload.c asloptions.c
src/sys/external/bsd/acpica/dist/debugger: dbinput.c dbmethod.c
dbnames.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c
src/sys/external/bsd/acpica/dist/hardware: hwregs.c hwsleep.c
hwxfsleep.c
src/sys/external/bsd/acpica/dist/include: acdisasm.h acexcep.h
aclocal.h acnamesp.h acoutput.h acpixf.h acutils.h
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nsdump.c
nseval.c nsinit.c
src/sys/external/bsd/acpica/dist/tables: tbdata.c
src/sys/external/bsd/acpica/dist/utilities: utdelete.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/debugger/dbmethod.c \
src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/executer/exconfig.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/hardware/hwregs.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h \
src/sys/external/bsd/acpica/dist/include/aclocal.h
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/include/acexcep.h
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/include/acnamesp.h
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/include/acoutput.h
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/namespace/nsaccess.c \
src/sys/external/bsd/acpica/dist/namespace/nsinit.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/namespace/nsdump.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/namespace/nseval.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/tables/tbdata.c
cvs rdiff -u -r1.1.1.10 -r1.2 \
src/sys/external/bsd/acpica/dist/utilities/utdelete.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/external/bsd/acpica/dist/compiler/aslload.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.11 src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.12
--- src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.11 Fri May 4 20:12:15 2018
+++ src/sys/external/bsd/acpica/dist/compiler/aslload.c Sat Aug 18 10:17:55 2018
@@ -125,7 +125,11 @@ LdLoadNamespace (
/* Dump the namespace if debug is enabled */
-AcpiNsDumpTables (ACPI_NS_ALL, ACPI_UINT32_MAX);
+if (AcpiDbgLevel & ACPI_LV_TABLES)
+{
+AcpiNsDumpTables (ACPI_NS_ALL, ACPI_UINT32_MAX);
+}
+
ACPI_FREE (WalkState);
return (AE_OK);
}
@@ -209,8 +213,7 @@ LdLoadFieldElements (
return (Status);
}
else if (Status == AE_ALREADY_EXISTS &&
-(Node->Flags & ANOBJ_IS_EXTERNAL) &&
-Node->OwnerId != WalkState->OwnerId)
+(Node->Flags & ANOBJ_IS_EXTERNAL))
{
Node->Type = (UINT8) ACPI_TYPE_LOCAL_REGION_FIELD;
}
@@ -362,7 +365,6 @@ LdNamespace1Begin (
ACPI_PARSE_OBJECT *Arg;
UINT32 i;
BOOLEAN ForceNewScope = FALSE;
-ACPI_OWNER_ID OwnerId = 0;
const ACPI_OPCODE_INFO *OpInfo;
ACPI_PARSE_OBJECT *ParentOp;
@@ -373,23 +375,6 @@ LdNamespace1Begin (
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op %p [%s]\n",
Op, Op->Asl.ParseOpName));
-if (Op->Asl.ParseOpcode == PARSEOP_DEFINITION_BLOCK)
-{
-/*
- * Allocate an OwnerId for this block. This helps identify the owners
- * of each namespace node. This is used in determining whether if
- * certain external declarations cause redefinition errors.
- */
-Status = AcpiUtAllocateOwnerId ();
-WalkState->OwnerId = OwnerId;
-if (ACPI_FAILURE (Status))
-{
-AslCoreSubsystemError (Op, Status,
-"Failure to allocate owner ID to this definition block.", FALSE);
-return_ACPI_STATUS (Status);
-}
-}
-
/*
* We are only interested in opcodes that have an associated name
* (or multiple names)
@@ -765,9
CVS commit: src/external/cddl/osnet/dist/common/zfs
Module Name:src Committed By: christos Date: Sat Aug 18 12:00:11 UTC 2018 Modified Files: src/external/cddl/osnet/dist/common/zfs: zfs_ioctl_compat.c Log Message: use the right variables (fix cut-n-pastos) To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/cddl/osnet/dist/common/zfs/zfs_ioctl_compat.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/cddl/osnet/dist/common/zfs/zfs_ioctl_compat.c diff -u src/external/cddl/osnet/dist/common/zfs/zfs_ioctl_compat.c:1.1.1.1 src/external/cddl/osnet/dist/common/zfs/zfs_ioctl_compat.c:1.2 --- src/external/cddl/osnet/dist/common/zfs/zfs_ioctl_compat.c:1.1.1.1 Mon May 28 16:52:52 2018 +++ src/external/cddl/osnet/dist/common/zfs/zfs_ioctl_compat.c Sat Aug 18 08:00:11 2018 @@ -333,7 +333,7 @@ zfs_cmd_compat_get(zfs_cmd_t *zc, caddr_ FIELD_COPY(zc_inject_record.zi_freq); FIELD_COPY(zc_inject_record.zi_failfast); strlcpy(zc->zc_inject_record.zi_func, - resume_c->zc_inject_record.zi_func, MAXNAMELEN); + zcdm_c->zc_inject_record.zi_func, MAXNAMELEN); FIELD_COPY(zc_inject_record.zi_iotype); FIELD_COPY(zc_inject_record.zi_duration); FIELD_COPY(zc_inject_record.zi_timer); @@ -617,7 +617,7 @@ zfs_cmd_compat_put(zfs_cmd_t *zc, caddr_ FIELD_COPY(zc_inject_record.zi_type); FIELD_COPY(zc_inject_record.zi_freq); FIELD_COPY(zc_inject_record.zi_failfast); - strlcpy(resume_c->zc_inject_record.zi_func, + strlcpy(edbp_c->zc_inject_record.zi_func, zc->zc_inject_record.zi_func, MAXNAMELEN); FIELD_COPY(zc_inject_record.zi_iotype); FIELD_COPY(zc_inject_record.zi_duration); @@ -675,7 +675,7 @@ zfs_cmd_compat_put(zfs_cmd_t *zc, caddr_ FIELD_COPY(zc_inject_record.zi_type); FIELD_COPY(zc_inject_record.zi_freq); FIELD_COPY(zc_inject_record.zi_failfast); - strlcpy(resume_c->zc_inject_record.zi_func, + strlcpy(zcmd_c->zc_inject_record.zi_func, zc->zc_inject_record.zi_func, MAXNAMELEN); FIELD_COPY(zc_inject_record.zi_iotype); FIELD_COPY(zc_inject_record.zi_duration); @@ -744,7 +744,7 @@ zfs_cmd_compat_put(zfs_cmd_t *zc, caddr_ FIELD_COPY(zc_inject_record.zi_type); FIELD_COPY(zc_inject_record.zi_freq); FIELD_COPY(zc_inject_record.zi_failfast); - strlcpy(resume_c->zc_inject_record.zi_func, + strlcpy(zcdm_c->zc_inject_record.zi_func, zc->zc_inject_record.zi_func, MAXNAMELEN); FIELD_COPY(zc_inject_record.zi_iotype); FIELD_COPY(zc_inject_record.zi_duration);
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: christos
Date: Sat Aug 18 11:59:25 UTC 2018
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_fuid.c
Log Message:
make sure rid and idx are initialized.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.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/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c:1.4 Mon May 28 17:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c Sat Aug 18 07:59:25 2018
@@ -605,8 +605,14 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64
rid = FUID_RID(fuidp->z_fuid_group);
idx = FUID_INDEX(fuidp->z_fuid_group);
break;
+ default:
+ rid = UID_NOBODY;
+ break;
};
- domain = fuidp->z_domain_table[idx - 1];
+ if (idx == 0)
+ domain = nulldomain;
+ else
+ domain = fuidp->z_domain_table[idx - 1];
} else {
if (type == ZFS_OWNER || type == ZFS_ACE_USER)
status = kidmap_getsidbyuid(crgetzone(cr), id,
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: christos Date: Sat Aug 18 11:58:59 UTC 2018 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_label.c Log Message: vdev_inuse might not be called and spare_guid contains random stuff. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_label.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/cddl/osnet/dist/uts/common/fs/zfs/vdev_label.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_label.c:1.1.1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_label.c:1.2 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_label.c:1.1.1.3 Mon May 28 16:52:58 2018 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_label.c Sat Aug 18 07:58:59 2018 @@ -648,7 +648,7 @@ vdev_label_init(vdev_t *vd, uint64_t crt char *buf; size_t buflen; int error; - uint64_t spare_guid, l2cache_guid; + uint64_t spare_guid = 0, l2cache_guid; int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL; ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL);
CVS commit: src/sys/modules/zfs
Module Name:src
Committed By: christos
Date: Sat Aug 18 11:57:58 UTC 2018
Modified Files:
src/sys/modules/zfs: Makefile.zfsmod
Log Message:
remove NOGCCERROR; hides real issues.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/zfs/Makefile.zfsmod
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/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.7 src/sys/modules/zfs/Makefile.zfsmod:1.8
--- src/sys/modules/zfs/Makefile.zfsmod:1.7 Mon May 28 17:05:01 2018
+++ src/sys/modules/zfs/Makefile.zfsmod Sat Aug 18 07:57:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.7 2018/05/28 21:05:01 chs Exp $
+# $NetBSD: Makefile.zfsmod,v 1.8 2018/08/18 11:57:57 christos Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -118,7 +118,6 @@ SRCS+= zfs_acl.c
SRCS+= zfs_stub.c
WARNS= 0
-NOGCCERROR= yes
CWARNFLAGS+= -Wall
CWARNFLAGS+= -Wno-unknown-pragmas
CVS commit: src/sys/arch/evbarm/exynos
Module Name:src Committed By: skrll Date: Sat Aug 18 09:47:59 UTC 2018 Modified Files: src/sys/arch/evbarm/exynos: genassym.cf Log Message: G/C To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/exynos/genassym.cf 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/evbarm/exynos/genassym.cf diff -u src/sys/arch/evbarm/exynos/genassym.cf:1.1 src/sys/arch/evbarm/exynos/genassym.cf:1.2 --- src/sys/arch/evbarm/exynos/genassym.cf:1.1 Tue Dec 15 04:53:55 2015 +++ src/sys/arch/evbarm/exynos/genassym.cf Sat Aug 18 09:47:59 2018 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.1 2015/12/15 04:53:55 marty Exp $ +# $NetBSD: genassym.cf,v 1.2 2018/08/18 09:47:59 skrll Exp $ #- # Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -29,11 +29,6 @@ # POSSIBILITY OF SUCH DAMAGE. # -include include -define UTRSTAT_TXEMPTY UTRSTAT_TXEMPTY -define UTRSTAT_TXSHIFTER_EMPTY UTRSTAT_TXSHIFTER_EMPTY -define SSCOM_UTXH SSCOM_UTXH -define SSCOM_UTRSTAT SSCOM_UTRSTAT define MAX_BOOT_STRING MAX_BOOT_STRING
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Sat Aug 18 09:43:17 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: TEGRA Log Message: Note EARLYCONS in comment To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/TEGRA 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/evbarm/conf/TEGRA diff -u src/sys/arch/evbarm/conf/TEGRA:1.37 src/sys/arch/evbarm/conf/TEGRA:1.38 --- src/sys/arch/evbarm/conf/TEGRA:1.37 Sat Jul 14 15:09:41 2018 +++ src/sys/arch/evbarm/conf/TEGRA Sat Aug 18 09:43:17 2018 @@ -1,5 +1,5 @@ # -# $NetBSD: TEGRA,v 1.37 2018/07/14 15:09:41 maxv Exp $ +# $NetBSD: TEGRA,v 1.38 2018/08/18 09:43:17 skrll Exp $ # # NVIDIA Tegra family SoCs # @@ -36,7 +36,7 @@ pseudo-device openfirm # /dev/openfirm #options PMAP_DEBUG # Enable pmap_debug_level code #options VERBOSE_INIT_ARM # verbose bootstrapping messages # CONSADDR is required for early init messages from VERBOSE_INIT_ARM. -#options CONSADDR=0x70006300 +#options EARLYCONS=tegra, CONSADDR=0x70006300 makeoptions DEBUG="-g" # compile full symbol table makeoptions COPY_SYMTAB=1
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Sat Aug 18 09:29:45 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: files.evbarm Log Message: Fix a bug introduced in the previous revision; We don't define arm32 anywhere, and majors.aarch64 is used unconditionally. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/files.evbarm 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/evbarm/conf/files.evbarm diff -u src/sys/arch/evbarm/conf/files.evbarm:1.30 src/sys/arch/evbarm/conf/files.evbarm:1.31 --- src/sys/arch/evbarm/conf/files.evbarm:1.30 Sun Apr 1 04:35:04 2018 +++ src/sys/arch/evbarm/conf/files.evbarm Sat Aug 18 09:29:45 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.evbarm,v 1.30 2018/04/01 04:35:04 ryo Exp $ +# $NetBSD: files.evbarm,v 1.31 2018/08/18 09:29:45 rin Exp $ # # First try for arm-specific configuration info # @@ -56,7 +56,7 @@ file arch/evbarm/dev/plcom.c plcom nee # defparam opt_bootconfig.h DRAM_BLOCKS -ifdef arm32 +ifndef aarch64 include "arch/arm/conf/majors.arm32" else include "arch/aarch64/conf/majors.aarch64"
CVS import: src/sys/external/bsd/acpica/dist
Module Name:src
Committed By: christos
Date: Sat Aug 18 09:10:59 UTC 2018
Update of /cvsroot/src/sys/external/bsd/acpica/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv15138
Log Message:
10 August 2018. Summary of changes for version 20180810:
1) ACPICA kernel-resident subsystem:
Initial ACPI table loading: Attempt to continue loading ACPI tables
regardless of malformed AML. Since migrating table initialization to the
new module-level code support, the AML interpreter rejected tables upon
any ACPI error encountered during table load. This is a problem because
non-serious ACPI errors during table load do not necessarily mean that
the entire definition block (DSDT or SSDT) is invalid. This change
improves the table loading by ignoring some types of errors that can be
generated by incorrect AML. This can range from object type errors, scope
errors, and index errors.
Suspend/Resume support: Update to stop unconditionally clearing ACPI IRQs
during suspend/resume. The status of ACPI events is no longer cleared
when entering the ACPI S5 system state (power off) which caused some
systems to power up immediately after turning off power in certain
situations. This was a functional regression. It was fixed by clearing
the status of all ACPI events again when entering S5 (for system-wide
suspend or hibernation the clearing of the status of all events is not
desirable, as it might cause the kernel to miss wakeup events sometimes).
Rafael Wysocki.
2) iASL Compiler/Disassembler and Tools:
AcpiExec: Enhanced the -fi option (Namespace initialization file). Field
elements listed in the initialization file were previously initialized
after the table load and before executing module-level code blocks.
Recent changes in the module-level code support means that the table load
becomes a large control method execution. If fields are used within
module-level code and we are executing with the -fi option, the
initialization values were used to initialize the namespace object(s)
only after the table was finished loading. This change Provides an early
initialization of objects specified in the initialization file so that
field unit values are populated during the table load (not after the
load).
AcpiExec: Fixed a small memory leak regression that could result in
warnings during exit of the utility. These warnings were similar to
these:
0002D690 Length 0x0006 nsnames-0502 [Not a Descriptor - too small]
0002CD70 Length 0x002C utcache-0453 [Operand] Integer RefCount 0x0001
29 June 2018. Summary of changes for version 20180629:
1) iASL Compiler/Disassembler and Tools:
iASL: Fixed a regression related to the use of the ASL External
statement. Error checking for the use of the External() statement has
been relaxed. Previously, a restriction on the use of External meant that
the referenced named object was required to be defined in a different
table (an SSDT). Thus it would be an error to declare an object as an
external and then define the same named object in the same table. For
example:
DefinitionBlock (...)
{
External (DEV1)
Device (DEV1){...} // This was an error
}
However, this behavior has caused regressions in some existing ASL code,
because there is code that depends on named objects and externals (with
the same name) being declared in the same table. This change will allow
the ASL code above to compile without errors or warnings.
iASL: Implemented ASL language extensions for four operators to make some
of their arguments optional instead of required:
1) Field (RegionName, AccessType, LockRule, UpdateRule)
2) BankField (RegionName, BankName, BankValue,
AccessType, LockRule, UpdateRule)
3) IndexField (IndexName, DataName,
AccessType, LockRule, UpdateRule)
For the Field operators above, the AccessType, LockRule, and UpdateRule
are now optional arguments. The default values are:
AccessType: AnyAcc
LockRule: NoLock
UpdateRule: Preserve
4) Mutex (MutexName, SyncLevel)
For this operator, the SyncLevel argument is now optional. This argument
is rarely used in any meaningful way by ASL code, and thus it makes sense
to make it optional. The default value is:
SyncLevel: 0
iASL: Attempted use of the ASL Unload() operator now results in the
following warning:
"Unload is not supported by all operating systems"
This is in fact very true, and the Unload operator may be completely
deprecated in the near future.
AcpiExec: Fixed a regression for the -fi option (Namespace initialization
file. Recent changes in the ACPICA module-level code support altered the
table load/initialization sequence . This means that the table load has
become a large method execution of the table itself. If Operation Region
Fields are used within any module-level code and the -fi option was
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Aug 18 09:00:28 UTC 2018 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: OpenSSL 1.1.0i To generate a diff of this commit: cvs rdiff -u -r1.1551 -r1.1552 src/doc/3RDPARTY cvs rdiff -u -r1.2425 -r1.2426 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1551 src/doc/3RDPARTY:1.1552 --- src/doc/3RDPARTY:1.1551 Thu Aug 16 14:26:59 2018 +++ src/doc/3RDPARTY Sat Aug 18 05:00:28 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1551 2018/08/16 18:26:59 jmcneill Exp $ +# $NetBSD: 3RDPARTY,v 1.1552 2018/08/18 09:00:28 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1071,7 +1071,7 @@ markus is very cooperative about it): - adjust the DEFAULT_PKCS11_WHITELIST for ssh-agent Package: OpenSSL -Version: 1.0.2o/1.1.0h +Version: 1.0.2o/1.1.0i Current Vers: 1.0.2p/1.1.0i Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2425 src/doc/CHANGES:1.2426 --- src/doc/CHANGES:1.2425 Thu Aug 16 14:28:10 2018 +++ src/doc/CHANGES Sat Aug 18 05:00:28 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2425 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2426 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -201,3 +201,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: mdocml: Import 1.14.4. [christos 20180814] kernel: Remove etherip(4), replaced by l2tp(4). [maxv 20180814] gnu-efi: Import version 3.0.8. [jmcneill 20180816] + OpenSSL: Imported 1.1.0i. [christos 20180818]
CVS commit: src/crypto/external/bsd/openssl/dist
Module Name:src Committed By: christos Date: Sat Aug 18 08:59:05 UTC 2018 Modified Files: src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README src/crypto/external/bsd/openssl/dist/apps: ca.c ocsp.c s_client.c s_server.c speed.c src/crypto/external/bsd/openssl/dist/crypto: arm_arch.h armcap.c cryptlib.c ex_data.c src/crypto/external/bsd/openssl/dist/crypto/asn1: a_strex.c asn_mime.c tasn_enc.c src/crypto/external/bsd/openssl/dist/crypto/bio: b_sock.c bss_log.c src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lcl.h bn_lib.c bn_mont.c src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c src/crypto/external/bsd/openssl/dist/crypto/ec: ec2_smpl.c ec_ameth.c ec_lcl.h ec_lib.c ecp_smpl.c src/crypto/external/bsd/openssl/dist/crypto/engine: eng_lib.c src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_oaep.c rsa_pk1.c src/crypto/external/bsd/openssl/dist/crypto/ui: ui_openssl.c src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c src/crypto/external/bsd/openssl/dist/doc/apps: genpkey.pod src/crypto/external/bsd/openssl/dist/doc/crypto: EVP_DigestInit.pod src/crypto/external/bsd/openssl/dist/ssl: ssl_ciph.c ssl_lib.c ssl_locl.h ssl_sess.c t1_lib.c src/crypto/external/bsd/openssl/dist/test: evp_test.c src/crypto/external/bsd/openssl/dist/util: mkdef.pl Removed Files: src/crypto/external/bsd/openssl/dist/Configurations: 90-team.conf Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssl/dist/CHANGES \ src/crypto/external/bsd/openssl/dist/NEWS \ src/crypto/external/bsd/openssl/dist/README cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssl/dist/Configure cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/Configurations/90-team.conf cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssl/dist/apps/ca.c \ src/crypto/external/bsd/openssl/dist/apps/s_client.c \ src/crypto/external/bsd/openssl/dist/apps/s_server.c cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/apps/ocsp.c cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssl/dist/apps/speed.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/crypto/armcap.c cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/ex_data.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/a_strex.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/bio/b_sock.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec2_smpl.c \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec_lib.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/engine/eng_lib.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_oaep.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_pk1.c cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/doc/apps/genpkey.pod cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/doc/crypto/EVP_DigestInit.pod cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/ssl/ssl_sess.c cvs rdiff -u -r1.25 -r1.26
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: maxv
Date: Sat Aug 18 08:45:55 UTC 2018
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
Simplify the conditions. Fixes compilation of native amd64 without direct
map.
To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/sys/arch/x86/x86/pmap.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/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.302 src/sys/arch/x86/x86/pmap.c:1.303
--- src/sys/arch/x86/x86/pmap.c:1.302 Sun Aug 12 15:31:01 2018
+++ src/sys/arch/x86/x86/pmap.c Sat Aug 18 08:45:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.302 2018/08/12 15:31:01 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.303 2018/08/18 08:45:55 maxv Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -157,7 +157,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.302 2018/08/12 15:31:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.303 2018/08/18 08:45:55 maxv Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -1375,8 +1375,7 @@ pmap_init_lapic(void)
}
#endif
-#if defined(__HAVE_PCPU_AREA) || defined(__HAVE_DIRECT_MAP) || \
-(defined(XEN) && defined(__x86_64__))
+#ifdef __x86_64__
static size_t
pmap_pagetree_nentries_range(vaddr_t startva, vaddr_t endva, size_t pgsz)
{
@@ -1398,7 +1397,7 @@ slotspace_copy(int type, pd_entry_t *dst
}
#endif
-#if defined(__HAVE_DIRECT_MAP) || (defined(XEN) && defined(__x86_64__))
+#ifdef __x86_64__
vaddr_t slotspace_rand(int, size_t, size_t);
/*
CVS commit: src/sys/arch/ia64/stand/ia64/efi
Module Name:src Committed By: kre Date: Sat Aug 18 06:52:57 UTC 2018 Modified Files: src/sys/arch/ia64/stand/ia64/efi: main.c Log Message: More gnu-efi update fallout ... the symbol EFI_SIMPLE_NETWORK_PROTOCOL has been replaced with EFI_SIMPLE_NETWORK_PROTOCOL_GUID and the old one (EFI_SIMPLE_NETWORK_PROTOCOL) is now something completely different. Adapt... (should help the ia64 build) To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/stand/ia64/efi/main.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/ia64/stand/ia64/efi/main.c diff -u src/sys/arch/ia64/stand/ia64/efi/main.c:1.11 src/sys/arch/ia64/stand/ia64/efi/main.c:1.12 --- src/sys/arch/ia64/stand/ia64/efi/main.c:1.11 Thu Aug 4 18:07:43 2016 +++ src/sys/arch/ia64/stand/ia64/efi/main.c Sat Aug 18 06:52:57 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.11 2016/08/04 18:07:43 scole Exp $ */ +/* $NetBSD: main.c,v 1.12 2018/08/18 06:52:57 kre Exp $ */ /*- * Copyright (c) 1998 Michael Smith @@ -63,7 +63,7 @@ EFI_GUID devid = DEVICE_PATH_PROTOCOL; EFI_GUID hcdp = HCDP_TABLE_GUID; EFI_GUID imgid = LOADED_IMAGE_PROTOCOL; EFI_GUID mps = MPS_TABLE_GUID; -EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL; +EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID; EFI_GUID sal = SAL_SYSTEM_TABLE_GUID; EFI_GUID smbios = SMBIOS_TABLE_GUID;
