CVS commit: src/sys/uvm
Module Name:src
Committed By: skrll
Date: Thu Jul 9 05:57:15 UTC 2020
Modified Files:
src/sys/uvm: uvm_amap.c uvm_anon.c uvm_aobj.c uvm_bio.c uvm_device.c
uvm_fault.c uvm_km.c uvm_map.c uvm_page.c uvm_pager.c uvm_pdaemon.c
uvm_swap.c uvm_vnode.c
Log Message:
Consistently use UVMHIST(__func__)
Convert UVMHIST_{CALLED,LOG} into UVMHIST_CALLARGS
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/uvm/uvm_amap.c
cvs rdiff -u -r1.78 -r1.79 src/sys/uvm/uvm_anon.c
cvs rdiff -u -r1.148 -r1.149 src/sys/uvm/uvm_aobj.c
cvs rdiff -u -r1.119 -r1.120 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.70 -r1.71 src/sys/uvm/uvm_device.c
cvs rdiff -u -r1.227 -r1.228 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.158 -r1.159 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.384 -r1.385 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.243 -r1.244 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.127 -r1.128 src/sys/uvm/uvm_pager.c
cvs rdiff -u -r1.129 -r1.130 src/sys/uvm/uvm_pdaemon.c
cvs rdiff -u -r1.196 -r1.197 src/sys/uvm/uvm_swap.c
cvs rdiff -u -r1.114 -r1.115 src/sys/uvm/uvm_vnode.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/uvm/uvm_amap.c
diff -u src/sys/uvm/uvm_amap.c:1.121 src/sys/uvm/uvm_amap.c:1.122
--- src/sys/uvm/uvm_amap.c:1.121 Wed Jul 8 13:26:22 2020
+++ src/sys/uvm/uvm_amap.c Thu Jul 9 05:57:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_amap.c,v 1.121 2020/07/08 13:26:22 skrll Exp $ */
+/* $NetBSD: uvm_amap.c,v 1.122 2020/07/09 05:57:15 skrll Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.121 2020/07/08 13:26:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.122 2020/07/09 05:57:15 skrll Exp $");
#include "opt_uvmhist.h"
@@ -235,7 +235,7 @@ amap_alloc(vaddr_t sz, vaddr_t padsz, in
{
struct vm_amap *amap;
int slots, padslots;
- UVMHIST_FUNC("amap_alloc"); UVMHIST_CALLED(maphist);
+ UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
AMAP_B2SLOT(slots, sz);
AMAP_B2SLOT(padslots, padsz);
@@ -321,7 +321,7 @@ amap_free(struct vm_amap *amap)
{
int slots;
- UVMHIST_FUNC("amap_free"); UVMHIST_CALLED(maphist);
+ UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
KASSERT(amap->am_ref == 0 && amap->am_nused == 0);
KASSERT((amap->am_flags & AMAP_SWAPOFF) == 0);
@@ -363,9 +363,8 @@ amap_extend(struct vm_map_entry *entry,
const km_flag_t kmflags =
(flags & AMAP_EXTEND_NOWAIT) ? KM_NOSLEEP : KM_SLEEP;
- UVMHIST_FUNC("amap_extend"); UVMHIST_CALLED(maphist);
-
- UVMHIST_LOG(maphist, " (entry=%#jx, addsize=%#jx, flags=%#jx)",
+ UVMHIST_FUNC(__func__);
+ UVMHIST_CALLARGS(maphist, " (entry=%#jx, addsize=%#jx, flags=%#jx)",
(uintptr_t)entry, addsize, flags, 0);
/*
@@ -725,8 +724,8 @@ amap_wipeout(struct vm_amap *amap)
{
u_int lcv;
- UVMHIST_FUNC("amap_wipeout"); UVMHIST_CALLED(maphist);
- UVMHIST_LOG(maphist,"(amap=%#jx)", (uintptr_t)amap, 0,0,0);
+ UVMHIST_FUNC(__func__);
+ UVMHIST_CALLARGS(maphist,"(amap=%#jx)", (uintptr_t)amap, 0,0,0);
KASSERT(rw_write_held(amap->am_lock));
KASSERT(amap->am_ref == 0);
@@ -797,9 +796,9 @@ amap_copy(struct vm_map *map, struct vm_
krwlock_t *oldlock;
vsize_t len;
- UVMHIST_FUNC("amap_copy"); UVMHIST_CALLED(maphist);
- UVMHIST_LOG(maphist, " (map=%#j, entry=%#j, flags=%jd)",
- (uintptr_t)map, (uintptr_t)entry, flags, 0);
+ UVMHIST_FUNC(__func__);
+ UVMHIST_CALLARGS(maphist, " (map=%#j, entry=%#j, flags=%jd)",
+ (uintptr_t)map, (uintptr_t)entry, flags, -2);
KASSERT(map != kernel_map); /* we use nointr pool */
@@ -1416,7 +1415,7 @@ amap_lookup(struct vm_aref *aref, vaddr_
struct vm_anon *an;
u_int slot;
- UVMHIST_FUNC("amap_lookup"); UVMHIST_CALLED(maphist);
+ UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
KASSERT(rw_lock_held(amap->am_lock));
AMAP_B2SLOT(slot, offset);
@@ -1445,7 +1444,7 @@ amap_lookups(struct vm_aref *aref, vaddr
struct vm_amap *amap = aref->ar_amap;
u_int slot;
- UVMHIST_FUNC("amap_lookups"); UVMHIST_CALLED(maphist);
+ UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
KASSERT(rw_lock_held(amap->am_lock));
AMAP_B2SLOT(slot, offset);
@@ -1483,7 +1482,7 @@ amap_add(struct vm_aref *aref, vaddr_t o
struct vm_amap *amap = aref->ar_amap;
u_int slot;
- UVMHIST_FUNC("amap_add"); UVMHIST_CALLED(maphist);
+ UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
KASSERT(rw_write_held(amap->am_lock));
KASSERT(anon->an_lock == amap->am_lock);
@@ -1525,7 +1524,7 @@ amap_unadd(struct vm_aref *aref, vaddr_t
struct vm_amap *amap = aref->ar_amap;
u_int slot, ptr, last;
- UVMHIST_FUNC("amap_unadd"); UVMHIST_CALLED(maphist);
+ UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
KASSERT(rw_write_held(amap->am_lock));
AMAP_B2SLOT(slot, offset);
@@ -1593,7 +1592,7 @@ amap_adjref_anons(struct vm_amap *amap,
void
amap_ref(struct vm_amap
CVS commit: src/sys/arch/sandpoint/sandpoint
Module Name:src
Committed By: nisimura
Date: Thu Jul 9 05:12:09 UTC 2020
Modified Files:
src/sys/arch/sandpoint/sandpoint: autoconf.c
Log Message:
Adapt to proplib api changes
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sandpoint/sandpoint/autoconf.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/sandpoint/sandpoint/autoconf.c
diff -u src/sys/arch/sandpoint/sandpoint/autoconf.c:1.28 src/sys/arch/sandpoint/sandpoint/autoconf.c:1.29
--- src/sys/arch/sandpoint/sandpoint/autoconf.c:1.28 Wed Sep 30 14:18:54 2015
+++ src/sys/arch/sandpoint/sandpoint/autoconf.c Thu Jul 9 05:12:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.28 2015/09/30 14:18:54 phx Exp $ */
+/* $NetBSD: autoconf.c,v 1.29 2020/07/09 05:12:09 nisimura Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28 2015/09/30 14:18:54 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29 2020/07/09 05:12:09 nisimura Exp $");
#include
#include
@@ -152,7 +152,7 @@ device_register(device_t dev, void *aux)
&& bi_net->cookie == tag) {
prop_data_t pd;
- pd = prop_data_create_data_nocopy(bi_net->mac_address,
+ pd = prop_data_create_nocopy(bi_net->mac_address,
ETHER_ADDR_LEN);
KASSERT(pd != NULL);
if (prop_dictionary_set(device_properties(dev),
@@ -201,7 +201,7 @@ add_i2c_child_devices(device_t self, con
!(bi_model->flags & model_i2c_devs[i].model_mask))
continue;
pd = prop_dictionary_create();
- prop_dictionary_set_cstring_nocopy(pd, "name",
+ prop_dictionary_set_string_nocopy(pd, "name",
model_i2c_devs[i].name);
prop_dictionary_set_uint32(pd, "addr",
model_i2c_devs[i].addr);
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Thu Jul 9 02:13:58 UTC 2020
Modified Files:
src/sys/conf: assym.mk
Log Message:
factor out common code.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/conf/assym.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/assym.mk
diff -u src/sys/conf/assym.mk:1.6 src/sys/conf/assym.mk:1.7
--- src/sys/conf/assym.mk:1.6 Wed Jul 8 15:39:22 2020
+++ src/sys/conf/assym.mk Wed Jul 8 22:13:58 2020
@@ -1,11 +1,11 @@
-# $NetBSD: assym.mk,v 1.6 2020/07/08 19:39:22 uwe Exp $
+# $NetBSD: assym.mk,v 1.7 2020/07/09 02:13:58 christos Exp $
+
+GENASSYM_FLAGS=${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS}
assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf | \
- ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \
- ${CPPFLAGS} ${PROF} \
- ${GENASSYM_CPPFLAGS} > assym.h.tmp && \
+ ${GENASSYM} -- ${CC} ${GENASSYM_FLAGS} ${PROF} > assym.h.tmp && \
mv -f assym.h.tmp assym.h
.if !defined(___USE_SUFFIX_RULES___)
@@ -19,8 +19,7 @@ ${SRCS:M*.[sS]:C|\.[Ss]|.d|}: assym.h
assym.d: assym.h
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
- ${GENASSYM} -- ${MKDEP} -f assym.dep -- \
- ${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS}
+ ${GENASSYM} -- ${MKDEP} -f assym.dep -- ${GENASSYM_FLAGS}
${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET}
rm -f assym.dep
@@ -30,8 +29,6 @@ DEPS+= assym.d
.SUFFIXES: .genassym .assym.h
.genassym.assym.h:
${_MKTARGET_CREATE}
- ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \
- ${CPPFLAGS} ${PROF} \
- ${GENASSYM_CPPFLAGS} < $< > $@
+ ${GENASSYM} -- ${CC} ${GENASSYM_FLAGS} ${PROF} < $< > $@
mv -f $@.tmp $@
.endif # ___USE_SUFFIX_RULES___
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: uwe Date: Wed Jul 8 22:28:21 UTC 2020 Modified Files: src/sys/arch/arm/nvidia: files.tegra Log Message: tegra_xusb depends on firmload. Make the dependency explicit, do not rely on some random USB device to pull it in. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/arm/nvidia/files.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/arm/nvidia/files.tegra diff -u src/sys/arch/arm/nvidia/files.tegra:1.50 src/sys/arch/arm/nvidia/files.tegra:1.51 --- src/sys/arch/arm/nvidia/files.tegra:1.50 Sat Jul 27 14:05:04 2019 +++ src/sys/arch/arm/nvidia/files.tegra Wed Jul 8 22:28:21 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.tegra,v 1.50 2019/07/27 14:05:04 skrll Exp $ +# $NetBSD: files.tegra,v 1.51 2020/07/08 22:28:21 uwe Exp $ # # Configuration info for NVIDIA Tegra ARM Peripherals # @@ -105,7 +105,7 @@ attach ehci at fdt with tegra_ehci file arch/arm/nvidia/tegra_ehci.c tegra_ehci # XUSB (USB 3.0) -attach xhci at fdt with tegra_xusb +attach xhci at fdt with tegra_xusb : firmload file arch/arm/nvidia/tegra_xusb.c tegra_xusb defflag opt_tegra.hTEGRA_XUSB_DEBUG
CVS commit: src/sys/conf
Module Name:src
Committed By: uwe
Date: Wed Jul 8 19:39:22 UTC 2020
Modified Files:
src/sys/conf: assym.mk
Log Message:
Drop -fstack-usage* from CFLAGS passed genassym.
We don't want it to create a "-.su" file.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/conf/assym.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/assym.mk
diff -u src/sys/conf/assym.mk:1.5 src/sys/conf/assym.mk:1.6
--- src/sys/conf/assym.mk:1.5 Thu Sep 10 13:11:39 2015
+++ src/sys/conf/assym.mk Wed Jul 8 19:39:22 2020
@@ -1,9 +1,10 @@
-# $NetBSD: assym.mk,v 1.5 2015/09/10 13:11:39 uebayasi Exp $
+# $NetBSD: assym.mk,v 1.6 2020/07/08 19:39:22 uwe Exp $
assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf | \
- ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
+ ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \
+ ${CPPFLAGS} ${PROF} \
${GENASSYM_CPPFLAGS} > assym.h.tmp && \
mv -f assym.h.tmp assym.h
@@ -19,7 +20,7 @@ assym.d: assym.h
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
${GENASSYM} -- ${MKDEP} -f assym.dep -- \
- ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS}
+ ${CFLAGS:N-Wa,*:N-fstack-usage*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS}
${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET}
rm -f assym.dep
@@ -29,7 +30,8 @@ DEPS+= assym.d
.SUFFIXES: .genassym .assym.h
.genassym.assym.h:
${_MKTARGET_CREATE}
- ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
+ ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*:N-fstack-usage*} \
+ ${CPPFLAGS} ${PROF} \
${GENASSYM_CPPFLAGS} < $< > $@
mv -f $@.tmp $@
.endif # ___USE_SUFFIX_RULES___
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: thorpej
Date: Wed Jul 8 15:07:13 UTC 2020
Modified Files:
src/sys/dev/dm: device-mapper.c dm_dev.c dm_ioctl.c dm_target.c
Log Message:
Adapt to proplib API chanages.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/dm/dm_dev.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/dm/dm_ioctl.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/dm/dm_target.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/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.60 src/sys/dev/dm/device-mapper.c:1.61
--- src/sys/dev/dm/device-mapper.c:1.60 Thu Jan 16 07:18:08 2020
+++ src/sys/dev/dm/device-mapper.c Wed Jul 8 15:07:13 2020
@@ -1,4 +1,4 @@
-/*$NetBSD: device-mapper.c,v 1.60 2020/01/16 07:18:08 maya Exp $ */
+/*$NetBSD: device-mapper.c,v 1.61 2020/07/08 15:07:13 thorpej Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -402,7 +402,7 @@ dm_cmd_to_fun(prop_dictionary_t dm_dict)
return EINVAL;
for (i = 0; cmd_fn[i].cmd != NULL; i++)
- if (prop_string_equals_cstring(command, cmd_fn[i].cmd))
+ if (prop_string_equals_string(command, cmd_fn[i].cmd))
break;
if (!cmd_fn[i].allowed &&
Index: src/sys/dev/dm/dm_dev.c
diff -u src/sys/dev/dm/dm_dev.c:1.17 src/sys/dev/dm/dm_dev.c:1.18
--- src/sys/dev/dm/dm_dev.c:1.17 Tue Dec 31 10:30:30 2019
+++ src/sys/dev/dm/dm_dev.c Wed Jul 8 15:07:13 2020
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_dev.c,v 1.17 2019/12/31 10:30:30 tkusumi Exp $ */
+/*$NetBSD: dm_dev.c,v 1.18 2020/07/08 15:07:13 thorpej Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.17 2019/12/31 10:30:30 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.18 2020/07/08 15:07:13 thorpej Exp $");
#include
#include
@@ -381,7 +381,7 @@ dm_dev_prop_list(void)
TAILQ_FOREACH(dmv, _dev_list, next_devlist) {
dev_dict = prop_dictionary_create();
- prop_dictionary_set_cstring(dev_dict, DM_DEV_NAME, dmv->name);
+ prop_dictionary_set_string(dev_dict, DM_DEV_NAME, dmv->name);
prop_dictionary_set_uint32(dev_dict, DM_DEV_DEV, dmv->minor);
prop_array_add(dev_array, dev_dict);
Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.49 src/sys/dev/dm/dm_ioctl.c:1.50
--- src/sys/dev/dm/dm_ioctl.c:1.49 Mon Dec 23 16:17:35 2019
+++ src/sys/dev/dm/dm_ioctl.c Wed Jul 8 15:07:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.49 2019/12/23 16:17:35 tkusumi Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.50 2020/07/08 15:07:13 thorpej Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.49 2019/12/23 16:17:35 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.50 2020/07/08 15:07:13 thorpej Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -202,8 +202,8 @@ dm_dev_create_ioctl(prop_dictionary_t dm
uuid = NULL;
/* Get needed values from dictionary. */
- prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, );
- prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, );
+ prop_dictionary_get_string(dm_dict, DM_IOCTL_NAME, );
+ prop_dictionary_get_string(dm_dict, DM_IOCTL_UUID, );
prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, );
dm_dbg_print_flags(flags);
@@ -323,8 +323,8 @@ dm_dev_rename_ioctl(prop_dictionary_t dm
minor = 0;
/* Get needed values from dictionary. */
- prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, );
- prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, );
+ prop_dictionary_get_string(dm_dict, DM_IOCTL_NAME, );
+ prop_dictionary_get_string(dm_dict, DM_IOCTL_UUID, );
prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, );
prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, );
@@ -332,7 +332,7 @@ dm_dev_rename_ioctl(prop_dictionary_t dm
cmd_array = prop_dictionary_get(dm_dict, DM_IOCTL_CMD_DATA);
- prop_array_get_cstring_nocopy(cmd_array, 0, _name);
+ prop_array_get_string(cmd_array, 0, _name);
if (strlen(n_name) + 1 > DM_NAME_LEN)
return EINVAL;
@@ -351,7 +351,7 @@ dm_dev_rename_ioctl(prop_dictionary_t dm
prop_dictionary_set_uint32(dm_dict, DM_IOCTL_OPEN, dmv->table_head.io_cnt);
prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor);
- prop_dictionary_set_cstring(dm_dict, DM_IOCTL_UUID, dmv->uuid);
+ prop_dictionary_set_string(dm_dict, DM_IOCTL_UUID, dmv->uuid);
dm_dev_insert(dmv);
@@ -375,8 +375,8 @@ dm_dev_remove_ioctl(prop_dictionary_t dm
uuid = NULL;
/* Get needed values from dictionary. */
- prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, );
- prop_dictionary_get_cstring_nocopy(dm_dict,
CVS commit: [netbsd-8] src/sys/netinet
Module Name:src
Committed By: martin
Date: Wed Jul 8 13:48:36 UTC 2020
Modified Files:
src/sys/netinet [netbsd-8]: tcp_input.c
Log Message:
Apply patch, requested by christos in ticket #1566:
Deduplicate more code and avoid use of uninitialized variables.
To generate a diff of this commit:
cvs rdiff -u -r1.357.4.4 -r1.357.4.5 src/sys/netinet/tcp_input.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/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.357.4.4 src/sys/netinet/tcp_input.c:1.357.4.5
--- src/sys/netinet/tcp_input.c:1.357.4.4 Tue Jul 7 11:56:57 2020
+++ src/sys/netinet/tcp_input.c Wed Jul 8 13:48:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.357.4.4 2020/07/07 11:56:57 martin Exp $ */
+/* $NetBSD: tcp_input.c,v 1.357.4.5 2020/07/08 13:48:36 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.357.4.4 2020/07/07 11:56:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.357.4.5 2020/07/08 13:48:36 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1272,6 +1272,12 @@ tcp_input(struct mbuf *m, ...)
}
#endif
+ IP6_EXTHDR_GET(th, struct tcphdr *, m, toff, sizeof(struct tcphdr));
+ if (th == NULL) {
+ TCP_STATINC(TCP_STAT_RCVSHORT);
+ return;
+ }
+
/*
* Enforce alignment requirements that are violated in
* some cases, see kern/50766 for details.
@@ -1301,15 +1307,8 @@ tcp_input(struct mbuf *m, ...)
case 4:
af = AF_INET;
iphlen = sizeof(struct ip);
- IP6_EXTHDR_GET(th, struct tcphdr *, m, toff,
- sizeof(struct tcphdr));
- if (th == NULL) {
- TCP_STATINC(TCP_STAT_RCVSHORT);
- return;
- }
/* We do the checksum after PCB lookup... */
len = ntohs(ip->ip_len);
- tlen = len - toff;
iptos = ip->ip_tos;
break;
#endif
@@ -1317,13 +1316,6 @@ tcp_input(struct mbuf *m, ...)
case 6:
iphlen = sizeof(struct ip6_hdr);
af = AF_INET6;
- IP6_EXTHDR_GET(th, struct tcphdr *, m, toff,
- sizeof(struct tcphdr));
- if (th == NULL) {
- TCP_STATINC(TCP_STAT_RCVSHORT);
- return;
- }
-
/* Be proactive about malicious use of IPv4 mapped address */
if (IN6_IS_ADDR_V4MAPPED(>ip6_src) ||
IN6_IS_ADDR_V4MAPPED(>ip6_dst)) {
@@ -1355,7 +1347,6 @@ tcp_input(struct mbuf *m, ...)
/* We do the checksum after PCB lookup... */
len = m->m_pkthdr.len;
- tlen = len - toff;
iptos = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
break;
#endif
@@ -1364,6 +1355,8 @@ tcp_input(struct mbuf *m, ...)
return;
}
+ tlen = len - toff;
+
/*
* Check that TCP offset makes sense,
* pull out TCP options and adjust length. XXX
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: thorpej
Date: Wed Jul 8 13:41:53 UTC 2020
Modified Files:
src/sys/dev/acpi: acpi_debug.c
Log Message:
Update for proplib API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_debug.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/acpi/acpi_debug.c
diff -u src/sys/dev/acpi/acpi_debug.c:1.7 src/sys/dev/acpi/acpi_debug.c:1.8
--- src/sys/dev/acpi/acpi_debug.c:1.7 Mon Mar 23 00:37:19 2020
+++ src/sys/dev/acpi/acpi_debug.c Wed Jul 8 13:41:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_debug.c,v 1.7 2020/03/23 00:37:19 chs Exp $ */
+/* $NetBSD: acpi_debug.c,v 1.8 2020/07/08 13:41:53 thorpej Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_debug.c,v 1.7 2020/03/23 00:37:19 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_debug.c,v 1.8 2020/07/08 13:41:53 thorpej Exp $");
#include
#include
@@ -250,9 +250,9 @@ acpi_debug_getkey(prop_dictionary_t dict
while ((obj = prop_object_iterator_next(i)) != NULL) {
- key = prop_dictionary_keysym_cstring_nocopy(obj);
+ key = prop_dictionary_keysym_value(obj);
val = prop_dictionary_get(dict, key);
- num = prop_number_unsigned_integer_value(val);
+ num = prop_number_unsigned_value(val);
if (arg == num)
return key;
@@ -284,7 +284,7 @@ acpi_debug_sysctl_layer(SYSCTLFN_ARGS)
if (obj == NULL)
return EINVAL;
- AcpiDbgLayer = prop_number_unsigned_integer_value(obj);
+ AcpiDbgLayer = prop_number_unsigned_value(obj);
(void)memcpy(rnode->sysctl_data, node.sysctl_data, ACPI_DEBUG_MAX);
@@ -314,7 +314,7 @@ acpi_debug_sysctl_level(SYSCTLFN_ARGS)
if (obj == NULL)
return EINVAL;
- AcpiDbgLevel = prop_number_unsigned_integer_value(obj);
+ AcpiDbgLevel = prop_number_unsigned_value(obj);
(void)memcpy(rnode->sysctl_data, node.sysctl_data, ACPI_DEBUG_MAX);
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: thorpej Date: Wed Jul 8 13:39:04 UTC 2020 Modified Files: src/distrib/sets/lists/base: mi Log Message: Add ./usr/share/wscons/fonts/spleen-8x16.fnt To generate a diff of this commit: cvs rdiff -u -r1.1254 -r1.1255 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1254 src/distrib/sets/lists/base/mi:1.1255 --- src/distrib/sets/lists/base/mi:1.1254 Fri Jul 3 12:53:27 2020 +++ src/distrib/sets/lists/base/mi Wed Jul 8 13:39:04 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1254 2020/07/03 12:53:27 roy Exp $ +# $NetBSD: mi,v 1.1255 2020/07/08 13:39:04 thorpej Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -5331,6 +5331,7 @@ ./usr/share/wscons/fonts/spleen-16x32.fnt base-util-share share ./usr/share/wscons/fonts/spleen-32x64.fnt base-util-share share ./usr/share/wscons/fonts/spleen-5x8.fnt base-util-share share +./usr/share/wscons/fonts/spleen-6x12.fnt base-util-share share ./usr/share/wscons/fonts/spleen-8x16.fnt base-util-share share ./usr/share/wscons/fonts/vt220h.808 base-util-share share ./usr/share/wscons/fonts/vt220h.810 base-util-share share
CVS commit: src/sys/uvm
Module Name:src
Committed By: skrll
Date: Wed Jul 8 13:26:22 UTC 2020
Modified Files:
src/sys/uvm: uvm_amap.c uvm_anon.c uvm_aobj.c uvm_bio.c uvm_km.c
uvm_pager.c uvm_swap.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/uvm/uvm_amap.c
cvs rdiff -u -r1.77 -r1.78 src/sys/uvm/uvm_anon.c
cvs rdiff -u -r1.147 -r1.148 src/sys/uvm/uvm_aobj.c
cvs rdiff -u -r1.118 -r1.119 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.157 -r1.158 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.126 -r1.127 src/sys/uvm/uvm_pager.c
cvs rdiff -u -r1.195 -r1.196 src/sys/uvm/uvm_swap.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/uvm/uvm_amap.c
diff -u src/sys/uvm/uvm_amap.c:1.120 src/sys/uvm/uvm_amap.c:1.121
--- src/sys/uvm/uvm_amap.c:1.120 Sun May 17 15:07:22 2020
+++ src/sys/uvm/uvm_amap.c Wed Jul 8 13:26:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_amap.c,v 1.120 2020/05/17 15:07:22 ad Exp $ */
+/* $NetBSD: uvm_amap.c,v 1.121 2020/07/08 13:26:22 skrll Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.120 2020/05/17 15:07:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.121 2020/07/08 13:26:22 skrll Exp $");
#include "opt_uvmhist.h"
@@ -859,7 +859,7 @@ amap_copy(struct vm_map *map, struct vm_
}
/*
- * First check and see if we are the only map entry referencing
+ * First check and see if we are the only map entry referencing
* he amap we currently have. If so, then just take it over instead
* of copying it. Note that we are reading am_ref without lock held
* as the value value can only be one if we have the only reference
@@ -1388,7 +1388,7 @@ amap_swap_off(int startslot, int endslot
if (am) {
amap_unlock(am);
}
-
+
mutex_enter(_list_lock);
KASSERT(LIST_NEXT(_prev, am_list) == _next ||
LIST_NEXT(LIST_NEXT(_prev, am_list), am_list) ==
Index: src/sys/uvm/uvm_anon.c
diff -u src/sys/uvm/uvm_anon.c:1.77 src/sys/uvm/uvm_anon.c:1.78
--- src/sys/uvm/uvm_anon.c:1.77 Sun Mar 22 18:32:42 2020
+++ src/sys/uvm/uvm_anon.c Wed Jul 8 13:26:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_anon.c,v 1.77 2020/03/22 18:32:42 ad Exp $ */
+/* $NetBSD: uvm_anon.c,v 1.78 2020/07/08 13:26:22 skrll Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_anon.c,v 1.77 2020/03/22 18:32:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_anon.c,v 1.78 2020/07/08 13:26:22 skrll Exp $");
#include "opt_uvmhist.h"
@@ -235,7 +235,7 @@ uvm_anon_lockloanpg(struct vm_anon *anon
/*
* someone locking the object has a chance to
* lock us right now
- *
+ *
* XXX Better than yielding but inadequate.
*/
mutex_exit(>interlock);
Index: src/sys/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.147 src/sys/uvm/uvm_aobj.c:1.148
--- src/sys/uvm/uvm_aobj.c:1.147 Mon May 25 22:04:51 2020
+++ src/sys/uvm/uvm_aobj.c Wed Jul 8 13:26:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_aobj.c,v 1.147 2020/05/25 22:04:51 ad Exp $ */
+/* $NetBSD: uvm_aobj.c,v 1.148 2020/07/08 13:26:22 skrll Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.147 2020/05/25 22:04:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.148 2020/07/08 13:26:22 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_uvmhist.h"
@@ -965,7 +965,7 @@ uao_get(struct uvm_object *uobj, voff_t
}
/*
- * if swslot == 0, page hasn't existed before and is zeroed.
+ * if swslot == 0, page hasn't existed before and is zeroed.
* otherwise we have a "fake/busy/clean" page that we just
* allocated. do the needed "i/o", reading from swap.
*/
Index: src/sys/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.118 src/sys/uvm/uvm_bio.c:1.119
--- src/sys/uvm/uvm_bio.c:1.118 Thu Jun 25 14:04:30 2020
+++ src/sys/uvm/uvm_bio.c Wed Jul 8 13:26:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.118 2020/06/25 14:04:30 jdolecek Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.119 2020/07/08 13:26:22 skrll Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.118 2020/06/25 14:04:30 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.119 2020/07/08 13:26:22 skrll Exp $");
#include "opt_uvmhist.h"
#include "opt_ubc.h"
@@ -747,12 +747,12 @@ ubc_uiomove(struct uvm_object *uobj, str
/*
* during direct access pages need to be held busy to prevent them
* changing identity, and therefore if we read or write an object
- * into a mapped view of same we could deadlock while faulting.
+ * into a mapped view of same we could deadlock while faulting.
*
* avoid the
CVS commit: src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Wed Jul 8 13:12:35 UTC 2020 Modified Files: src/sys/dev/pci: pciconf.c Log Message: Turn off pci_conf_debug -- it was enabled by mistake in previous commit. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/pciconf.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/pciconf.c diff -u src/sys/dev/pci/pciconf.c:1.47 src/sys/dev/pci/pciconf.c:1.48 --- src/sys/dev/pci/pciconf.c:1.47 Tue Jul 7 03:38:49 2020 +++ src/sys/dev/pci/pciconf.c Wed Jul 8 13:12:35 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pciconf.c,v 1.47 2020/07/07 03:38:49 thorpej Exp $ */ +/* $NetBSD: pciconf.c,v 1.48 2020/07/08 13:12:35 thorpej Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.47 2020/07/07 03:38:49 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.48 2020/07/08 13:12:35 thorpej Exp $"); #include "opt_pci.h" @@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciconf.c,v #include #include -int pci_conf_debug = 1; +int pci_conf_debug = 0; #if !defined(MIN) #define MIN(a,b) (((a)<(b))?(a):(b))
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: fcambus
Date: Wed Jul 8 12:14:19 UTC 2020
Modified Files:
src/sys/dev/wsfont: wsfont.c
Added Files:
src/sys/dev/wsfont: spleen6x12.h
Log Message:
Add "Spleen 6x12" to wsfont, a font targetted at OLED displays.
It contains all printable ASCII characters (96 glyphes).
The font is 2-Clause BSD licensed and is my original creation.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/wsfont/spleen6x12.h
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/wsfont/wsfont.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/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.67 src/sys/dev/wsfont/wsfont.c:1.68
--- src/sys/dev/wsfont/wsfont.c:1.67 Thu Mar 5 18:20:38 2020
+++ src/sys/dev/wsfont/wsfont.c Wed Jul 8 12:14:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.67 2020/03/05 18:20:38 fcambus Exp $ */
+/* $NetBSD: wsfont.c,v 1.68 2020/07/08 12:14:19 fcambus Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.67 2020/03/05 18:20:38 fcambus Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.68 2020/07/08 12:14:19 fcambus Exp $");
#include "opt_wsfont.h"
@@ -170,6 +170,11 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1
#include
#endif
+#ifdef FONT_SPLEEN6x12
+#define HAVE_FONT 1
+#include
+#endif
+
#ifdef FONT_SPLEEN8x16
#define HAVE_FONT 1
#include
@@ -290,6 +295,9 @@ static struct font builtin_fonts[] = {
#ifdef FONT_SPLEEN5x8
{ { NULL, NULL }, , 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
+#ifdef FONT_SPLEEN6x12
+ { { NULL, NULL }, , 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
#ifdef FONT_SPLEEN8x16
{ { NULL, NULL }, , 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
Added files:
Index: src/sys/dev/wsfont/spleen6x12.h
diff -u /dev/null src/sys/dev/wsfont/spleen6x12.h:1.1
--- /dev/null Wed Jul 8 12:14:19 2020
+++ src/sys/dev/wsfont/spleen6x12.h Wed Jul 8 12:14:19 2020
@@ -0,0 +1,1292 @@
+/* $NetBSD: spleen6x12.h,v 1.1 2020/07/08 12:14:19 fcambus Exp $ */
+
+/*
+ * Copyright (c) 2018-2020 Frederic Cambus
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+static u_char spleen6x12_data[];
+
+struct wsdisplay_font spleen6x12 = {
+ .name = "Spleen 6x12",
+ .firstchar = ' ',
+ .numchars = 128 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 6,
+ .fontheight = 12,
+ .stride = 1,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .data = spleen6x12_data
+};
+
+static u_char spleen6x12_data[] = {
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+
+ 0x00, /* */
+ 0x20, /* ..*. */
+ 0x20, /* ..*. */
+ 0x20, /* ..*. */
+ 0x20, /* ..*. */
+ 0x20, /* ..*. */
+ 0x20, /* ..*. */
+ 0x00, /* */
+ 0x20, /* ..*. */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+
+ 0x00, /* */
+ 0x50, /* .*.* */
+ 0x50, /* .*.* */
+ 0x50, /* .*.* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+ 0x00, /* */
+
+ 0x00, /* */
+ 0x00, /* */
+ 0x50, /* .*.* */
+ 0xf8, /* *... */
+ 0x50, /* .*.* */
+ 0x50, /* .*.* */
+ 0x50,
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: skrll
Date: Wed Jul 8 12:12:16 UTC 2020
Modified Files:
src/sys/uvm/pmap: pmap.h
Log Message:
Comment updates
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/uvm/pmap/pmap.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/uvm/pmap/pmap.h
diff -u src/sys/uvm/pmap/pmap.h:1.14 src/sys/uvm/pmap/pmap.h:1.15
--- src/sys/uvm/pmap/pmap.h:1.14 Sun Mar 15 11:36:24 2020
+++ src/sys/uvm/pmap/pmap.h Wed Jul 8 12:12:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.14 2020/03/15 11:36:24 rin Exp $ */
+/* $NetBSD: pmap.h,v 1.15 2020/07/08 12:12:16 skrll Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -103,6 +103,11 @@ typedef union pmap_segtab {
struct pmap;
typedef bool (*pte_callback_t)(struct pmap *, vaddr_t, vaddr_t,
pt_entry_t *, uintptr_t);
+
+/*
+ * Common part of the bootstraping the system enough to run with
+ * virtual memory.
+ */
void pmap_bootstrap_common(void);
pt_entry_t *pmap_pte_lookup(struct pmap *, vaddr_t);
pt_entry_t *pmap_pte_reserve(struct pmap *, vaddr_t, int);
@@ -182,9 +187,6 @@ extern pmap_segtab_t pmap_kern_segtab;
#define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count)
#define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count)
-/*
- * Bootstrap the system enough to run with virtual memory.
- */
bool pmap_remove_all(pmap_t);
void pmap_set_modified(paddr_t);
bool pmap_page_clear_attributes(struct vm_page_md *, u_int);
CVS commit: src/share/wscons/fonts
Module Name:src
Committed By: fcambus
Date: Wed Jul 8 11:24:49 UTC 2020
Modified Files:
src/share/wscons/fonts: COPYRIGHT Makefile
Added Files:
src/share/wscons/fonts: spleen-6x12.fnt.uue
Log Message:
Add font file for Spleen 6x12, which can be loaded into the wsfont pool
or a wscons display device using wsfontload(8).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/wscons/fonts/COPYRIGHT
cvs rdiff -u -r1.11 -r1.12 src/share/wscons/fonts/Makefile
cvs rdiff -u -r0 -r1.1 src/share/wscons/fonts/spleen-6x12.fnt.uue
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/wscons/fonts/COPYRIGHT
diff -u src/share/wscons/fonts/COPYRIGHT:1.3 src/share/wscons/fonts/COPYRIGHT:1.4
--- src/share/wscons/fonts/COPYRIGHT:1.3 Sun Jun 28 14:26:18 2020
+++ src/share/wscons/fonts/COPYRIGHT Wed Jul 8 11:24:49 2020
@@ -37,8 +37,8 @@ in this directory are
The font files:
- spleen-5x8.fnt spleen-8x16.fnt spleen-12x24.fnt spleen-16x32.fnt
- spleen-32x64.fnt
+ spleen-5x8.fnt spleen-6x12.fnt spleen-8x16.fnt spleen-12x24.fnt
+ spleen-16x32.fnt spleen-32x64.fnt
in this directory are
Index: src/share/wscons/fonts/Makefile
diff -u src/share/wscons/fonts/Makefile:1.11 src/share/wscons/fonts/Makefile:1.12
--- src/share/wscons/fonts/Makefile:1.11 Sun Jun 28 14:26:18 2020
+++ src/share/wscons/fonts/Makefile Wed Jul 8 11:24:49 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2020/06/28 14:26:18 fcambus Exp $
+# $NetBSD: Makefile,v 1.12 2020/07/08 11:24:49 fcambus Exp $
FONTS= vt220l.814 vt220h.814 vt220l.808 vt220h.808 \
vt220l.816 vt220h.816 vt220l.810 vt220h.810 \
latin2.808 latin2.814 latin2.816 \
donna.816 flori.816 orator.816 \
- spleen-5x8.fnt spleen-8x16.fnt spleen-12x24.fnt \
- spleen-16x32.fnt spleen-32x64.fnt
+ spleen-5x8.fnt spleen-6x12.fnt spleen-8x16.fnt \
+ spleen-12x24.fnt spleen-16x32.fnt spleen-32x64.fnt
FILES=${FONTS}
UUDECODE_FILES=${FONTS}
Added files:
Index: src/share/wscons/fonts/spleen-6x12.fnt.uue
diff -u /dev/null src/share/wscons/fonts/spleen-6x12.fnt.uue:1.1
--- /dev/null Wed Jul 8 11:24:49 2020
+++ src/share/wscons/fonts/spleen-6x12.fnt.uue Wed Jul 8 11:24:49 2020
@@ -0,0 +1,72 @@
+begin 644 spleen-6x12.fnt
+M
+M
+M
+M
+M
+M
+M
+M
+M`"`@("`@(``@
+M`%!04`!0^%!04/A0('B@H'`H*"CP(`A(4!`@
+M*$A``#!(2#!@E(AT`"`@(!@@0$!`0"`8`,`@
+M$!`0$"#`2##\,$@`("#X("```"`@0```
+M``#X```@``@($!`@($!`@(```'"(F*C(B(AP
+M`"!@("`@("!P`'"("`AP@(#X`'"("#`("(AP`("`D)"0
+M^!`0`/B`@/`("`CP`'"`@/"(B(AP`/B("!`@("`@`'"(
+MB'"(B(AP`'"(B(AX"`AP`"`@`"```"`@0```
+M``@0($!`(!`(`/@`^$`@$`@($"!``'"("!`@(``@
+M`'"(B+BXN(!X`'"(B(CXB(B(`/"(B/"(B(CP`'B`@("`
+M@(!X`/"(B(B(B(CP`'B`@/"`@(!X`'B`@/"`@("``'B`
+M@+B(B(AX`(B(B/B(B(B(`'`@("`@("!P`'`@("`@("#`
+M`(B(D."0B(B(`("`@("`@(!X`(C8^*B(B(B(`(C(R*BHF)B(
+M`'"(B(B(B(AP`/"(B(CP@("``'"(B(B(B(AP&/"(B(CP
+MB(B(`'B`@'`("`CP`/@@("`@("`@`(B(B(B(B(AX`(B(
+MB(B(B'!P`(B(B(BH^-B(`(B(4"!0B(B(`(B(B(AX"`CP
+M`/@($"!`@(#X`'A`0$!`0$!X`("`0$`@(!`0"`@``'@("`@("`AX
+M`"!0B```^$`@$```<`AX
+MB(AX`("`\(B(B(CP>("`@(!X``@(>(B(B(AX
+M>(B(^(!X`#A`0/!`0$!`>(B(B(AP"/```("`\(B(B(B(
+M`"``8"`@("`P`!``$!`0$!`08("`D*#`H)"(`$!`0$!`0$`P
+M\*BHJ(B(\(B(B(B(<(B(B(AP\(B(
+MB(CP@("`>(B(B(AX"`@(>(B`@("`>(!P"`CP`$!`
+MX$!`0$`PB(B(B(AXB(B(B%`@B(BH^-B(
+MB(AP<(B(B(B(B(AX"`CP^`@0($#X`!@@(&!@("`8
+M`"`@("`@("`@`&`0$!@8$!!@`$BP
+M
+M
+M
+M
+M
+M
+M
+M
CVS commit: src/sys/arch/xen/x86
Module Name:src Committed By: jdolecek Date: Wed Jul 8 11:11:00 UTC 2020 Modified Files: src/sys/arch/xen/x86: cpu.c Log Message: initalize ci_kfpu_spl, to avoid triggering KASSERT() in fpu_kern_enter() Follows revision 1.177 of sys/arch/x86/x86/cpu.c: """ Add a small API for in-kernel FPU operations. fpu_kern_enter(); /* do FPU stuff */ fpu_kern_leave(); """ With this DomU kernel boots with: [ 2.571] aes: Intel AES-NI To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 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/xen/x86/cpu.c diff -u src/sys/arch/xen/x86/cpu.c:1.137 src/sys/arch/xen/x86/cpu.c:1.138 --- src/sys/arch/xen/x86/cpu.c:1.137 Sat Jun 27 09:54:08 2020 +++ src/sys/arch/xen/x86/cpu.c Wed Jul 8 11:11:00 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.137 2020/06/27 09:54:08 jdolecek Exp $ */ +/* $NetBSD: cpu.c,v 1.138 2020/07/08 11:11:00 jdolecek Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.137 2020/06/27 09:54:08 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.138 2020/07/08 11:11:00 jdolecek Exp $"); #include "opt_ddb.h" #include "opt_multiprocessor.h" @@ -232,6 +232,7 @@ cpu_attach(device_t parent, device_t sel ci->ci_cpuid = caa->cpu_number; ci->ci_vcpu = NULL; ci->ci_index = nphycpu++; + ci->ci_kfpu_spl = -1; if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); @@ -391,6 +392,7 @@ cpu_attach_common(device_t parent, devic ci->ci_dev = self; ci->ci_cpuid = cpunum; ci->ci_vcpuid = cpunum; + ci->ci_kfpu_spl = -1; KASSERT(HYPERVISOR_shared_info != NULL); KASSERT(cpunum < XEN_LEGACY_MAX_VCPUS);
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: skrll
Date: Wed Jul 8 10:18:00 UTC 2020
Modified Files:
src/sys/arch/arm/arm: armv6_start.S
src/sys/arch/arm/arm32: genassym.cf locore.S
Log Message:
Use the stack provided by armv6_start.S rather than svcstk. This saves
some bss too.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm/armv6_start.S
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/arm/arm32/genassym.cf
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/arm32/locore.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/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.17 src/sys/arch/arm/arm/armv6_start.S:1.18
--- src/sys/arch/arm/arm/armv6_start.S:1.17 Fri Jul 3 06:15:27 2020
+++ src/sys/arch/arm/arm/armv6_start.S Wed Jul 8 10:17:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.17 2020/07/03 06:15:27 skrll Exp $ */
+/* $NetBSD: armv6_start.S,v 1.18 2020/07/08 10:17:59 skrll Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -230,6 +230,8 @@ generic_savevars:
*/
.section "_init_memory", "aw", %nobits
.p2align INIT_ARM_STACK_SHIFT
+ .global start_stacks_bottom
+ .global start_stacks_top
start_stacks_bottom:
.space INIT_ARM_STACK_SIZE * MAXCPUS
start_stacks_top:
Index: src/sys/arch/arm/arm32/genassym.cf
diff -u src/sys/arch/arm/arm32/genassym.cf:1.92 src/sys/arch/arm/arm32/genassym.cf:1.93
--- src/sys/arch/arm/arm32/genassym.cf:1.92 Wed Jul 8 10:04:20 2020
+++ src/sys/arch/arm/arm32/genassym.cf Wed Jul 8 10:18:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.92 2020/07/08 10:04:20 skrll Exp $
+# $NetBSD: genassym.cf,v 1.93 2020/07/08 10:18:00 skrll Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -31,7 +31,7 @@
# SUCH DAMAGE.
if defined(_KERNEL_OPT)
-include "opt_compat_netbsd.h"
+include "opt_arm_start.h"
include "opt_execfmt.h"
include "opt_multiprocessor.h"
endif
@@ -73,6 +73,10 @@ ifdef __HAVE_FAST_SOFTINTS
define __HAVE_FAST_SOFTINTS 1
endif
+ifdef __HAVE_GENERIC_START
+define __HAVE_GENERIC_START 1
+endif
+
ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
define __HAVE_MM_MD_DIRECT_MAPPED_PHYS 1
endif
Index: src/sys/arch/arm/arm32/locore.S
diff -u src/sys/arch/arm/arm32/locore.S:1.40 src/sys/arch/arm/arm32/locore.S:1.41
--- src/sys/arch/arm/arm32/locore.S:1.40 Sun Jul 14 09:29:21 2019
+++ src/sys/arch/arm/arm32/locore.S Wed Jul 8 10:18:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.40 2019/07/14 09:29:21 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.41 2020/07/08 10:18:00 skrll Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -43,7 +43,7 @@
/* What size should this really be ? It is only used by init_arm() */
#define INIT_ARM_STACK_SIZE 2048
- RCSID("$NetBSD: locore.S,v 1.40 2019/07/14 09:29:21 skrll Exp $")
+ RCSID("$NetBSD: locore.S,v 1.41 2020/07/08 10:18:00 skrll Exp $")
/*
* This is for kvm_mkdb, and should be the address of the beginning
@@ -121,13 +121,18 @@ ASEND(uartputc)
#else
.word _C_LABEL(cpu_info_store)
#endif
+#if !defined(__HAVE_GENERIC_START)
.word svcstk_end
+#else
+ .word start_stacks_top
+#endif
.Lmainreturned:
.asciz "main() returned"
.align 0
ASEND(start)
+#if !defined(__HAVE_GENERIC_START)
.bss
#ifdef __ARM_EABI__
.align 3
@@ -135,6 +140,7 @@ ASEND(start)
svcstk:
.space INIT_ARM_STACK_SIZE
svcstk_end:
+#endif
.text
.align 0
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Wed Jul 8 10:04:20 UTC 2020 Modified Files: src/sys/arch/arm/arm32: genassym.cf Log Message: Sort the __HAVE_* defines To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/arm/arm32/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/arm/arm32/genassym.cf diff -u src/sys/arch/arm/arm32/genassym.cf:1.91 src/sys/arch/arm/arm32/genassym.cf:1.92 --- src/sys/arch/arm/arm32/genassym.cf:1.91 Wed Jul 8 10:02:44 2020 +++ src/sys/arch/arm/arm32/genassym.cf Wed Jul 8 10:04:20 2020 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.91 2020/07/08 10:02:44 skrll Exp $ +# $NetBSD: genassym.cf,v 1.92 2020/07/08 10:04:20 skrll Exp $ # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -69,22 +69,22 @@ ifdef __ARM_FIQ_INDIRECT define __ARM_FIQ_INDIRECT 1 endif -ifdef __HAVE_PREEMPTION -define __HAVE_PREEMPTION 1 +ifdef __HAVE_FAST_SOFTINTS +define __HAVE_FAST_SOFTINTS 1 endif ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS define __HAVE_MM_MD_DIRECT_MAPPED_PHYS 1 endif -ifdef __HAVE_FAST_SOFTINTS -define __HAVE_FAST_SOFTINTS 1 -endif - ifdef __HAVE_PIC_FAST_SOFTINTS define __HAVE_PIC_FAST_SOFTINTS 1 endif +ifdef __HAVE_PREEMPTION +define __HAVE_PREEMPTION 1 +endif + ifdef ARM_MMU_EXTENDED define ARM_MMU_EXTENDED 1 endif
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Wed Jul 8 10:02:44 UTC 2020 Modified Files: src/sys/arch/arm/arm32: genassym.cf Log Message: Sort include "opt_..."s To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/arm/arm32/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/arm/arm32/genassym.cf diff -u src/sys/arch/arm/arm32/genassym.cf:1.90 src/sys/arch/arm/arm32/genassym.cf:1.91 --- src/sys/arch/arm/arm32/genassym.cf:1.90 Fri Jul 3 17:22:14 2020 +++ src/sys/arch/arm/arm32/genassym.cf Wed Jul 8 10:02:44 2020 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.90 2020/07/03 17:22:14 skrll Exp $ +# $NetBSD: genassym.cf,v 1.91 2020/07/08 10:02:44 skrll Exp $ # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -31,9 +31,9 @@ # SUCH DAMAGE. if defined(_KERNEL_OPT) -include "opt_multiprocessor.h" include "opt_compat_netbsd.h" include "opt_execfmt.h" +include "opt_multiprocessor.h" endif include
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Wed Jul 8 09:50:45 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h src/sys/arch/evbarm/fdt: platform.h Log Message: Provide some KVA layout #defines in arm32/vmparam.h and simplify fdt/platform.h as a nice side effect To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/include/arm32/vmparam.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/fdt/platform.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/arm/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.48 src/sys/arch/arm/include/arm32/vmparam.h:1.49 --- src/sys/arch/arm/include/arm32/vmparam.h:1.48 Wed Jul 8 07:59:49 2020 +++ src/sys/arch/arm/include/arm32/vmparam.h Wed Jul 8 09:50:45 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.48 2020/07/08 07:59:49 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.49 2020/07/08 09:50:45 skrll Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -94,4 +94,31 @@ #define VM_MIN_KERNEL_ADDRESS ((vaddr_t) KERNEL_BASE) #define VM_MAX_KERNEL_ADDRESS ((vaddr_t) -(PAGE_SIZE+1)) +#ifdef ARM_MMU_EXTENDED +/* + * kernel virtual space layout without direct map (common case) + * + * 0x8000_ - 256MB kernel text/data/bss + * 0x9000_ - 1536MB Kernel VM Space + * 0xf000_ - 256MB IO + * + * kernel virtual space layout with direct map (1GB limited) + * 0x8000_ - 1024MB kernel text/data/bss and direct map start + * 0xc000_ - 768MB Kernel VM Space + * 0xf000_ - 256MB IO + * + */ +#define VM_KERNEL_IO_ADDRESS 0xf000 +#define VM_KERNEL_IO_SIZE (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS) + +#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS +#define KERNEL_VM_BASE 0xc000 +#else +#define KERNEL_VM_BASE 0x9000 +#endif + +#define KERNEL_VM_SIZE (KERNEL_IO_VBASE - KERNEL_VM_BASE) + +#endif + #endif /* _ARM_ARM32_VMPARAM_H_ */ Index: src/sys/arch/evbarm/fdt/platform.h diff -u src/sys/arch/evbarm/fdt/platform.h:1.5 src/sys/arch/evbarm/fdt/platform.h:1.6 --- src/sys/arch/evbarm/fdt/platform.h:1.5 Mon Jan 21 07:49:45 2019 +++ src/sys/arch/evbarm/fdt/platform.h Wed Jul 8 09:50:45 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: platform.h,v 1.5 2019/01/21 07:49:45 skrll Exp $ */ +/* $NetBSD: platform.h,v 1.6 2020/07/08 09:50:45 skrll Exp $ */ /*- * Copyright (c) 2015-2017 Jared McNeill @@ -33,25 +33,13 @@ void fdt_add_reserved_memory_range(uint64_t, uint64_t); #endif -#ifdef __aarch64__ - #define KERNEL_IO_VBASE VM_KERNEL_IO_ADDRESS - -#define KERNEL_VM_BASE VM_MIN_KERNEL_ADDRESS -#define KERNEL_VM_SIZE (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) - -#else /* __aarch64__ */ - -#define KERNEL_IO_VBASE 0xf000 #define KERNEL_IO_VSIZE (KERNEL_IO_VBASE - VM_MAX_KERNEL_ADDRESS) -#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS -#define KERNEL_VM_BASE 0xc000 -#else -#define KERNEL_VM_BASE 0x9000 -#endif +#ifdef __aarch64__ -#define KERNEL_VM_SIZE (KERNEL_IO_VBASE - KERNEL_VM_BASE) +#define KERNEL_VM_BASE VM_MIN_KERNEL_ADDRESS +#define KERNEL_VM_SIZE (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) #endif /* !__aarch64 */
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: skrll Date: Wed Jul 8 08:20:05 UTC 2020 Modified Files: src/sys/arch/aarch64/include: vmparam.h Log Message: Fix a comment To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/include/vmparam.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/aarch64/include/vmparam.h diff -u src/sys/arch/aarch64/include/vmparam.h:1.11 src/sys/arch/aarch64/include/vmparam.h:1.12 --- src/sys/arch/aarch64/include/vmparam.h:1.11 Wed Mar 4 19:28:04 2020 +++ src/sys/arch/aarch64/include/vmparam.h Wed Jul 8 08:20:05 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.11 2020/03/04 19:28:04 ryo Exp $ */ +/* $NetBSD: vmparam.h,v 1.12 2020/07/08 08:20:05 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -145,8 +145,7 @@ /* * last 254MB of kernel vm area (0xf000-0xffe0) - * may be used for devmap. address must be aligned 2MB (L2_SIZE) - * see also aarch64/pmap.c:pmap_devmap_* + * may be used for devmap. see aarch64/pmap.c:pmap_devmap_* */ #define VM_KERNEL_IO_ADDRESS 0xf000L #define VM_KERNEL_IO_SIZE (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS)
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: skrll Date: Wed Jul 8 07:59:49 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Remove an unnecessary #ifdef To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/arm/include/arm32/vmparam.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/arm/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.47 src/sys/arch/arm/include/arm32/vmparam.h:1.48 --- src/sys/arch/arm/include/arm32/vmparam.h:1.47 Mon Jan 13 20:36:44 2020 +++ src/sys/arch/arm/include/arm32/vmparam.h Wed Jul 8 07:59:49 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.47 2020/01/13 20:36:44 christos Exp $ */ +/* $NetBSD: vmparam.h,v 1.48 2020/07/08 07:59:49 skrll Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -88,11 +88,7 @@ * Mach derived constants */ #define VM_MIN_ADDRESS ((vaddr_t) PAGE_SIZE) -#ifdef ARM_MMU_EXTENDED -#define VM_MAXUSER_ADDRESS ((vaddr_t) 0x8000 - PAGE_SIZE) -#else #define VM_MAXUSER_ADDRESS ((vaddr_t) KERNEL_BASE - PAGE_SIZE) -#endif #define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS #define VM_MIN_KERNEL_ADDRESS ((vaddr_t) KERNEL_BASE)
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: skrll Date: Wed Jul 8 06:58:33 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: param.h Log Message: Define USPACE in terms of UPAGES (not the other way around) now that NBPG is fixed at 4K To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/include/arm32/param.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/arm/include/arm32/param.h diff -u src/sys/arch/arm/include/arm32/param.h:1.31 src/sys/arch/arm/include/arm32/param.h:1.32 --- src/sys/arch/arm/include/arm32/param.h:1.31 Wed Jul 8 06:54:57 2020 +++ src/sys/arch/arm/include/arm32/param.h Wed Jul 8 06:58:33 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.31 2020/07/08 06:54:57 skrll Exp $ */ +/* $NetBSD: param.h,v 1.32 2020/07/08 06:58:33 skrll Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -54,8 +54,8 @@ #define SSIZE 1 /* initial stack size/NBPG */ #define SINCR 1 /* increment of stack/NBPG */ -#define USPACE 8192 /* total size of u-area */ -#define UPAGES (USPACE / NBPG) /* pages of u-area */ +#define UPAGES 2 +#define USPACE (UPAGES * NBPG) /* total size of u-area */ #ifndef MSGBUFSIZE #define MSGBUFSIZE 16384 /* default message buffer size */
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: skrll Date: Wed Jul 8 06:54:57 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: param.h Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/include/arm32/param.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/arm/include/arm32/param.h diff -u src/sys/arch/arm/include/arm32/param.h:1.30 src/sys/arch/arm/include/arm32/param.h:1.31 --- src/sys/arch/arm/include/arm32/param.h:1.30 Thu Feb 13 07:40:24 2020 +++ src/sys/arch/arm/include/arm32/param.h Wed Jul 8 06:54:57 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.30 2020/02/13 07:40:24 skrll Exp $ */ +/* $NetBSD: param.h,v 1.31 2020/07/08 06:54:57 skrll Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -36,7 +36,7 @@ #define _ARM_ARM32_PARAM_H_ #ifdef _KERNEL_OPT -# include "opt_arm32_pmap.h" +#include "opt_arm32_pmap.h" #endif /*
