CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Tue Aug 25 14:53:25 UTC 2015 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: initialize ncpuonline To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/sys/rump/librump/rumpkern/rump.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/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.323 src/sys/rump/librump/rumpkern/rump.c:1.324 --- src/sys/rump/librump/rumpkern/rump.c:1.323 Tue Aug 25 14:52:59 2015 +++ src/sys/rump/librump/rumpkern/rump.c Tue Aug 25 14:53:25 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.323 2015/08/25 14:52:59 pooka Exp $ */ +/* $NetBSD: rump.c,v 1.324 2015/08/25 14:53:25 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.323 2015/08/25 14:52:59 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.324 2015/08/25 14:53:25 pooka Exp $); #include sys/systm.h #define ELFSIZE ARCH_ELFSIZE @@ -384,6 +384,7 @@ rump_init(void) aprint_verbose(cpu%d at thinair0: rump virtual cpu\n, i); } + ncpuonline = ncpu; /* Once all CPUs are detected, initialize the per-CPU cprng_fast. */ cprng_fast_init();
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Tue Aug 25 14:32:34 UTC 2015
Modified Files:
src/sys/kern: init_sysctl_base.c
Log Message:
hw nodes do not go under the kern tree, so add new init routine for them
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/init_sysctl_base.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/kern/init_sysctl_base.c
diff -u src/sys/kern/init_sysctl_base.c:1.5 src/sys/kern/init_sysctl_base.c:1.6
--- src/sys/kern/init_sysctl_base.c:1.5 Tue Jul 7 13:07:10 2015
+++ src/sys/kern/init_sysctl_base.c Tue Aug 25 14:32:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl_base.c,v 1.5 2015/07/07 13:07:10 justin Exp $ */
+/* $NetBSD: init_sysctl_base.c,v 1.6 2015/08/25 14:32:34 pooka Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_sysctl_base.c,v 1.5 2015/07/07 13:07:10 justin Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_sysctl_base.c,v 1.6 2015/08/25 14:32:34 pooka Exp $);
#include sys/types.h
#include sys/param.h
@@ -181,6 +181,11 @@ SYSCTL_SETUP(sysctl_kernbase_setup, sys
SYSCTL_DESCR(Raw partition of a disk),
NULL, RAW_PART, NULL, 0,
CTL_KERN, KERN_RAWPARTITION, CTL_EOL);
+}
+
+SYSCTL_SETUP(sysctl_hwbase_setup, sysctl hw subtree base setup)
+{
+
sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRING, machine,
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Tue Aug 25 14:47:27 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: emul.c
Log Message:
add cpu_getmodel()
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/rump/librump/rumpkern/emul.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/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.172 src/sys/rump/librump/rumpkern/emul.c:1.173
--- src/sys/rump/librump/rumpkern/emul.c:1.172 Fri Jul 24 14:11:11 2015
+++ src/sys/rump/librump/rumpkern/emul.c Tue Aug 25 14:47:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.172 2015/07/24 14:11:11 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.173 2015/08/25 14:47:26 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.172 2015/07/24 14:11:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.173 2015/08/25 14:47:26 pooka Exp $);
#include sys/param.h
#include sys/null.h
@@ -392,3 +392,10 @@ cpu_reboot(int howto, char *bootstr)
rump_sysproxy_fini(finiarg);
rumpuser_exit(ruhow);
}
+
+const char *
+cpu_getmodel(void)
+{
+
+ return rumpcore (virtual);
+}
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Tue Aug 25 14:52:59 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
remove mksysctls(), now provided by init_sysctl_base
To generate a diff of this commit:
cvs rdiff -u -r1.322 -r1.323 src/sys/rump/librump/rumpkern/rump.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/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.322 src/sys/rump/librump/rumpkern/rump.c:1.323
--- src/sys/rump/librump/rumpkern/rump.c:1.322 Tue Jul 7 12:38:02 2015
+++ src/sys/rump/librump/rumpkern/rump.c Tue Aug 25 14:52:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.322 2015/07/07 12:38:02 justin Exp $ */
+/* $NetBSD: rump.c,v 1.323 2015/08/25 14:52:59 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.322 2015/07/07 12:38:02 justin Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.323 2015/08/25 14:52:59 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -133,25 +133,6 @@ rump_proc_vfs_release_fn rump_proc_vfs_r
static void add_linkedin_modules(const struct modinfo *const *, size_t);
-/*
- * Create some sysctl nodes. why only this you ask. well, init_sysctl
- * is a kitchen sink in need of some gardening. but i want to use
- * others today. Furthermore, creating a whole kitchen sink full of
- * sysctl nodes is a waste of cycles for rump kernel bootstrap.
- */
-static void
-mksysctls(void)
-{
-
- /* hw.pagesize */
- sysctl_createv(NULL, 0, NULL, NULL,
- CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
- CTLTYPE_INT, pagesize,
- SYSCTL_DESCR(Software page size),
- NULL, PAGE_SIZE, NULL, 0,
- CTL_HW, HW_PAGESIZE, CTL_EOL);
-}
-
static pid_t rspo_wrap_getpid(void) {
return rump_sysproxy_hyp_getpid();
}
@@ -412,7 +393,6 @@ rump_init(void)
rnd_init_softint();
- mksysctls();
kqueue_init();
iostat_init();
fd_sys_init();
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Tue Aug 25 13:50:19 UTC 2015
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
Remember that dlsym() tends to fail on PowerPC during init (or at least
tended), so call rumphijack_dlsym() instead to be safe.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.118 src/lib/librumphijack/hijack.c:1.119
--- src/lib/librumphijack/hijack.c:1.118 Tue Aug 25 13:45:00 2015
+++ src/lib/librumphijack/hijack.c Tue Aug 25 13:50:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.118 2015/08/25 13:45:00 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.119 2015/08/25 13:50:19 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -34,7 +34,7 @@
#include rump/rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: hijack.c,v 1.118 2015/08/25 13:45:00 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.119 2015/08/25 13:50:19 pooka Exp $);
#endif
#include sys/param.h
@@ -2235,7 +2235,7 @@ mmap(void *addr, size_t len, int prot, i
return MAP_FAILED;
}
if (__predict_false(host_mmap == NULL)) {
- host_mmap = dlsym(RTLD_NEXT, mmap);
+ host_mmap = rumphijack_dlsym(RTLD_NEXT, mmap);
}
return host_mmap(addr, len, prot, flags, fd, offset);
}
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Tue Aug 25 14:52:31 UTC 2015
Modified Files:
src/sys/kern: init_sysctl.c init_sysctl_base.c
Log Message:
Move a bunch of sysctl nodes from init_sysctl (kitchen sink sysctl file)
to init_sysctl_base (only base kernel defs). Main motivation was to
fix sysconf(_SC_NPROCESSORS) for Rumprun. As reported by neeraj on irc,
it returned -1 before this fix, so we were doing imaginary computing.
To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/init_sysctl_base.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/kern/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.208 src/sys/kern/init_sysctl.c:1.209
--- src/sys/kern/init_sysctl.c:1.208 Tue Jul 7 12:38:02 2015
+++ src/sys/kern/init_sysctl.c Tue Aug 25 14:52:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.208 2015/07/07 12:38:02 justin Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.209 2015/08/25 14:52:31 pooka Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_sysctl.c,v 1.208 2015/07/07 12:38:02 justin Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_sysctl.c,v 1.209 2015/08/25 14:52:31 pooka Exp $);
#include opt_sysv.h
#include opt_compat_netbsd.h
@@ -607,82 +607,27 @@ SYSCTL_SETUP(sysctl_kern_setup, sysctl
CTL_CREATE, CTL_EOL);
}
-SYSCTL_SETUP(sysctl_hw_setup, sysctl hw subtree setup)
+SYSCTL_SETUP(sysctl_hw_misc_setup, sysctl hw subtree misc setup)
{
- u_int u;
- u_quad_t q;
- const char *model = cpu_getmodel();
sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
- CTLTYPE_STRING, model,
- SYSCTL_DESCR(Machine model),
- NULL, 0, __UNCONST(model), 0,
- CTL_HW, HW_MODEL, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT,
- CTLTYPE_INT, ncpu,
- SYSCTL_DESCR(Number of CPUs configured),
- NULL, 0, ncpu, 0,
- CTL_HW, HW_NCPU, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
- CTLTYPE_INT, byteorder,
- SYSCTL_DESCR(System byte order),
- NULL, BYTE_ORDER, NULL, 0,
- CTL_HW, HW_BYTEORDER, CTL_EOL);
- u = ((u_int)physmem (UINT_MAX / PAGE_SIZE)) ?
- UINT_MAX : physmem * PAGE_SIZE;
- sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
- CTLTYPE_INT, physmem,
- SYSCTL_DESCR(Bytes of physical memory),
- NULL, u, NULL, 0,
- CTL_HW, HW_PHYSMEM, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT,
CTLTYPE_INT, usermem,
SYSCTL_DESCR(Bytes of non-kernel memory),
sysctl_hw_usermem, 0, NULL, 0,
CTL_HW, HW_USERMEM, CTL_EOL);
sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
- CTLTYPE_INT, pagesize,
- SYSCTL_DESCR(Software page size),
- NULL, PAGE_SIZE, NULL, 0,
- CTL_HW, HW_PAGESIZE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
- CTLTYPE_INT, alignbytes,
- SYSCTL_DESCR(Alignment constraint for all possible
-data types),
- NULL, ALIGNBYTES, NULL, 0,
- CTL_HW, HW_ALIGNBYTES, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE|CTLFLAG_HEX,
CTLTYPE_STRING, cnmagic,
SYSCTL_DESCR(Console magic key sequence),
sysctl_hw_cnmagic, 0, NULL, CNS_LEN,
CTL_HW, HW_CNMAGIC, CTL_EOL);
- q = (u_quad_t)physmem * PAGE_SIZE;
- sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
- CTLTYPE_QUAD, physmem64,
- SYSCTL_DESCR(Bytes of physical memory),
- NULL, q, NULL, 0,
- CTL_HW, HW_PHYSMEM64, CTL_EOL);
sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_QUAD, usermem64,
SYSCTL_DESCR(Bytes of non-kernel memory),
sysctl_hw_usermem, 0, NULL, 0,
CTL_HW, HW_USERMEM64, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT,
- CTLTYPE_INT, ncpuonline,
- SYSCTL_DESCR(Number of CPUs online),
- NULL, 0, ncpuonline, 0,
- CTL_HW, HW_NCPUONLINE, CTL_EOL);
}
#ifdef DEBUG
Index: src/sys/kern/init_sysctl_base.c
diff -u src/sys/kern/init_sysctl_base.c:1.6 src/sys/kern/init_sysctl_base.c:1.7
--- src/sys/kern/init_sysctl_base.c:1.6 Tue Aug 25 14:32:34 2015
+++ src/sys/kern/init_sysctl_base.c Tue Aug 25 14:52:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl_base.c,v 1.6 2015/08/25 14:32:34 pooka Exp $ */
+/* $NetBSD: init_sysctl_base.c,v 1.7 2015/08/25 14:52:31 pooka Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Tue Aug 25 14:47:40 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: scheduler.c
Log Message:
add ncpuonline
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/rump/librump/rumpkern/scheduler.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/rump/librump/rumpkern/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.40 src/sys/rump/librump/rumpkern/scheduler.c:1.41
--- src/sys/rump/librump/rumpkern/scheduler.c:1.40 Wed Apr 22 16:01:07 2015
+++ src/sys/rump/librump/rumpkern/scheduler.c Tue Aug 25 14:47:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scheduler.c,v 1.40 2015/04/22 16:01:07 pooka Exp $ */
+/* $NetBSD: scheduler.c,v 1.41 2015/08/25 14:47:39 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.40 2015/04/22 16:01:07 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.41 2015/08/25 14:47:39 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -72,7 +72,7 @@ static struct rumpcpu {
struct cpu_info *rump_cpu = rump_cpus[0];
kcpuset_t *kcpuset_attached = NULL;
kcpuset_t *kcpuset_running = NULL;
-int ncpu;
+int ncpu, ncpuonline;
#define RCPULWP_BUSY ((void *)-1)
#define RCPULWP_WANTED ((void *)-2)
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Wed Aug 26 02:54:09 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Don't allow MD to override the assym.h generation rule.
(Nothing defines it except i386/bioscall/Makefile, but it is not part of
kernel build.)
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/conf/Makefile.kern.inc
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/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.191 src/sys/conf/Makefile.kern.inc:1.192
--- src/sys/conf/Makefile.kern.inc:1.191 Tue Aug 25 08:01:18 2015
+++ src/sys/conf/Makefile.kern.inc Wed Aug 26 02:54:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.191 2015/08/25 08:01:18 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.192 2015/08/26 02:54:09 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -303,7 +303,6 @@ SYSTEM_LD_TAIL_STAGE2+= ${SYSTEM_LD_TAIL
##
## (6) port independent targets and dependencies: assym.h, vers.o
##
-.if !target(assym.h)
assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS}
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
@@ -311,7 +310,6 @@ assym.h: ${GENASSYM_CONF} ${GENASSYM_EXT
${GENASSYM_CPPFLAGS} assym.h.tmp \
mv -f assym.h.tmp assym.h
${MD_SFILES:C/\.[Ss]/.o/} ${SFILES:C/\.[Ss]/.o/}: assym.h
-.endif
MKREPRO?=no
CVS commit: src/sys
Module Name:src
Committed By: uebayasi
Date: Wed Aug 26 03:00:53 UTC 2015
Modified Files:
src/sys/arch/amd64/amd64: genassym.cf
src/sys/arch/i386/i386: genassym.cf
src/sys/arch/mips/mips: genassym.cf
src/sys/conf: Makefile.kern.inc
Added Files:
src/sys/conf: genassym.cf
Log Message:
Have MI genassym.cf.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/mips/mips/genassym.cf
cvs rdiff -u -r1.192 -r1.193 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r0 -r1.1 src/sys/conf/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/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.58 src/sys/arch/amd64/amd64/genassym.cf:1.59
--- src/sys/arch/amd64/amd64/genassym.cf:1.58 Tue Aug 25 08:04:31 2015
+++ src/sys/arch/amd64/amd64/genassym.cf Wed Aug 26 03:00:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.58 2015/08/25 08:04:31 uebayasi Exp $
+# $NetBSD: genassym.cf,v 1.59 2015/08/26 03:00:53 uebayasi Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -373,5 +373,3 @@ define VM_MIN_KERNEL_ADDRESS_HIGH32 (VM_
define RESCHED_KPREEMPT RESCHED_KPREEMPT
define SEL_RPL_MASK SEL_RPL
-
-define COHERENCY_UNIT COHERENCY_UNIT
Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.98 src/sys/arch/i386/i386/genassym.cf:1.99
--- src/sys/arch/i386/i386/genassym.cf:1.98 Tue Aug 25 12:56:58 2015
+++ src/sys/arch/i386/i386/genassym.cf Wed Aug 26 03:00:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.98 2015/08/25 12:56:58 uebayasi Exp $
+# $NetBSD: genassym.cf,v 1.99 2015/08/26 03:00:53 uebayasi Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -422,5 +422,3 @@ define EVTCHN_UPCALL_MASK offsetof(struc
define HYPERVISOR_sched_op __HYPERVISOR_sched_op
define SCHEDOP_yield SCHEDOP_yield
endif
-
-define COHERENCY_UNIT COHERENCY_UNIT
Index: src/sys/arch/mips/mips/genassym.cf
diff -u src/sys/arch/mips/mips/genassym.cf:1.65 src/sys/arch/mips/mips/genassym.cf:1.66
--- src/sys/arch/mips/mips/genassym.cf:1.65 Tue Aug 25 08:08:12 2015
+++ src/sys/arch/mips/mips/genassym.cf Wed Aug 26 03:00:53 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.65 2015/08/25 08:08:12 uebayasi Exp $
+# $NetBSD: genassym.cf,v 1.66 2015/08/26 03:00:53 uebayasi Exp $
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
@@ -346,5 +346,3 @@ define MCI_SDCACHE_SIZE offsetof(struct
define MIPS_CURLWP_LABEL MIPS_CURLWP_LABEL
define MIPS_CURLWP_REG MIPS_CURLWP_REG
-
-define COHERENCY_UNIT COHERENCY_UNIT
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.192 src/sys/conf/Makefile.kern.inc:1.193
--- src/sys/conf/Makefile.kern.inc:1.192 Wed Aug 26 02:54:09 2015
+++ src/sys/conf/Makefile.kern.inc Wed Aug 26 03:00:52 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.192 2015/08/26 02:54:09 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.193 2015/08/26 03:00:52 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -303,9 +303,9 @@ SYSTEM_LD_TAIL_STAGE2+= ${SYSTEM_LD_TAIL
##
## (6) port independent targets and dependencies: assym.h, vers.o
##
-assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS}
+assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf
${_MKTARGET_CREATE}
- cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
+ cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf | \
${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
${GENASSYM_CPPFLAGS} assym.h.tmp \
mv -f assym.h.tmp assym.h
Added files:
Index: src/sys/conf/genassym.cf
diff -u /dev/null src/sys/conf/genassym.cf:1.1
--- /dev/null Wed Aug 26 03:00:53 2015
+++ src/sys/conf/genassym.cf Wed Aug 26 03:00:52 2015
@@ -0,0 +1,3 @@
+# $NetBSD: genassym.cf,v 1.1 2015/08/26 03:00:52 uebayasi Exp $
+
+define COHERENCY_UNIT COHERENCY_UNIT
CVS commit: src/sbin/tunefs
Module Name:src
Committed By: mlelstv
Date: Wed Aug 26 05:41:20 UTC 2015
Modified Files:
src/sbin/tunefs: tunefs.c
Log Message:
Use getfsspecname also when not found in /etc/fstab.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sbin/tunefs/tunefs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/tunefs/tunefs.c
diff -u src/sbin/tunefs/tunefs.c:1.48 src/sbin/tunefs/tunefs.c:1.49
--- src/sbin/tunefs/tunefs.c:1.48 Sat Aug 9 10:33:46 2014
+++ src/sbin/tunefs/tunefs.c Wed Aug 26 05:41:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tunefs.c,v 1.48 2014/08/09 10:33:46 mlelstv Exp $ */
+/* $NetBSD: tunefs.c,v 1.49 2015/08/26 05:41:20 mlelstv Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)tunefs.c 8.3 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: tunefs.c,v 1.48 2014/08/09 10:33:46 mlelstv Exp $);
+__RCSID($NetBSD: tunefs.c,v 1.49 2015/08/26 05:41:20 mlelstv Exp $);
#endif
#endif /* not lint */
@@ -588,27 +588,26 @@ bread(daddr_t blk, char *buffer, int cnt
static int
openpartition(const char *name, int flags, char *device, size_t devicelen)
{
- char rawspec[MAXPATHLEN], xbuf[MAXPATHLEN], *p;
+ char specname[MAXPATHLEN];
+ char rawname[MAXPATHLEN];
+ const char *special, *raw;
struct fstab *fs;
int fd, oerrno;
fs = getfsfile(name);
- if (fs) {
- const char *fsspec;
- fsspec = getfsspecname(xbuf, sizeof(xbuf), fs-fs_spec);
- if (fsspec == NULL)
- err(4, %s, xbuf);
- if ((p = strrchr(fsspec, '/')) != NULL) {
- snprintf(rawspec, sizeof(rawspec), %.*s/r%s,
- (int)(p - fsspec), fsspec, p + 1);
- name = rawspec;
- } else
- name = fsspec;
- }
- fd = opendisk(name, flags, device, devicelen, 0);
+ special = fs ? fs-fs_spec : name;
+
+ raw = getfsspecname(specname, sizeof(specname), special);
+ if (raw == NULL)
+ err(1, %s: %s, name, specname);
+ special = getdiskrawname(rawname, sizeof(rawname), raw);
+ if (special == NULL)
+ special = raw;
+
+ fd = opendisk(special, flags, device, devicelen, 0);
if (fd == -1 errno == ENOENT) {
oerrno = errno;
- strlcpy(device, name, devicelen);
+ strlcpy(device, special, devicelen);
errno = oerrno;
}
return (fd);
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Tue Aug 25 08:01:18 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Make kernel.ldscript ready to include assym.h.
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/conf/Makefile.kern.inc
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/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.190 src/sys/conf/Makefile.kern.inc:1.191
--- src/sys/conf/Makefile.kern.inc:1.190 Tue Aug 25 02:57:32 2015
+++ src/sys/conf/Makefile.kern.inc Tue Aug 25 08:01:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.190 2015/08/25 02:57:32 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.191 2015/08/25 08:01:18 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -251,9 +251,9 @@ ${KERNLDSCRIPT}: ${SYSTEM_OBJ}
.for k in ${KERNELS}
EXTRA_CLEAN+= ${k}.ldscript
${k}: ${k}.ldscript
-${k}.ldscript: ${KERNLDSCRIPT}
+${k}.ldscript: ${KERNLDSCRIPT} assym.h
${_MKTARGET_CREATE}
- ${CPP} ${KERNLDSCRIPT} | grep -v '^#' | grep -v '^$$' $@
+ ${CPP} -I. ${KERNLDSCRIPT} | grep -v '^#' | grep -v '^$$' $@
.endfor
LINKSCRIPT= -T ${.TARGET}.ldscript
.endif
CVS commit: src/usr.bin/config
Module Name:src
Committed By: uebayasi
Date: Tue Aug 25 09:01:28 UTC 2015
Modified Files:
src/usr.bin/config: TODO
Log Message:
+ kill makeoptions
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/config/TODO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/TODO
diff -u src/usr.bin/config/TODO:1.20 src/usr.bin/config/TODO:1.21
--- src/usr.bin/config/TODO:1.20 Sun Aug 23 01:30:21 2015
+++ src/usr.bin/config/TODO Tue Aug 25 09:01:28 2015
@@ -355,6 +355,13 @@ o Disallow unknown options.
Don't accept options that are not defined as either defflag or defparam.
Report them and exit. Don't set ${IDENT} in the generated Makefile.
+o Kill makeoptions.
+
+ It adds a variable defined in the generated `Makefile'. While it looks
+ useful, it is too flexible and easy to abuse. The `Makefile' should be
+ kept as simple as possible and have nothing that affects output contents.
+ Consider to kill `makeoptions' totally, replace existing ones with `options'.
+
o Convert ${DIAGNOSTIC} and ${DEBUG} as flags (defflag).
Probably generate opt_diagnostic.h/opt_debug.h and include them in
CVS commit: src/sys/arch/amd64
Module Name:src
Committed By: uebayasi
Date: Tue Aug 25 08:04:31 UTC 2015
Modified Files:
src/sys/arch/amd64/amd64: genassym.cf
src/sys/arch/amd64/conf: kern.ldscript kern.ldscript.2MB
kern.ldscript.Xen
Log Message:
Replace COHERENCY_UNIT in ldscript.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/conf/kern.ldscript
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/conf/kern.ldscript.2MB
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/conf/kern.ldscript.Xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.57 src/sys/arch/amd64/amd64/genassym.cf:1.58
--- src/sys/arch/amd64/amd64/genassym.cf:1.57 Sat Jul 11 10:15:33 2015
+++ src/sys/arch/amd64/amd64/genassym.cf Tue Aug 25 08:04:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.57 2015/07/11 10:15:33 kamil Exp $
+# $NetBSD: genassym.cf,v 1.58 2015/08/25 08:04:31 uebayasi Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -373,3 +373,5 @@ define VM_MIN_KERNEL_ADDRESS_HIGH32 (VM_
define RESCHED_KPREEMPT RESCHED_KPREEMPT
define SEL_RPL_MASK SEL_RPL
+
+define COHERENCY_UNIT COHERENCY_UNIT
Index: src/sys/arch/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.13 src/sys/arch/amd64/conf/kern.ldscript:1.14
--- src/sys/arch/amd64/conf/kern.ldscript:1.13 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/amd64/conf/kern.ldscript Tue Aug 25 08:04:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.13 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.14 2015/08/25 08:04:31 uebayasi Exp $ */
ENTRY(_start)
SECTIONS
@@ -28,17 +28,17 @@ SECTIONS
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
Index: src/sys/arch/amd64/conf/kern.ldscript.2MB
diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.9 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.10
--- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.9 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.2MB Tue Aug 25 08:04:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.2MB,v 1.9 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.2MB,v 1.10 2015/08/25 08:04:31 uebayasi Exp $ */
ENTRY(_start)
SECTIONS
@@ -28,17 +28,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.8 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.9
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.8 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen Tue Aug 25 08:04:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.8 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.9 2015/08/25 08:04:31 uebayasi Exp $ */
ENTRY(_start)
SECTIONS
@@ -22,17 +22,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: uebayasi Date: Tue Aug 25 08:07:24 UTC 2015 Modified Files: src/sys/arch/amd64/conf: kern.ldscript kern.ldscript.2MB kern.ldscript.Xen Log Message: Fix previous; do include assym.h. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/conf/kern.ldscript cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/conf/kern.ldscript.2MB cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/conf/kern.ldscript.Xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/kern.ldscript diff -u src/sys/arch/amd64/conf/kern.ldscript:1.14 src/sys/arch/amd64/conf/kern.ldscript:1.15 --- src/sys/arch/amd64/conf/kern.ldscript:1.14 Tue Aug 25 08:04:31 2015 +++ src/sys/arch/amd64/conf/kern.ldscript Tue Aug 25 08:07:24 2015 @@ -1,4 +1,6 @@ -/* $NetBSD: kern.ldscript,v 1.14 2015/08/25 08:04:31 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript,v 1.15 2015/08/25 08:07:24 uebayasi Exp $ */ + +#include assym.h ENTRY(_start) SECTIONS Index: src/sys/arch/amd64/conf/kern.ldscript.2MB diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.10 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.11 --- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.10 Tue Aug 25 08:04:31 2015 +++ src/sys/arch/amd64/conf/kern.ldscript.2MB Tue Aug 25 08:07:24 2015 @@ -1,4 +1,6 @@ -/* $NetBSD: kern.ldscript.2MB,v 1.10 2015/08/25 08:04:31 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript.2MB,v 1.11 2015/08/25 08:07:24 uebayasi Exp $ */ + +#include assym.h ENTRY(_start) SECTIONS Index: src/sys/arch/amd64/conf/kern.ldscript.Xen diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.9 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.10 --- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.9 Tue Aug 25 08:04:31 2015 +++ src/sys/arch/amd64/conf/kern.ldscript.Xen Tue Aug 25 08:07:24 2015 @@ -1,4 +1,6 @@ -/* $NetBSD: kern.ldscript.Xen,v 1.9 2015/08/25 08:04:31 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript.Xen,v 1.10 2015/08/25 08:07:24 uebayasi Exp $ */ + +#include assym.h ENTRY(_start) SECTIONS
CVS commit: src/sys/arch/mips
Module Name:src
Committed By: uebayasi
Date: Tue Aug 25 08:08:12 UTC 2015
Modified Files:
src/sys/arch/mips/conf: kern.ldscript
src/sys/arch/mips/mips: genassym.cf
Log Message:
Replace a constant in ldscript.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/conf/kern.ldscript
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/mips/mips/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/mips/conf/kern.ldscript
diff -u src/sys/arch/mips/conf/kern.ldscript:1.10 src/sys/arch/mips/conf/kern.ldscript:1.11
--- src/sys/arch/mips/conf/kern.ldscript:1.10 Mon Aug 24 08:13:07 2015
+++ src/sys/arch/mips/conf/kern.ldscript Tue Aug 25 08:08:12 2015
@@ -1,4 +1,6 @@
-/* $NetBSD: kern.ldscript,v 1.10 2015/08/24 08:13:07 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.11 2015/08/25 08:08:12 uebayasi Exp $ */
+
+#include assym.h
/* ldscript for NetBSD/mips kernels and LKMs */
OUTPUT_ARCH(mips)
@@ -29,11 +31,11 @@ SECTIONS
_fdata = . ;
*(.data)
CONSTRUCTORS
-. = ALIGN(32); /* COHERENCY_UNIT */
+. = ALIGN(COHERENCY_UNIT);
*(.data.cacheline_aligned)
-. = ALIGN(32); /* COHERENCY_UNIT */
+. = ALIGN(COHERENCY_UNIT);
*(.data.read_mostly)
-. = ALIGN(32); /* COHERENCY_UNIT */
+. = ALIGN(COHERENCY_UNIT);
}
_gp = ALIGN(16) + 0x7ff0;
.lit8 : { *(.lit8) }
Index: src/sys/arch/mips/mips/genassym.cf
diff -u src/sys/arch/mips/mips/genassym.cf:1.64 src/sys/arch/mips/mips/genassym.cf:1.65
--- src/sys/arch/mips/mips/genassym.cf:1.64 Thu Jul 9 14:41:54 2015
+++ src/sys/arch/mips/mips/genassym.cf Tue Aug 25 08:08:12 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.64 2015/07/09 14:41:54 matt Exp $
+# $NetBSD: genassym.cf,v 1.65 2015/08/25 08:08:12 uebayasi Exp $
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
@@ -346,3 +346,5 @@ define MCI_SDCACHE_SIZE offsetof(struct
define MIPS_CURLWP_LABEL MIPS_CURLWP_LABEL
define MIPS_CURLWP_REG MIPS_CURLWP_REG
+
+define COHERENCY_UNIT COHERENCY_UNIT
CVS commit: othersrc/external/bsd/arfe/dt
Module Name:othersrc Committed By: dyoung Date: Tue Aug 25 22:19:10 UTC 2015 Modified Files: othersrc/external/bsd/arfe/dt: dt.c Added Files: othersrc/external/bsd/arfe/dt/rr: if-re0-if-wm0 if-wm0-if-re0 othersrc/external/bsd/arfe/dt/t: if-re0 if-wm0 Log Message: Commit stragglers. Renew $ARFE$ in dt.c. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/arfe/dt/dt.c cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/dt/rr/if-re0-if-wm0 \ othersrc/external/bsd/arfe/dt/rr/if-wm0-if-re0 cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/dt/t/if-re0 \ othersrc/external/bsd/arfe/dt/t/if-wm0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/arfe/dt/dt.c diff -u othersrc/external/bsd/arfe/dt/dt.c:1.3 othersrc/external/bsd/arfe/dt/dt.c:1.4 --- othersrc/external/bsd/arfe/dt/dt.c:1.3 Sat Aug 22 05:08:48 2015 +++ othersrc/external/bsd/arfe/dt/dt.c Tue Aug 25 22:19:09 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: dt.c,v 1.3 2015/08/22 05:08:48 dyoung Exp $ */ -/* $ARFE: dt.c 215 2015-08-22 05:02:46Z dyoung $ */ +/* $NetBSD: dt.c,v 1.4 2015/08/25 22:19:09 dyoung Exp $ */ +/* $ARFE: dt.c 217 2015-08-25 22:16:29Z dyoung $ */ /*- * Copyright (c) 2014,2015 David Young dyo...@netbsd.org Added files: Index: othersrc/external/bsd/arfe/dt/rr/if-re0-if-wm0 diff -u /dev/null othersrc/external/bsd/arfe/dt/rr/if-re0-if-wm0:1.1 --- /dev/null Tue Aug 25 22:19:10 2015 +++ othersrc/external/bsd/arfe/dt/rr/if-re0-if-wm0 Tue Aug 25 22:19:09 2015 @@ -0,0 +1,8 @@ + 0: flags= 0UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST mtu0 + capabilities=-1f0TSO0,IP0CSUM_Rx,IP0CSUM_Tx,TCP0CSUM_Rx,TCP0CSUM_Tx,UDP0CSUM_Rx,UDP0CSUM_Tx + enabled=-1f0TSO0,IP0CSUM_Rx,IP0CSUM_Tx,TCP0CSUM_Rx,TCP0CSUM_Tx,UDP0CSUM_Rx,UDP0CSUM_Tx + address: 0:-25:-80:-1:b + media: Ethernet autoselect (e) + status: aie + inet 10.0.1.17 netmask 0xff00 broadcast -245.-255.-254.0 + inet0 fe 0::-25:ff:fe-80:b%0 prefixlen 0 scopeid 0x0 Index: othersrc/external/bsd/arfe/dt/rr/if-wm0-if-re0 diff -u /dev/null othersrc/external/bsd/arfe/dt/rr/if-wm0-if-re0:1.1 --- /dev/null Tue Aug 25 22:19:10 2015 +++ othersrc/external/bsd/arfe/dt/rr/if-wm0-if-re0 Tue Aug 25 22:19:09 2015 @@ -0,0 +1,8 @@ + 0: flags= 0UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST mtu0 + capabilities=1f0TSO0,IP0CSUM_Rx,IP0CSUM_Tx,TCP0CSUM_Rx,TCP0CSUM_Tx,UDP0CSUM_Rx,UDP-2CSUM_Tx + enabled=1f0TSO0,IP0CSUM_Rx,IP0CSUM_Tx,TCP0CSUM_Rx,TCP0CSUM_Tx,UDP0CSUM_Rx,UDP-2CSUM_Tx + address: 0:25:5: 80:: + media: Ethernet autoselect (e) + status: cie + inet -10.0.-1.-17 netmask 0xff00 broadcast 245.255.254.0 + inet0 fe 0:: 25:ff:fe80:b%0 prefixlen 0 scopeid 0x0 Index: othersrc/external/bsd/arfe/dt/t/if-re0 diff -u /dev/null othersrc/external/bsd/arfe/dt/t/if-re0:1.1 --- /dev/null Tue Aug 25 22:19:10 2015 +++ othersrc/external/bsd/arfe/dt/t/if-re0 Tue Aug 25 22:19:10 2015 @@ -0,0 +1,8 @@ +re0: flags=8843UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST mtu 1500 + capabilities=3f80TSO4,IP4CSUM_Rx,IP4CSUM_Tx,TCP4CSUM_Rx,TCP4CSUM_Tx,UDP4CSUM_Rx,UDP4CSUM_Tx + enabled=3f80TSO4,IP4CSUM_Rx,IP4CSUM_Tx,TCP4CSUM_Rx,TCP4CSUM_Tx,UDP4CSUM_Rx,UDP4CSUM_Tx + address: 00:33:5d:80:a1:b0 + media: Ethernet autoselect (none) + status: no carrier + inet 0.0.0.0 netmask 0xff00 broadcast 255.255.255.255 + inet6 fe80::233:5dff:fe80:a1b0%re0 prefixlen 64 scopeid 0x2 Index: othersrc/external/bsd/arfe/dt/t/if-wm0 diff -u /dev/null othersrc/external/bsd/arfe/dt/t/if-wm0:1.1 --- /dev/null Tue Aug 25 22:19:10 2015 +++ othersrc/external/bsd/arfe/dt/t/if-wm0 Tue Aug 25 22:19:10 2015 @@ -0,0 +1,8 @@ +wm0: flags=8843UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST mtu 1500 + capabilities=2bf80TSO4,IP4CSUM_Rx,IP4CSUM_Tx,TCP4CSUM_Rx,TCP4CSUM_Tx,UDP4CSUM_Rx,UDP4CSUM_Tx,TCP6CSUM_Tx,UDP6CSUM_Tx + enabled=2bf80TSO4,IP4CSUM_Rx,IP4CSUM_Tx,TCP4CSUM_Rx,TCP4CSUM_Tx,UDP4CSUM_Rx,UDP4CSUM_Tx,TCP6CSUM_Tx,UDP6CSUM_Tx + address: 00:08:0c:0e:bc:cc + media: Ethernet autoselect (1000baseT full-duplex) + status: active + inet 10.0.1.17 netmask 0xff00 broadcast 10.0.1.255 + inet6 fe80::208:cff:fe0e:bccc%wm0 prefixlen 64 scopeid 0x1
CVS commit: src/sys/dev/dkwedge
Module Name:src
Committed By: pooka
Date: Tue Aug 25 11:08:59 UTC 2015
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
Rename variable to avoid -Wshadow warnings with some compilers.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.82 src/sys/dev/dkwedge/dk.c:1.83
--- src/sys/dev/dkwedge/dk.c:1.82 Sat Aug 22 07:48:14 2015
+++ src/sys/dev/dkwedge/dk.c Tue Aug 25 11:08:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.82 2015/08/22 07:48:14 mlelstv Exp $ */
+/* $NetBSD: dk.c,v 1.83 2015/08/25 11:08:59 pooka Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.82 2015/08/22 07:48:14 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.83 2015/08/25 11:08:59 pooka Exp $);
#ifdef _KERNEL_OPT
#include opt_dkwedge.h
@@ -949,7 +949,7 @@ dkwedge_read(struct disk *pdk, struct vn
int error;
bool isopen;
dev_t bdev;
- struct vnode *bdevvp;
+ struct vnode *bdvp;
/*
* The kernel cannot read from a character device vnode
@@ -968,17 +968,17 @@ dkwedge_read(struct disk *pdk, struct vn
KASSERT(pdk-dk_rawvp != NULL);
isopen = true;
++pdk-dk_rawopens;
- bdevvp = pdk-dk_rawvp;
+ bdvp = pdk-dk_rawvp;
} else {
isopen = false;
- bdevvp = dk_open_parent(bdev, FREAD);
+ bdvp = dk_open_parent(bdev, FREAD);
}
mutex_exit(pdk-dk_rawlock);
- if (bdevvp == NULL)
+ if (bdvp == NULL)
return EBUSY;
- bp = getiobuf(bdevvp, true);
+ bp = getiobuf(bdvp, true);
bp-b_flags = B_READ;
bp-b_cflags = BC_BUSY;
bp-b_dev = bdev;
@@ -988,7 +988,7 @@ dkwedge_read(struct disk *pdk, struct vn
bp-b_cylinder = 0;
bp-b_error = 0;
- VOP_STRATEGY(bdevvp, bp);
+ VOP_STRATEGY(bdvp, bp);
error = biowait(bp);
putiobuf(bp);
@@ -996,7 +996,7 @@ dkwedge_read(struct disk *pdk, struct vn
if (isopen) {
--pdk-dk_rawopens;
} else {
- dk_close_parent(bdevvp, FREAD);
+ dk_close_parent(bdvp, FREAD);
}
mutex_exit(pdk-dk_rawlock);
CVS commit: src/usr.bin/config
Module Name:src
Committed By: uebayasi
Date: Tue Aug 25 13:13:55 UTC 2015
Modified Files:
src/usr.bin/config: TODO
Log Message:
I don't like -Ttext .
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/config/TODO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/TODO
diff -u src/usr.bin/config/TODO:1.21 src/usr.bin/config/TODO:1.22
--- src/usr.bin/config/TODO:1.21 Tue Aug 25 09:01:28 2015
+++ src/usr.bin/config/TODO Tue Aug 25 13:13:54 2015
@@ -362,6 +362,13 @@ o Kill makeoptions.
kept as simple as possible and have nothing that affects output contents.
Consider to kill `makeoptions' totally, replace existing ones with `options'.
+o Don't use -Ttext ${TEXTADDR}.
+
+ Although ld(1)'s `-Ttext ${TEXTADDR}' is an easy way to specify the virtual
+ base address of .text at link time, it needs to change command-line; in
+ kernel build, Makefile needs to change to reflect kernel's configuration.
+ It is simpler to reflect kenel configuration using linker script via assym.h.
+
o Convert ${DIAGNOSTIC} and ${DEBUG} as flags (defflag).
Probably generate opt_diagnostic.h/opt_debug.h and include them in
CVS commit: src/sys/kern
Module Name:src
Committed By: gson
Date: Tue Aug 25 12:55:30 UTC 2015
Modified Files:
src/sys/kern: tty.c
Log Message:
In ttywait_timo(), break out of loop on all errors, not just
EWOULDBLOCK, as ttywait() did prior to 1.265.
To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 src/sys/kern/tty.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/kern/tty.c
diff -u src/sys/kern/tty.c:1.266 src/sys/kern/tty.c:1.267
--- src/sys/kern/tty.c:1.266 Mon Aug 24 22:50:32 2015
+++ src/sys/kern/tty.c Tue Aug 25 12:55:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.266 2015/08/24 22:50:32 pooka Exp $ */
+/* $NetBSD: tty.c,v 1.267 2015/08/25 12:55:30 gson Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.266 2015/08/24 22:50:32 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: tty.c,v 1.267 2015/08/25 12:55:30 gson Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -1552,10 +1552,10 @@ ttywait_timo(struct tty *tp, int timo)
CONNECTED(tp) tp-t_oproc) {
(*tp-t_oproc)(tp);
error = ttysleep(tp, tp-t_outcv, true, timo);
- if (error == EWOULDBLOCK) {
+ if (error == EWOULDBLOCK)
ttyflush(tp, FWRITE);
+ if (error)
break;
- }
}
mutex_spin_exit(tty_lock);
CVS commit: src/sys/arch/i386
Module Name:src
Committed By: uebayasi
Date: Tue Aug 25 12:56:58 UTC 2015
Modified Files:
src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen
src/sys/arch/i386/i386: genassym.cf
Log Message:
Replace a constant in ldscript.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/conf/kern.ldscript.Xen
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/i386/i386/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/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.14 src/sys/arch/i386/conf/kern.ldscript:1.15
--- src/sys/arch/i386/conf/kern.ldscript:1.14 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/i386/conf/kern.ldscript Tue Aug 25 12:56:58 2015
@@ -1,4 +1,6 @@
-/* $NetBSD: kern.ldscript,v 1.14 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.15 2015/08/25 12:56:58 uebayasi Exp $ */
+
+#include assym.h
ENTRY(_start)
SECTIONS
@@ -27,17 +29,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/i386/conf/kern.ldscript.4MB
diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.15 src/sys/arch/i386/conf/kern.ldscript.4MB:1.16
--- src/sys/arch/i386/conf/kern.ldscript.4MB:1.15 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/i386/conf/kern.ldscript.4MB Tue Aug 25 12:56:58 2015
@@ -1,4 +1,6 @@
-/* $NetBSD: kern.ldscript.4MB,v 1.15 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.4MB,v 1.16 2015/08/25 12:56:58 uebayasi Exp $ */
+
+#include assym.h
ENTRY(_start)
SECTIONS
@@ -28,17 +30,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.9 src/sys/arch/i386/conf/kern.ldscript.Xen:1.10
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.9 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Tue Aug 25 12:56:58 2015
@@ -1,4 +1,6 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.9 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.10 2015/08/25 12:56:58 uebayasi Exp $ */
+
+#include assym.h
SECTIONS
{
@@ -26,17 +28,17 @@ SECTIONS
{
*(.data)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.cacheline_aligned :
{
*(.data.cacheline_aligned)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
.data.read_mostly :
{
*(.data.read_mostly)
}
- . = ALIGN(64); /* COHERENCY_UNIT */
+ . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.97 src/sys/arch/i386/i386/genassym.cf:1.98
--- src/sys/arch/i386/i386/genassym.cf:1.97 Sat Feb 15 10:11:15 2014
+++ src/sys/arch/i386/i386/genassym.cf Tue Aug 25 12:56:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.97 2014/02/15 10:11:15 dsl Exp $
+# $NetBSD: genassym.cf,v 1.98 2015/08/25 12:56:58 uebayasi Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -423,3 +423,4 @@ define HYPERVISOR_sched_op __HYPERVISOR_
define SCHEDOP_yield SCHEDOP_yield
endif
+define COHERENCY_UNIT COHERENCY_UNIT
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Tue Aug 25 13:45:00 UTC 2015
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
allow mmap() to be called before init runs
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.117 src/lib/librumphijack/hijack.c:1.118
--- src/lib/librumphijack/hijack.c:1.117 Sat Apr 11 12:54:41 2015
+++ src/lib/librumphijack/hijack.c Tue Aug 25 13:45:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.117 2015/04/11 12:54:41 riastradh Exp $ */
+/* $NetBSD: hijack.c,v 1.118 2015/08/25 13:45:00 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -34,7 +34,7 @@
#include rump/rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: hijack.c,v 1.117 2015/04/11 12:54:41 riastradh Exp $);
+__RCSID($NetBSD: hijack.c,v 1.118 2015/08/25 13:45:00 pooka Exp $);
#endif
#include sys/param.h
@@ -885,7 +885,8 @@ rcinit(void)
host_fork = dlsym(RTLD_NEXT, fork);
host_daemon = dlsym(RTLD_NEXT, daemon);
- host_mmap = dlsym(RTLD_NEXT, mmap);
+ if (host_mmap == NULL)
+ host_mmap = dlsym(RTLD_NEXT, mmap);
/*
* In theory cannot print anything during lookups because
@@ -2233,6 +2234,9 @@ mmap(void *addr, size_t len, int prot, i
errno = ENOSYS;
return MAP_FAILED;
}
+ if (__predict_false(host_mmap == NULL)) {
+ host_mmap = dlsym(RTLD_NEXT, mmap);
+ }
return host_mmap(addr, len, prot, flags, fd, offset);
}
CVS commit: src/lib/libpthread
Module Name:src
Committed By: pooka
Date: Tue Aug 25 13:46:23 UTC 2015
Modified Files:
src/lib/libpthread: pthread_tsd.c
Log Message:
Revert 1.14 now that the arduous task of fixing rumphijack to allow
mmap() in early init has been completed.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libpthread/pthread_tsd.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_tsd.c
diff -u src/lib/libpthread/pthread_tsd.c:1.14 src/lib/libpthread/pthread_tsd.c:1.15
--- src/lib/libpthread/pthread_tsd.c:1.14 Sat May 30 14:42:26 2015
+++ src/lib/libpthread/pthread_tsd.c Tue Aug 25 13:46:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_tsd.c,v 1.14 2015/05/30 14:42:26 christos Exp $ */
+/* $NetBSD: pthread_tsd.c,v 1.15 2015/08/25 13:46:23 pooka Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread_tsd.c,v 1.14 2015/05/30 14:42:26 christos Exp $);
+__RCSID($NetBSD: pthread_tsd.c,v 1.15 2015/08/25 13:46:23 pooka Exp $);
/* Functions and structures dealing with thread-specific data */
#include errno.h
@@ -60,9 +60,6 @@ null_destructor(void *p)
#include stdlib.h
#include stdio.h
-/* Can't use mmap directly so early in the process because rump hijacks it */
-void *_mmap(void *, size_t, int, int, int, off_t);
-
void *
pthread_tsd_init(size_t *tlen)
{
@@ -88,7 +85,7 @@ pthread_tsd_init(size_t *tlen)
+ sizeof(*pthread__tsd_list) * pthread_keys_max
+ sizeof(*pthread__tsd_destructors) * pthread_keys_max;
- arena = _mmap(NULL, alen, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
+ arena = mmap(NULL, alen, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
if (arena == MAP_FAILED) {
pthread_keys_max = 0;
return NULL;
CVS commit: src/sys/external/bsd/acpica/dist/dispatcher
Module Name:src
Committed By: christos
Date: Wed Aug 26 01:54:57 UTC 2015
Modified Files:
src/sys/external/bsd/acpica/dist/dispatcher: dsutils.c
Log Message:
CID 1292510: Handle allocation failure.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/acpica/dist/dispatcher/dsutils.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/dispatcher/dsutils.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c:1.3 src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c:1.4
--- src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c:1.3 Tue Aug 18 06:39:46 2015
+++ src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c Tue Aug 25 21:54:57 2015
@@ -604,9 +604,15 @@ AcpiDsCreateOperand (
/* TBD: May only be temporary */
ObjDesc = AcpiUtCreateStringObject ((ACPI_SIZE) NameLength);
-
-strncpy (ObjDesc-String.Pointer, NameString, NameLength);
-Status = AE_OK;
+ if (!ObjDesc)
+ {
+ Status = AE_NO_MEMORY;
+ }
+ else
+ {
+ strncpy (ObjDesc-String.Pointer, NameString, NameLength);
+ Status = AE_OK;
+ }
}
else
{
CVS commit: src/sys/external/bsd/acpica/dist/compiler
Module Name:src
Committed By: christos
Date: Wed Aug 26 01:58:55 UTC 2015
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: dttable.c
Log Message:
CID 1298707: Change confusing code that makes coverity think that Length
is uninitalized (we want length to be zero so instead of setting it to 0,
we check if it not zero and then we set it if it is not?!?!)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/compiler/dttable.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/dttable.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dttable.c:1.5 src/sys/external/bsd/acpica/dist/compiler/dttable.c:1.6
--- src/sys/external/bsd/acpica/dist/compiler/dttable.c:1.5 Tue Aug 18 06:39:46 2015
+++ src/sys/external/bsd/acpica/dist/compiler/dttable.c Tue Aug 25 21:58:55 2015
@@ -3474,7 +3474,7 @@ DtCompileGeneric (
/* Now we can actually compile the parse tree */
-if (Length *Length)
+if (Length)
{
*Length = 0;
}
CVS commit: src/sys/external/bsd/acpica/dist/compiler
Module Name:src Committed By: christos Date: Wed Aug 26 02:01:55 UTC 2015 Modified Files: src/sys/external/bsd/acpica/dist/compiler: aslopcodes.c Log Message: CID 1320410: Don't call free on uninitalized pointer. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/acpica/dist/compiler/aslopcodes.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/aslopcodes.c diff -u src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c:1.3 src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c:1.4 --- src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c:1.3 Tue Aug 18 06:39:46 2015 +++ src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c Tue Aug 25 22:01:55 2015 @@ -1314,7 +1314,6 @@ OpcDoPld ( Node = Node-Asl.Next; } -UtLocalFree (Buffer, ACPI_PLD_BUFFER_SIZE); Buffer = OpcEncodePldBuffer(PldInfo); /* Change Op to a Buffer */
