CVS commit: src/sys/kern
Module Name:src Committed By: mlelstv Date: Sat Nov 22 10:24:02 UTC 2014 Modified Files: src/sys/kern: kern_subr.c Log Message: don't crash if rootspec is invalid To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/sys/kern/kern_subr.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/kern_subr.c diff -u src/sys/kern/kern_subr.c:1.214 src/sys/kern/kern_subr.c:1.215 --- src/sys/kern/kern_subr.c:1.214 Mon Dec 9 16:49:43 2013 +++ src/sys/kern/kern_subr.c Sat Nov 22 10:24:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_subr.c,v 1.214 2013/12/09 16:49:43 pooka Exp $ */ +/* $NetBSD: kern_subr.c,v 1.215 2014/11/22 10:24:02 mlelstv Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_subr.c,v 1.214 2013/12/09 16:49:43 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_subr.c,v 1.215 2014/11/22 10:24:02 mlelstv Exp $); #include opt_ddb.h #include opt_md.h @@ -422,7 +422,8 @@ setroot(device_t bootdv, int bootpartiti } if (rootdev == NODEV - device_class(dv) == DV_DISK device_is_a(dv, dk) + dv != NULL device_class(dv) == DV_DISK + device_is_a(dv, dk) (majdev = devsw_name2blk(device_xname(dv), NULL, 0)) = 0) rootdev = makedev(majdev, device_unit(dv));
CVS commit: src/sys
Module Name:src Committed By: mlelstv Date: Sat Nov 22 11:04:57 UTC 2014 Modified Files: src/sys/kern: kern_subr.c src/sys/sys: device.h Log Message: Let MD code provide boot disk information as spec string that can be parsed by MI code. The format is the same as provided by an embedded 'root on rootspec' string in the config file. An embedded string (other than a wildcard) still takes precedence. To generate a diff of this commit: cvs rdiff -u -r1.215 -r1.216 src/sys/kern/kern_subr.c cvs rdiff -u -r1.145 -r1.146 src/sys/sys/device.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/kern/kern_subr.c diff -u src/sys/kern/kern_subr.c:1.215 src/sys/kern/kern_subr.c:1.216 --- src/sys/kern/kern_subr.c:1.215 Sat Nov 22 10:24:02 2014 +++ src/sys/kern/kern_subr.c Sat Nov 22 11:04:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_subr.c,v 1.215 2014/11/22 10:24:02 mlelstv Exp $ */ +/* $NetBSD: kern_subr.c,v 1.216 2014/11/22 11:04:57 mlelstv Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_subr.c,v 1.215 2014/11/22 10:24:02 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_subr.c,v 1.216 2014/11/22 11:04:57 mlelstv Exp $); #include opt_ddb.h #include opt_md.h @@ -159,6 +159,7 @@ device_t booted_device; int booted_partition; daddr_t booted_startblk; uint64_t booted_nblks; +char *bootspec; /* * Use partition letters if it's a disk class but not a wedge. @@ -209,6 +210,12 @@ setroot(device_t bootdv, int bootpartiti } /* + * Let bootcode augment rootspec. + */ + if (rootspec == NULL) + rootspec = bootspec; + + /* * If NFS is specified as the file system, and we found * a DV_DISK boot device (or no boot device at all), then * find a reasonable network interface for rootspec. Index: src/sys/sys/device.h diff -u src/sys/sys/device.h:1.145 src/sys/sys/device.h:1.146 --- src/sys/sys/device.h:1.145 Fri Sep 5 05:47:40 2014 +++ src/sys/sys/device.h Sat Nov 22 11:04:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: device.h,v 1.145 2014/09/05 05:47:40 matt Exp $ */ +/* $NetBSD: device.h,v 1.146 2014/11/22 11:04:57 mlelstv Exp $ */ /* * Copyright (c) 1996, 2000 Christopher G. Demetriou @@ -415,6 +415,7 @@ extern device_t booted_device; /* the d extern int booted_partition; /* the partition on that device */ extern daddr_t booted_startblk; /* or the start of a wedge */ extern uint64_t booted_nblks; /* and the size of that wedge */ +extern char *bootspec; /* and the device/wedge name */ struct vnode *opendisk(device_t); int getdisksize(struct vnode *, uint64_t *, unsigned int *);
CVS commit: src/sys/arch/evbarm/evbarm
Module Name:src
Committed By: mlelstv
Date: Sat Nov 22 11:10:22 UTC 2014
Modified Files:
src/sys/arch/evbarm/evbarm: autoconf.c
Log Message:
If the boot argument root cannot be parsed as a device name, pass the
string untranslated to MI code. Due to limits in the boot argument parser
the string is terminated by whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/evbarm/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/evbarm/evbarm/autoconf.c
diff -u src/sys/arch/evbarm/evbarm/autoconf.c:1.17 src/sys/arch/evbarm/evbarm/autoconf.c:1.18
--- src/sys/arch/evbarm/evbarm/autoconf.c:1.17 Sat May 10 20:12:16 2014
+++ src/sys/arch/evbarm/evbarm/autoconf.c Sat Nov 22 11:10:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.17 2014/05/10 20:12:16 reinoud Exp $ */
+/* $NetBSD: autoconf.c,v 1.18 2014/11/22 11:10:22 mlelstv Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.17 2014/05/10 20:12:16 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.18 2014/11/22 11:10:22 mlelstv Exp $);
#include opt_md.h
@@ -51,15 +51,15 @@ void (*evbarm_device_register)(device_t,
void (*evbarm_device_register_post_config)(device_t, void *);
#ifndef MEMORY_DISK_IS_ROOT
-static void get_device(char *name);
+static int get_device(char *name, device_t *, int *);
static void set_root_device(void);
#endif
#ifndef MEMORY_DISK_IS_ROOT
/* Decode a device name to a major and minor number */
-static void
-get_device(char *name)
+static int
+get_device(char *name, device_t *dvp, int *partp)
{
int unit, part;
char devname[16], *cp;
@@ -69,7 +69,7 @@ get_device(char *name)
name += 5;
if (devsw_name2blk(name, devname, sizeof(devname)) == -1)
- return;
+ return 0;
name += strlen(devname);
unit = part = 0;
@@ -78,16 +78,19 @@ get_device(char *name)
while (*cp = '0' *cp = '9')
unit = (unit * 10) + (*cp++ - '0');
if (cp == name)
- return;
+ return 0;
if (*cp = 'a' *cp ('a' + MAXPARTITIONS))
part = *cp - 'a';
else if (*cp != '\0' *cp != ' ')
- return;
+ return 0;
if ((dv = device_find_by_driver_unit(devname, unit)) != NULL) {
- booted_device = dv;
- booted_partition = part;
+ *dvp = dv;
+ *partp = part;
+ return 1;
}
+
+ return 0;
}
/* Set the rootdev variable from the root specifier in the boot args */
@@ -95,10 +98,26 @@ get_device(char *name)
static void
set_root_device(void)
{
- char *ptr;
- if (boot_args
- get_bootconf_option(boot_args, root, BOOTOPT_TYPE_STRING, ptr))
- get_device(ptr);
+ char *ptr, *end;
+
+ if (boot_args == NULL)
+ return;
+
+ if (!get_bootconf_option(boot_args, root, BOOTOPT_TYPE_STRING, ptr))
+ return;
+
+ if (get_device(ptr, booted_device, booted_partition))
+ return;
+
+ /* NUL-terminate string, get_bootconf_option doesn't */
+ for (end=ptr; *end != '\0'; ++end) {
+ if (*end == ' ' || *end == '\t') {
+ *end = '\0';
+ break;
+ }
+ }
+
+ bootspec = ptr;
}
#endif
CVS commit: src/sys/dev/dkwedge
Module Name:src Committed By: mlelstv Date: Sat Nov 22 11:59:33 UTC 2014 Modified Files: src/sys/dev/dkwedge: dk.c Log Message: fix iobuf setup, cleanup To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 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.74 src/sys/dev/dkwedge/dk.c:1.75 --- src/sys/dev/dkwedge/dk.c:1.74 Tue Nov 4 07:50:39 2014 +++ src/sys/dev/dkwedge/dk.c Sat Nov 22 11:59:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: dk.c,v 1.74 2014/11/04 07:50:39 mlelstv Exp $ */ +/* $NetBSD: dk.c,v 1.75 2014/11/22 11:59:33 mlelstv 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.74 2014/11/04 07:50:39 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.75 2014/11/22 11:59:33 mlelstv Exp $); #ifdef _KERNEL_OPT #include opt_dkwedge.h @@ -217,10 +217,10 @@ dkwedge_compute_pdev(const char *pname, pmaj = devsw_name2chr(name, devname, sizeof(devname)); break; default: - pmaj = -1; + pmaj = NODEVMAJOR; break; } - if (pmaj == -1) + if (pmaj == NODEVMAJOR) return (ENODEV); name += strlen(devname); @@ -927,6 +927,7 @@ dkwedge_discover(struct disk *pdk) pdk-dk_name, error); /* We'll just assume the vnode has been cleaned up. */ } + out: rw_exit(dkwedge_discovery_methods_lock); } @@ -957,9 +958,10 @@ dkwedge_read(struct disk *pdk, struct vn bp-b_cflags = BC_BUSY; bp-b_dev = devsw_chr2blk(vp-v_rdev); bp-b_data = tbuf; - bp-b_bufsize = bp-b_resid = bp-b_bcount = len; - bp-b_lblkno = 0; + bp-b_bufsize = bp-b_bcount = len; bp-b_blkno = blkno; + bp-b_cylinder = 0; + bp-b_error = 0; error = bdev_open(bp-b_dev, FREAD, S_IFBLK, curlwp); if (error) @@ -1570,3 +1572,4 @@ dkwedge_get_parent_name(dev_t dev) return NULL; return sc-sc_parent-dk_name; } +
CVS commit: src/sys/compat/linux32
Module Name:src
Committed By: njoly
Date: Sat Nov 22 13:12:22 UTC 2014
Modified Files:
src/sys/compat/linux32/arch/amd64: syscalls.master
src/sys/compat/linux32/common: linux32_misc.c
Log Message:
Add ppoll(2) for compat linux32.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/compat/linux32/arch/amd64/syscalls.master
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/linux32/common/linux32_misc.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/compat/linux32/arch/amd64/syscalls.master
diff -u src/sys/compat/linux32/arch/amd64/syscalls.master:1.67 src/sys/compat/linux32/arch/amd64/syscalls.master:1.68
--- src/sys/compat/linux32/arch/amd64/syscalls.master:1.67 Thu May 29 10:47:00 2014
+++ src/sys/compat/linux32/arch/amd64/syscalls.master Sat Nov 22 13:12:22 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.67 2014/05/29 10:47:00 njoly Exp $
+ $NetBSD: syscalls.master,v 1.68 2014/11/22 13:12:22 njoly Exp $
; NetBSD i386 COMPAT_LINUX32 system call name/number master file.
; (See syscalls.conf to see what it is processed into.)
@@ -524,7 +524,8 @@
307 STD { int|linux32_sys||faccessat(int fd, netbsd32_charp path, \
int amode); }
308 UNIMPL pselect6
-309 UNIMPL ppoll
+309 STD { int|linux32_sys||ppoll(netbsd32_pollfdp_t fds, u_int nfds, \
+ linux32_timespecp_t timeout, linux32_sigsetp_t sigset); }
310 UNIMPL unshare
311 STD { int|linux32_sys||set_robust_list( \
linux32_robust_list_headp_t head, linux32_size_t len); }
Index: src/sys/compat/linux32/common/linux32_misc.c
diff -u src/sys/compat/linux32/common/linux32_misc.c:1.24 src/sys/compat/linux32/common/linux32_misc.c:1.25
--- src/sys/compat/linux32/common/linux32_misc.c:1.24 Sun Nov 9 17:48:08 2014
+++ src/sys/compat/linux32/common/linux32_misc.c Sat Nov 22 13:12:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_misc.c,v 1.24 2014/11/09 17:48:08 maxv Exp $ */
+/* $NetBSD: linux32_misc.c,v 1.25 2014/11/22 13:12:22 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux32_misc.c,v 1.24 2014/11/09 17:48:08 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux32_misc.c,v 1.25 2014/11/22 13:12:22 njoly Exp $);
#include sys/param.h
#include sys/proc.h
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, $NetBSD: linux32_misc
#include sys/vfs_syscalls.h
#include sys/ptrace.h
#include sys/syscall.h
+#include sys/poll.h
#include compat/netbsd32/netbsd32.h
#include compat/netbsd32/netbsd32_syscallargs.h
@@ -347,3 +348,39 @@ linux32_sys_setdomainname(struct lwp *l,
NETBSD32TO64_UAP(len);
return linux_sys_setdomainname(l, ua, retval);
}
+
+int
+linux32_sys_ppoll(struct lwp *l, const struct linux32_sys_ppoll_args *uap,
+register_t *retval)
+{
+ /* {
+ syscallarg(netbsd32_pollfdp_t) fds;
+ syscallarg(u_int) nfds;
+ syscallarg(linux32_timespecp_t) timeout;
+ syscallarg(linux32_sigsetp_t) sigset;
+ } */
+ struct linux32_timespec lts0, *lts;
+ struct timespec ts0, *ts = NULL;
+ linux32_sigset_t lsigmask0, *lsigmask;
+ sigset_t sigmask0, *sigmask = NULL;
+ int error;
+
+ lts = SCARG_P32(uap, timeout);
+ if (lts) {
+ if ((error = copyin(lts, lts0, sizeof(lts0))) != 0)
+ return error;
+ linux32_to_native_timespec(ts0, lts0);
+ ts = ts0;
+ }
+
+ lsigmask = SCARG_P32(uap, sigset);
+ if (lsigmask) {
+ if ((error = copyin(lsigmask, lsigmask0, sizeof(lsigmask0
+ return error;
+ linux32_to_native_sigset(sigmask0, lsigmask0);
+ sigmask = sigmask0;
+ }
+
+ return pollcommon(retval, SCARG_P32(uap, fds), SCARG(uap, nfds),
+ ts, sigmask);
+}
CVS commit: src/sys/compat/linux32/arch/amd64
Module Name:src
Committed By: njoly
Date: Sat Nov 22 13:13:10 UTC 2014
Modified Files:
src/sys/compat/linux32/arch/amd64: linux32_syscall.h
linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c
Log Message:
Regen for ppoll(2)
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 \
src/sys/compat/linux32/arch/amd64/linux32_syscall.h \
src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \
src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \
src/sys/compat/linux32/arch/amd64/linux32_sysent.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/compat/linux32/arch/amd64/linux32_syscall.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.72 src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.73
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.72 Thu May 29 10:47:23 2014
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h Sat Nov 22 13:13:10 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.72 2014/05/29 10:47:23 njoly Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.73 2014/11/22 13:13:10 njoly Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2014/05/29 10:47:00 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.68 2014/11/22 13:12:22 njoly Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -690,6 +690,9 @@
/* syscall: faccessat ret: int args: int netbsd32_charp int */
#define LINUX32_SYS_faccessat 307
+/* syscall: ppoll ret: int args: netbsd32_pollfdp_t u_int linux32_timespecp_t linux32_sigsetp_t */
+#define LINUX32_SYS_ppoll 309
+
/* syscall: set_robust_list ret: int args: linux32_robust_list_headp_t linux32_size_t */
#define LINUX32_SYS_set_robust_list 311
Index: src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.72 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.73
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.72 Thu May 29 10:47:23 2014
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h Sat Nov 22 13:13:10 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.72 2014/05/29 10:47:23 njoly Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.73 2014/11/22 13:13:10 njoly Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2014/05/29 10:47:00 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.68 2014/11/22 13:12:22 njoly Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -981,6 +981,14 @@ struct linux32_sys_faccessat_args {
};
check_syscall_args(linux32_sys_faccessat)
+struct linux32_sys_ppoll_args {
+ syscallarg(netbsd32_pollfdp_t) fds;
+ syscallarg(u_int) nfds;
+ syscallarg(linux32_timespecp_t) timeout;
+ syscallarg(linux32_sigsetp_t) sigset;
+};
+check_syscall_args(linux32_sys_ppoll)
+
struct linux32_sys_set_robust_list_args {
syscallarg(linux32_robust_list_headp_t) head;
syscallarg(linux32_size_t) len;
@@ -1449,6 +1457,8 @@ int linux32_sys_fchmodat(struct lwp *, c
int linux32_sys_faccessat(struct lwp *, const struct linux32_sys_faccessat_args *, register_t *);
+int linux32_sys_ppoll(struct lwp *, const struct linux32_sys_ppoll_args *, register_t *);
+
int linux32_sys_set_robust_list(struct lwp *, const struct linux32_sys_set_robust_list_args *, register_t *);
int linux32_sys_get_robust_list(struct lwp *, const struct linux32_sys_get_robust_list_args *, register_t *);
Index: src/sys/compat/linux32/arch/amd64/linux32_syscalls.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.72 src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.73
--- src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.72 Thu May 29 10:47:23 2014
+++ src/sys/compat/linux32/arch/amd64/linux32_syscalls.c Sat Nov 22 13:13:10 2014
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_syscalls.c,v 1.72 2014/05/29 10:47:23 njoly Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.73 2014/11/22 13:13:10 njoly Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2014/05/29 10:47:00 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.68 2014/11/22 13:12:22 njoly Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux32_syscalls.c,v 1.72 2014/05/29 10:47:23 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux32_syscalls.c,v 1.73 2014/11/22 13:13:10 njoly Exp $);
#if defined(_KERNEL_OPT)
#include sys/param.h
@@ -346,7 +346,7 @@ const char *const linux32_syscallnames[]
/* 306 */ fchmodat,
/* 307 */ faccessat,
/* 308 */ #308 (unimplemented pselect6),
- /* 309 */ #309 (unimplemented ppoll),
+ /* 309 */ ppoll,
/* 310 */ #310 (unimplemented unshare),
/* 311 */ set_robust_list,
/* 312 */ get_robust_list,
Index:
CVS commit: src/sys/compat/linux
Module Name:src
Committed By: njoly
Date: Sat Nov 22 13:18:45 UTC 2014
Modified Files:
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/arch/amd64: syscalls.master
src/sys/compat/linux/arch/arm: syscalls.master
src/sys/compat/linux/arch/i386: syscalls.master
src/sys/compat/linux/arch/m68k: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/arch/powerpc: syscalls.master
src/sys/compat/linux/common: linux_misc.c
Log Message:
Fix ppoll signature (int -u_int)
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.52 -r1.53 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.61 -r1.62 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.118 -r1.119 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.65 -r1.66 src/sys/compat/linux/arch/powerpc/syscalls.master
cvs rdiff -u -r1.229 -r1.230 src/sys/compat/linux/common/linux_misc.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/compat/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.88 src/sys/compat/linux/arch/alpha/syscalls.master:1.89
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.88 Thu May 29 10:35:26 2014
+++ src/sys/compat/linux/arch/alpha/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.88 2014/05/29 10:35:26 njoly Exp $
+ $NetBSD: syscalls.master,v 1.89 2014/11/22 13:18:45 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -729,7 +729,7 @@
462 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
463 UNIMPL pselect6
-464 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+464 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
465 UNIMPL unshare
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.52 src/sys/compat/linux/arch/amd64/syscalls.master:1.53
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.52 Sat May 31 08:51:19 2014
+++ src/sys/compat/linux/arch/amd64/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.53 2014/11/22 13:18:45 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -490,7 +490,7 @@
269 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
270 UNIMPL pselect6
-271 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+271 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
272 UNIMPL unshare
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.61 src/sys/compat/linux/arch/arm/syscalls.master:1.62
--- src/sys/compat/linux/arch/arm/syscalls.master:1.61 Sat May 31 08:51:19 2014
+++ src/sys/compat/linux/arch/arm/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.61 2014/05/31 08:51:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.62 2014/11/22 13:18:45 njoly Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -531,7 +531,7 @@
334 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
335 UNIMPL pselect6
-336 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+336 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
337 UNIMPL unshare
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.118 src/sys/compat/linux/arch/i386/syscalls.master:1.119
--- src/sys/compat/linux/arch/i386/syscalls.master:1.118 Sat May 31 08:51:19 2014
+++ src/sys/compat/linux/arch/i386/syscalls.master Sat Nov 22 13:18:45 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.118 2014/05/31 08:51:19 njoly Exp $
+ $NetBSD: syscalls.master,v 1.119 2014/11/22 13:18:45 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -504,7 +504,7 @@
307 STD { int|linux_sys||faccessat(int fd, const char *path, \
int amode); }
308 UNIMPL pselect6
-309 STD { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
+309 STD { int|linux_sys||ppoll(struct pollfd *fds, u_int nfds, \
struct linux_timespec *timeout, \
linux_sigset_t *sigset); }
310 UNIMPL unshare
Index:
CVS commit: src/sys/compat/linux/arch
Module Name:src Committed By: njoly Date: Sat Nov 22 13:20:35 UTC 2014 Modified Files: src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/m68k: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: Regen for ppoll signature fix To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.93 -r1.94 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.95 -r1.96 src/sys/compat/linux/arch/alpha/linux_syscalls.c cvs rdiff -u -r1.54 -r1.55 src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.64 -r1.65 src/sys/compat/linux/arch/arm/linux_syscall.h \ src/sys/compat/linux/arch/arm/linux_syscallargs.h \ src/sys/compat/linux/arch/arm/linux_syscalls.c \ src/sys/compat/linux/arch/arm/linux_sysent.c cvs rdiff -u -r1.103 -r1.104 src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.104 -r1.105 src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.94 -r1.95 src/sys/compat/linux/arch/m68k/linux_syscall.h \ src/sys/compat/linux/arch/m68k/linux_syscalls.c \ src/sys/compat/linux/arch/m68k/linux_sysent.c cvs rdiff -u -r1.93 -r1.94 src/sys/compat/linux/arch/m68k/linux_syscallargs.h cvs rdiff -u -r1.61 -r1.62 src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.60 -r1.61 src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c cvs rdiff -u -r1.70 -r1.71 src/sys/compat/linux/arch/powerpc/linux_syscall.h \ src/sys/compat/linux/arch/powerpc/linux_sysent.c cvs rdiff -u -r1.69 -r1.70 \ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \ src/sys/compat/linux/arch/powerpc/linux_syscalls.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/compat/linux/arch/alpha/linux_syscall.h diff -u src/sys/compat/linux/arch/alpha/linux_syscall.h:1.94 src/sys/compat/linux/arch/alpha/linux_syscall.h:1.95 --- src/sys/compat/linux/arch/alpha/linux_syscall.h:1.94 Thu May 29 10:36:31 2014 +++ src/sys/compat/linux/arch/alpha/linux_syscall.h Sat Nov 22 13:20:35 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscall.h,v 1.94 2014/05/29 10:36:31 njoly Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.95 2014/11/22 13:20:35 njoly Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.88 2014/05/29 10:35:26 njoly Exp + * created from NetBSD: syscalls.master,v 1.89 2014/11/22 13:18:45 njoly Exp */ #ifndef _LINUX_SYS_SYSCALL_H_ @@ -639,7 +639,7 @@ /* syscall: faccessat ret: int args: int const char * int */ #define LINUX_SYS_faccessat 462 -/* syscall: ppoll ret: int args: struct pollfd * int struct linux_timespec * linux_sigset_t * */ +/* syscall: ppoll ret: int args: struct pollfd * u_int struct linux_timespec * linux_sigset_t * */ #define LINUX_SYS_ppoll 464 /* syscall: set_robust_list ret: int args: struct linux_robust_list_head * size_t */ Index: src/sys/compat/linux/arch/alpha/linux_sysent.c diff -u src/sys/compat/linux/arch/alpha/linux_sysent.c:1.94 src/sys/compat/linux/arch/alpha/linux_sysent.c:1.95 --- src/sys/compat/linux/arch/alpha/linux_sysent.c:1.94 Thu May 29 10:36:31 2014 +++ src/sys/compat/linux/arch/alpha/linux_sysent.c Sat Nov 22 13:20:35 2014 @@ -1,14 +1,14 @@ -/* $NetBSD: linux_sysent.c,v 1.94 2014/05/29 10:36:31 njoly Exp $ */ +/* $NetBSD: linux_sysent.c,v 1.95 2014/11/22 13:20:35 njoly Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.88 2014/05/29 10:35:26 njoly Exp + * created from NetBSD: syscalls.master,v 1.89 2014/11/22 13:18:45 njoly Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_sysent.c,v 1.94
CVS commit: src/sys/dev/usb
Module Name:src Committed By: njoly Date: Sat Nov 22 14:30:57 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Atheros AR3012 To generate a diff of this commit: cvs rdiff -u -r1.683 -r1.684 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.683 src/sys/dev/usb/usbdevs:1.684 --- src/sys/dev/usb/usbdevs:1.683 Sun Oct 5 03:46:56 2014 +++ src/sys/dev/usb/usbdevs Sat Nov 22 14:30:57 2014 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.683 2014/10/05 03:46:56 nonaka Exp $ +$NetBSD: usbdevs,v 1.684 2014/11/22 14:30:57 njoly Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -934,6 +934,7 @@ product ATHEROS2 AR9271_1 0x1006 AR9271 product ATHEROS2 3CRUSBN275 0x1010 3CRUSBN275 product ATHEROS2 WN612 0x1011 WN612 product ATHEROS2 AR3011 0x3000 AR3011 +product ATHEROS2 AR3012 0x3004 AR3012 product ATHEROS2 AR9280 0x7010 AR9280+AR7010 product ATHEROS2 AR9287 0x7015 AR9287+AR7010 product ATHEROS2 AR9170 0x9170 AR9170
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: njoly
Date: Sat Nov 22 14:31:53 UTC 2014
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Regen for Atheros AR3012
To generate a diff of this commit:
cvs rdiff -u -r1.675 -r1.676 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.676 -r1.677 src/sys/dev/usb/usbdevs_data.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/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.675 src/sys/dev/usb/usbdevs.h:1.676
--- src/sys/dev/usb/usbdevs.h:1.675 Sun Oct 5 03:47:17 2014
+++ src/sys/dev/usb/usbdevs.h Sat Nov 22 14:31:53 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.675 2014/10/05 03:47:17 nonaka Exp $ */
+/* $NetBSD: usbdevs.h,v 1.676 2014/11/22 14:31:53 njoly Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.683 2014/10/05 03:46:56 nonaka Exp
+ * NetBSD: usbdevs,v 1.684 2014/11/22 14:30:57 njoly Exp
*/
/*
@@ -941,6 +941,7 @@
#define USB_PRODUCT_ATHEROS2_3CRUSBN275 0x1010 /* 3CRUSBN275 */
#define USB_PRODUCT_ATHEROS2_WN612 0x1011 /* WN612 */
#define USB_PRODUCT_ATHEROS2_AR3011 0x3000 /* AR3011 */
+#define USB_PRODUCT_ATHEROS2_AR3012 0x3004 /* AR3012 */
#define USB_PRODUCT_ATHEROS2_AR9280 0x7010 /* AR9280+AR7010 */
#define USB_PRODUCT_ATHEROS2_AR9287 0x7015 /* AR9287+AR7010 */
#define USB_PRODUCT_ATHEROS2_AR9170 0x9170 /* AR9170 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.676 src/sys/dev/usb/usbdevs_data.h:1.677
--- src/sys/dev/usb/usbdevs_data.h:1.676 Sun Oct 5 03:47:17 2014
+++ src/sys/dev/usb/usbdevs_data.h Sat Nov 22 14:31:53 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.676 2014/10/05 03:47:17 nonaka Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.677 2014/11/22 14:31:53 njoly Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.683 2014/10/05 03:46:56 nonaka Exp
+ * NetBSD: usbdevs,v 1.684 2014/11/22 14:30:57 njoly Exp
*/
/*
@@ -1063,12 +1063,14 @@ static const uint16_t usb_products[] = {
6601, 0,
USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR3011,
6607, 0,
+ USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR3012,
+ 6614, 0,
USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9280,
5119, 0,
USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9287,
5270, 0,
USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9170,
- 6614, 0,
+ 6621, 0,
USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9271_2,
6583, 0,
USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9271_3,
@@ -1076,39 +1078,39 @@ static const uint16_t usb_products[] = {
USB_VENDOR_ATI2, USB_PRODUCT_ATI2_205,
4638, 2544, 5369, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_UHB124,
- 6621, 6628, 0,
+ 6628, 6635, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_WN210,
- 6632, 6641, 0,
+ 6639, 6648, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL900AP,
- 6647, 3658, 6657, 6664, 0,
+ 6654, 3658, 6664, 6671, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_SAM_BA,
- 6670, 6674, 6681, 6693, 0,
+ 6677, 6681, 6688, 6700, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL120,
- 6698, 3658, 4677, 0,
+ 6705, 3658, 4677, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503I1,
- 6706, 6715, 6725, 6730, 0,
+ 6713, 6722, 6732, 6737, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503I2,
- 6706, 6715, 6737, 6730, 0,
+ 6713, 6722, 6744, 6737, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503RFMD,
- 6706, 6742, 6730, 0,
+ 6713, 6749, 6737, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505RFMD,
- 6748, 6742, 6730, 0,
+ 6755, 6749, 6737, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505RFMD2958,
- 6748, 6742, 6757, 6730, 0,
+ 6755, 6749, 6764, 6737, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505A,
- 6762, 6742, 6757, 6730, 0,
+ 6769, 6749, 6764, 6737, 0,
USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505AS,
- 6772, 6742, 6757, 6730, 0,
+ 6779, 6749, 6764, 6737, 0,
USB_VENDOR_AUDIOTECHNICA, USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB,
- 6783, 4638, 6794, 0,
+ 6790, 4638, 6801, 0,
USB_VENDOR_AVANCELOGIC, USB_PRODUCT_AVANCELOGIC_USBAUDIO,
- 4638, 6804, 6810, 0,
+ 4638, 6811, 6817, 0,
USB_VENDOR_AVERATEC, USB_PRODUCT_AVERATEC_USBWLAN,
5068, 0,
USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
- 6818, 6824, 0,
+ 6825, 6831, 0,
USB_VENDOR_AVM, USB_PRODUCT_AVM_FRITZWLAN,
- 6832, 6843, 0,
+ 6839, 6850, 0,
USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870_1,
4864, 0,
USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870_2,
@@ -1148,227 +1150,227 @@ static const uint16_t usb_products[] = {
USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RTL8188CU,
4995, 0,
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: ozaki-r
Date: Sat Nov 22 15:00:05 UTC 2014
Modified Files:
src/sys/dev/sysmon: sysmon_envsys_events.c sysmonvar.h
Log Message:
Kill sme_callout_mtx and use sme_mtx instead
We can use sme_mtx for the callout as well. Actually we should do so
because sme_events_list and some other data that are touched in the
callout should be protected by sme_mtx, not sme_callout_mtx.
Discussed with riastradh@ in
http://mail-index.netbsd.org/tech-kern/2014/11/11/msg017956.html
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/sysmon/sysmon_envsys_events.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/sysmon/sysmonvar.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/dev/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.110 src/sys/dev/sysmon/sysmon_envsys_events.c:1.111
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.110 Sun Sep 15 14:40:56 2013
+++ src/sys/dev/sysmon/sysmon_envsys_events.c Sat Nov 22 15:00:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.110 2013/09/15 14:40:56 martin Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.111 2014/11/22 15:00:05 ozaki-r Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.110 2013/09/15 14:40:56 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.111 2014/11/22 15:00:05 ozaki-r Exp $);
#include sys/param.h
#include sys/types.h
@@ -566,7 +566,6 @@ sme_events_init(struct sysmon_envsys *sm
if (error)
return error;
- mutex_init(sme-sme_callout_mtx, MUTEX_DEFAULT, IPL_SOFTCLOCK);
callout_init(sme-sme_callout, CALLOUT_MPSAFE);
callout_setfunc(sme-sme_callout, sme_events_check, sme);
sme-sme_flags |= SME_CALLOUT_INITIALIZED;
@@ -614,7 +613,6 @@ sme_events_destroy(struct sysmon_envsys
callout_stop(sme-sme_callout);
workqueue_destroy(sme-sme_wq);
- mutex_destroy(sme-sme_callout_mtx);
callout_destroy(sme-sme_callout);
sme-sme_flags = ~SME_CALLOUT_INITIALIZED;
DPRINTF((%s: events framework destroyed for '%s'\n,
@@ -708,14 +706,14 @@ sme_events_check(void *arg)
KASSERT(sme != NULL);
- mutex_enter(sme-sme_callout_mtx);
+ mutex_enter(sme-sme_mtx);
LIST_FOREACH(see, sme-sme_events_list, see_list) {
workqueue_enqueue(sme-sme_wq, see-see_wk, NULL);
see-see_edata-flags |= ENVSYS_FNEED_REFRESH;
}
if (!sysmon_low_power)
sme_schedule_callout(sme);
- mutex_exit(sme-sme_callout_mtx);
+ mutex_exit(sme-sme_mtx);
}
/*
Index: src/sys/dev/sysmon/sysmonvar.h
diff -u src/sys/dev/sysmon/sysmonvar.h:1.44 src/sys/dev/sysmon/sysmonvar.h:1.45
--- src/sys/dev/sysmon/sysmonvar.h:1.44 Tue Dec 11 15:39:06 2012
+++ src/sys/dev/sysmon/sysmonvar.h Sat Nov 22 15:00:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmonvar.h,v 1.44 2012/12/11 15:39:06 pgoyette Exp $ */
+/* $NetBSD: sysmonvar.h,v 1.45 2014/11/22 15:00:05 ozaki-r Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -208,7 +208,6 @@ struct sysmon_envsys {
* Locking/synchronization.
*/
kmutex_t sme_mtx;
- kmutex_t sme_callout_mtx;
kcondvar_t sme_condvar;
};
CVS commit: src/sys/arch/mips
Module Name:src
Committed By: macallan
Date: Sat Nov 22 15:02:39 UTC 2014
Modified Files:
src/sys/arch/mips/include: cpuregs.h locore.h
src/sys/arch/mips/mips: mips_machdep.c
Log Message:
deal with Ingenic XBurst CPUs
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/mips/include/cpuregs.h
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.260 -r1.261 src/sys/arch/mips/mips/mips_machdep.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/mips/include/cpuregs.h
diff -u src/sys/arch/mips/include/cpuregs.h:1.88 src/sys/arch/mips/include/cpuregs.h:1.89
--- src/sys/arch/mips/include/cpuregs.h:1.88 Sat Oct 29 18:56:49 2011
+++ src/sys/arch/mips/include/cpuregs.h Sat Nov 22 15:02:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuregs.h,v 1.88 2011/10/29 18:56:49 jakllsch Exp $ */
+/* $NetBSD: cpuregs.h,v 1.89 2014/11/22 15:02:39 macallan Exp $ */
/*
* Copyright (c) 2009 Miodrag Vallat.
@@ -973,6 +973,11 @@
#define MIPS_eMIPS 0x04 /* MSR's eMIPS */
/*
+ * CPU processor revision IDs for company ID == e1 (Ingenic)
+ */
+#define MIPS_XBURST 0x02 /* Ingenic XBurst */
+
+/*
* FPU processor revision ID
*/
#define MIPS_SOFT 0x00 /* Software emulation ISA I */
Index: src/sys/arch/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.93 src/sys/arch/mips/include/locore.h:1.94
--- src/sys/arch/mips/include/locore.h:1.93 Sun Feb 19 21:06:16 2012
+++ src/sys/arch/mips/include/locore.h Sat Nov 22 15:02:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.93 2012/02/19 21:06:16 rmind Exp $ */
+/* $NetBSD: locore.h,v 1.94 2014/11/22 15:02:39 macallan Exp $ */
/*
* This file should not be included by MI code!!!
@@ -421,6 +421,7 @@ void mips_page_physload(vaddr_t, vaddr_t
/* 0x0a unannounced */
#define MIPS_PRID_CID_LEXRA 0x0b /* Lexra */
#define MIPS_PRID_CID_RMI 0x0c /* RMI / NetLogic */
+#define MIPS_PRID_CID_INGENIC 0xe1
#define MIPS_PRID_COPTS(x) (((x) 24) 0x00ff) /* Company Options */
#ifdef _KERNEL
Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.260 src/sys/arch/mips/mips/mips_machdep.c:1.261
--- src/sys/arch/mips/mips/mips_machdep.c:1.260 Mon Jun 2 04:57:02 2014
+++ src/sys/arch/mips/mips/mips_machdep.c Sat Nov 22 15:02:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.260 2014/06/02 04:57:02 mrg Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.261 2014/11/22 15:02:39 macallan Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -111,7 +111,7 @@
*/
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.260 2014/06/02 04:57:02 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.261 2014/11/22 15:02:39 macallan Exp $);
#define __INTR_PRIVATE
#include opt_cputype.h
@@ -175,7 +175,12 @@ __KERNEL_RCSID(0, $NetBSD: mips_machdep
#define _MTC0_V0_USERLOCAL _MKINSN(OP_COP0, OP_DMT, _R_V0, MIPS_COP_0_TLB_CONTEXT, 2)
#else
#define _LOAD_V0_L_PRIVATE_A0 _MKINSN(OP_LW, _R_A0, _R_V0, 0, offsetof(lwp_t, l_private))
-#define _MTC0_V0_USERLOCAL _MKINSN(OP_COP0, OP_MT, _R_V0, MIPS_COP_0_TLB_CONTEXT, 2)
+/*
+ * XXX
+ * the asm code in mipsX_subr.S uses ,4 - the definition above probably needs
+ * the same fix
+ */
+#define _MTC0_V0_USERLOCAL _MKINSN(OP_COP0, OP_MT, _R_V0, MIPS_COP_0_TLB_CONTEXT, 4)
#endif
#define JR_RA _MKINSN(OP_SPECIAL, _R_RA, 0, 0, OP_JR)
@@ -628,6 +633,10 @@ static const struct pridtab cputab[] = {
{ MIPS_PRID_CID_MICROSOFT, MIPS_eMIPS, 1, -1, CPU_ARCH_MIPS1, 64,
CPU_MIPS_NO_WAIT, 0, 0, eMIPS CPU },
+ /* Ingenic XBurst */
+ { MIPS_PRID_CID_INGENIC, MIPS_XBURST, -1, -1, -1, 0,
+ MIPS32_FLAGS | CPU_MIPS_DOUBLE_COUNT, 0, 0, XBurst },
+
{ 0, 0, 0,0, 0, 0,
0, 0, 0,NULL }
};
@@ -1417,7 +1426,9 @@ cpu_identify(device_t dev)
if (opts-mips_cpu-cpu_cid != 0) {
if (opts-mips_cpu-cpu_cid = ncidnames)
aprint_normal(%s , cidnames[opts-mips_cpu-cpu_cid]);
- else {
+ else if (opts-mips_cpu-cpu_cid == MIPS_PRID_CID_INGENIC) {
+ aprint_normal(Ingenic );
+ } else {
aprint_normal(Unknown Company ID - 0x%x, opts-mips_cpu-cpu_cid);
aprint_normal_dev(dev, );
}
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: ozaki-r
Date: Sat Nov 22 15:09:30 UTC 2014
Modified Files:
src/sys/dev/sysmon: sysmon_envsys_events.c
Log Message:
Replace callout_stop with callout_halt
In order to call callout_destroy for a callout safely, we have to ensure
the function of the callout is not running and pending. To do so, we should
use callout_halt, not callout_stop.
In this case, we need to pass an interlock to callout_halt to wait for
the callout complete. And also we make sure that SME_CALLOUT_INITIALIZED
is unset before calling callout_halt to prevent the callout from calling
callout_schedule. This is the same as what we did in sys/netinet6/mld6.c@1.61.
Reviewed by riastradh@.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/sysmon/sysmon_envsys_events.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/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.111 src/sys/dev/sysmon/sysmon_envsys_events.c:1.112
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.111 Sat Nov 22 15:00:05 2014
+++ src/sys/dev/sysmon/sysmon_envsys_events.c Sat Nov 22 15:09:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.111 2014/11/22 15:00:05 ozaki-r Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.112 2014/11/22 15:09:30 ozaki-r Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.111 2014/11/22 15:00:05 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.112 2014/11/22 15:09:30 ozaki-r Exp $);
#include sys/param.h
#include sys/types.h
@@ -611,10 +611,16 @@ sme_events_destroy(struct sysmon_envsys
{
KASSERT(mutex_owned(sme-sme_mtx));
- callout_stop(sme-sme_callout);
- workqueue_destroy(sme-sme_wq);
- callout_destroy(sme-sme_callout);
+ /*
+ * Unset before callout_halt to ensure callout is not scheduled again
+ * during callout_halt.
+ */
sme-sme_flags = ~SME_CALLOUT_INITIALIZED;
+
+ callout_halt(sme-sme_callout, sme-sme_mtx);
+ callout_destroy(sme-sme_callout);
+
+ workqueue_destroy(sme-sme_wq);
DPRINTF((%s: events framework destroyed for '%s'\n,
__func__, sme-sme_name));
}
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: macallan
Date: Sat Nov 22 15:14:35 UTC 2014
Modified Files:
src/sys/dev/ic: com.c comreg.h comvar.h
Log Message:
deal with quirk in Ingenic UARTs
( they have a bit in the FIFO control register which turns the entire
port off if not set )
To generate a diff of this commit:
cvs rdiff -u -r1.328 -r1.329 src/sys/dev/ic/com.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ic/comreg.h
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/ic/comvar.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/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.328 src/sys/dev/ic/com.c:1.329
--- src/sys/dev/ic/com.c:1.328 Sat Nov 15 19:18:18 2014
+++ src/sys/dev/ic/com.c Sat Nov 22 15:14:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.328 2014/11/15 19:18:18 christos Exp $ */
+/* $NetBSD: com.c,v 1.329 2014/11/22 15:14:35 macallan Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: com.c,v 1.328 2014/11/15 19:18:18 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: com.c,v 1.329 2014/11/22 15:14:35 macallan Exp $);
#include opt_com.h
#include opt_ddb.h
@@ -403,7 +403,6 @@ com_attach_subr(struct com_softc *sc)
dict = device_properties(sc-sc_dev);
prop_dictionary_get_bool(dict, is_console, is_console);
-
callout_init(sc-sc_diag_callout, 0);
mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_HIGH);
@@ -460,6 +459,12 @@ com_attach_subr(struct com_softc *sc)
fifo_msg = OMAP UART, working fifo;
SET(sc-sc_hwflags, COM_HW_FIFO);
goto fifodelay;
+
+ case COM_TYPE_INGENIC:
+ sc-sc_fifolen = 64;
+ fifo_msg = Ingenic UART, working fifo;
+ SET(sc-sc_hwflags, COM_HW_FIFO);
+ goto fifodelay;
}
sc-sc_fifolen = 1;
@@ -2302,8 +2307,16 @@ cominit(struct com_regs *regsp, int rate
}
CSR_WRITE_1(regsp, COM_REG_LCR, cflag2lcr(cflag));
CSR_WRITE_1(regsp, COM_REG_MCR, MCR_DTR | MCR_RTS);
- CSR_WRITE_1(regsp, COM_REG_FIFO,
- FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_1);
+
+ if (type == COM_TYPE_INGENIC) {
+ CSR_WRITE_1(regsp, COM_REG_FIFO,
+ FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST |
+ FIFO_TRIGGER_1 | FIFO_UART_ON);
+ } else {
+ CSR_WRITE_1(regsp, COM_REG_FIFO,
+ FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST |
+ FIFO_TRIGGER_1);
+ }
if (type == COM_TYPE_OMAP) {
/* setup the fifos. the FCR value is not used as long
Index: src/sys/dev/ic/comreg.h
diff -u src/sys/dev/ic/comreg.h:1.22 src/sys/dev/ic/comreg.h:1.23
--- src/sys/dev/ic/comreg.h:1.22 Thu Oct 3 13:23:03 2013
+++ src/sys/dev/ic/comreg.h Sat Nov 22 15:14:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: comreg.h,v 1.22 2013/10/03 13:23:03 kiyohara Exp $ */
+/* $NetBSD: comreg.h,v 1.23 2014/11/22 15:14:35 macallan Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -72,6 +72,7 @@
#define FIFO_RCV_RST 0x02 /* Reset RX FIFO */
#define FIFO_XMT_RST 0x04 /* Reset TX FIFO */
#define FIFO_DMA_MODE 0x08
+#define FIFO_UART_ON 0x10 /* JZ47xx only */
#define FIFO_64B_ENABLE 0x20 /* 64byte FIFO Enable (16750) */
#define FIFO_TRIGGER_1 0x00 /* Trigger RXRDY intr on 1 character */
#define FIFO_TRIGGER_4 0x40 /* ibid 4 */
Index: src/sys/dev/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.78 src/sys/dev/ic/comvar.h:1.79
--- src/sys/dev/ic/comvar.h:1.78 Thu Oct 3 13:23:03 2013
+++ src/sys/dev/ic/comvar.h Sat Nov 22 15:14:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: comvar.h,v 1.78 2013/10/03 13:23:03 kiyohara Exp $ */
+/* $NetBSD: comvar.h,v 1.79 2014/11/22 15:14:35 macallan Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -234,6 +234,7 @@ struct com_softc {
#define COM_TYPE_AU1x00 3 /* AMD/Alchemy Au1x000 proc. built-in */
#define COM_TYPE_OMAP 4 /* TI OMAP processor built-in */
#define COM_TYPE_16550_NOERS 5 /* like a 16550, no ERS */
+#define COM_TYPE_INGENIC 6 /* JZ4780 built-in */
/* power management hooks */
int (*enable)(struct com_softc *);
CVS commit: src/sys/arch
Module Name:src Committed By: macallan Date: Sat Nov 22 15:17:02 UTC 2014 Modified Files: src/sys/arch/evbmips/evbmips: interrupt.c Added Files: src/sys/arch/evbmips/conf: CI20 files.ingenic std.ingenic src/sys/arch/evbmips/ingenic: autoconf.c clock.c machdep.c mainbus.c src/sys/arch/mips/conf: files.ingenic src/sys/arch/mips/ingenic: ingenic_com.c ingenic_regs.h Log Message: initial support for CI20 / Ingenic JZ4780 not much there yet, it loads, attaches a serial port and you can drop into ddb To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/conf/CI20 \ src/sys/arch/evbmips/conf/files.ingenic \ src/sys/arch/evbmips/conf/std.ingenic cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbmips/evbmips/interrupt.c cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/ingenic/autoconf.c \ src/sys/arch/evbmips/ingenic/clock.c \ src/sys/arch/evbmips/ingenic/machdep.c \ src/sys/arch/evbmips/ingenic/mainbus.c cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/conf/files.ingenic cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/ingenic/ingenic_com.c \ src/sys/arch/mips/ingenic/ingenic_regs.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/evbmips/evbmips/interrupt.c diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.19 src/sys/arch/evbmips/evbmips/interrupt.c:1.20 --- src/sys/arch/evbmips/evbmips/interrupt.c:1.19 Tue May 14 09:16:59 2013 +++ src/sys/arch/evbmips/evbmips/interrupt.c Sat Nov 22 15:17:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: interrupt.c,v 1.19 2013/05/14 09:16:59 macallan Exp $ */ +/* $NetBSD: interrupt.c,v 1.20 2014/11/22 15:17:02 macallan Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.19 2013/05/14 09:16:59 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.20 2014/11/22 15:17:02 macallan Exp $); #include sys/param.h #include sys/cpu.h @@ -79,8 +79,10 @@ cpu_intr(int ppl, vaddr_t pc, uint32_t s KASSERTMSG(ipl == IPL_SCHED, %s: ipl (%d) != IPL_SCHED (%d), __func__, ipl, IPL_SCHED); +#ifdef MIPS3_ENABLE_CLOCK_INTR /* call the common MIPS3 clock interrupt handler */ mips3_clockintr(cf); +#endif pending ^= MIPS_INT_MASK_5; } Added files: Index: src/sys/arch/evbmips/conf/CI20 diff -u /dev/null src/sys/arch/evbmips/conf/CI20:1.1 --- /dev/null Sat Nov 22 15:17:02 2014 +++ src/sys/arch/evbmips/conf/CI20 Sat Nov 22 15:17:02 2014 @@ -0,0 +1,215 @@ +# $NetBSD: CI20,v 1.1 2014/11/22 15:17:02 macallan Exp $ +# +# MIPS Creator CI20 +# + +# for now +include arch/evbmips/conf/std.ingenic + +#options INCLUDE_CONFIG_FILE # embed config file in kernel binary + +#ident DB120-$Revision: 1.1 $ + +maxusers 32 + +#makeoptions COPTS=-Os # Optimise for space. Implies -O2 + +options MIPS32R2 +makeoptions CPUFLAGS+=-mips32r2 +makeoptions NEED_MDSETIMAGE=yes +makeoptions NEED_BINARY=yes +makeoptions NEED_UBOOTIMAGE=gz +options COM_16650,COM_TOLERANCE=50 # +/- 5% +options CONSPEED=115200 # u-boot default +options CONSADDR=0x1003 +options MEMSIZE=(256*1024*1024) + +# Options for necessary to use MD +#options MEMORY_DISK_HOOKS +#options MEMORY_DISK_IS_ROOT # force root on memory disk +#options MEMORY_DISK_SERVER=0 # no userspace memory disk support +#options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks +#options MEMORY_DISK_ROOT_SIZE=16384 # size of memory disk, in blocks +#options MEMORY_DISK_ROOT_SIZE=7300 + +# Size reduction options +#options VNODE_OP_NOINLINE +#options PIPE_SOCKETPAIR +options SOSEND_NO_LOAN + +# Standard system options +options KTRACE # system call tracing support +#options SYSVMSG # System V message queues +#options SYSVSEM # System V semaphores +#options SYSVSHM # System V shared memory +options NTP # network time protocol + +# Debugging options +options DIAGNOSTIC # extra kernel sanity checking +options DEBUG # extra kernel debugging support +#options KMEMSTATS # kernel memory statistics (vmstat -m) +#options USERCONF # userconf(4) support +#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel +options DDB # kernel dynamic debugger +options DDB_HISTORY_SIZE=100 # enable history editing in DDB +makeoptions DEBUG=-g # compile full symbol table +makeoptions COPY_SYMTAB=1 # size for embedded symbol table + +# Compatibility options +#options COMPAT_43 # compatibility with 4.3BSD binaries +#options COMPAT_09 # NetBSD 0.9, +#options COMPAT_10 # NetBSD 1.0, +#options COMPAT_11 # NetBSD 1.1, +#options COMPAT_12 # NetBSD 1.2, +#options COMPAT_13 # NetBSD 1.3, +#options COMPAT_14 # NetBSD 1.4, +#options COMPAT_15 # NetBSD 1.5, +#options COMPAT_16 # NetBSD 1.6, +#options COMPAT_20 # NetBSD 2.0, +#options COMPAT_30 # NetBSD 3.0, and +#options COMPAT_40 # NetBSD 4.0 binary compatibility. +#options
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: njoly Date: Sat Nov 22 15:47:42 UTC 2014 Modified Files: src/sys/compat/linux/common: linux_errno.h Log Message: Do not define LINUX_EDEADLK more than once. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/compat/linux/common/linux_errno.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/compat/linux/common/linux_errno.h diff -u src/sys/compat/linux/common/linux_errno.h:1.14 src/sys/compat/linux/common/linux_errno.h:1.15 --- src/sys/compat/linux/common/linux_errno.h:1.14 Tue Dec 17 22:14:24 2013 +++ src/sys/compat/linux/common/linux_errno.h Sat Nov 22 15:47:42 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_errno.h,v 1.14 2013/12/17 22:14:24 njoly Exp $ */ +/* $NetBSD: linux_errno.h,v 1.15 2014/11/22 15:47:42 njoly Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,6 @@ #define LINUX_EPIPE 32 #define LINUX_EDOM 33 #define LINUX_ERANGE 34 -#define LINUX_EDEADLK 35 /* Error numbers after here vary wildly*/
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jmcneill
Date: Sat Nov 22 18:31:03 UTC 2014
Modified Files:
src/sys/dev/ic: dwc_gmac.c dwc_gmac_reg.h dwc_gmac_var.h
Log Message:
- Add MII flow control support
- Set disable jabber and auto padding/CRC stripping bits in MAC conf
- Write intr mask to intr mask register, not status
- Setup both TX and RX burst modes
- Setup both TX and RX store forward modes
- Correct an issue with the end descriptor passed to dwc_gmac_txdesc_sync
in dwc_gmac_tx_intr
ok martin@
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/dwc_gmac.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/dwc_gmac_reg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/dwc_gmac_var.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/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.24 src/sys/dev/ic/dwc_gmac.c:1.25
--- src/sys/dev/ic/dwc_gmac.c:1.24 Mon Oct 27 09:40:00 2014
+++ src/sys/dev/ic/dwc_gmac.c Sat Nov 22 18:31:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.24 2014/10/27 09:40:00 skrll Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.25 2014/11/22 18:31:03 jmcneill Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.24 2014/10/27 09:40:00 skrll Exp $);
+__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.25 2014/11/22 18:31:03 jmcneill Exp $);
/* #define DWC_GMAC_DEBUG 1 */
@@ -225,7 +225,8 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
mii-mii_readreg = dwc_gmac_miibus_read_reg;
mii-mii_writereg = dwc_gmac_miibus_write_reg;
mii-mii_statchg = dwc_gmac_miibus_statchg;
-mii_attach(sc-sc_dev, mii, 0x, MII_PHY_ANY, MII_OFFSET_ANY, 0);
+mii_attach(sc-sc_dev, mii, 0x, MII_PHY_ANY, MII_OFFSET_ANY,
+ MIIF_DOPAUSE);
if (LIST_EMPTY(mii-mii_phys)) {
aprint_error_dev(sc-sc_dev, no PHY found!\n);
@@ -246,7 +247,7 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
* Enable interrupts
*/
s = splnet();
- bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_MAC_INTR,
+ bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_MAC_INTMASK,
AWIN_DEF_MAC_INTRMASK);
bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_DMA_INTENABLE,
GMAC_DEF_DMA_INT_MASK);
@@ -668,7 +669,7 @@ dwc_gmac_miibus_statchg(struct ifnet *if
{
struct dwc_gmac_softc * const sc = ifp-if_softc;
struct mii_data * const mii = sc-sc_mii;
- uint32_t conf;
+ uint32_t conf, flow;
/*
* Set MII or GMII interface based on the speed
@@ -679,6 +680,8 @@ dwc_gmac_miibus_statchg(struct ifnet *if
|AWIN_GMAC_MAC_CONF_FULLDPLX);
conf |= AWIN_GMAC_MAC_CONF_FRAMEBURST
| AWIN_GMAC_MAC_CONF_DISABLERXOWN
+ | AWIN_GMAC_MAC_CONF_DISABLEJABBER
+ | AWIN_GMAC_MAC_CONF_ACS
| AWIN_GMAC_MAC_CONF_RXENABLE
| AWIN_GMAC_MAC_CONF_TXENABLE;
switch (IFM_SUBTYPE(mii-mii_media_active)) {
@@ -692,8 +695,20 @@ dwc_gmac_miibus_statchg(struct ifnet *if
case IFM_1000_T:
break;
}
- if (IFM_OPTIONS(mii-mii_media_active) IFM_FDX)
+
+ flow = 0;
+ if (IFM_OPTIONS(mii-mii_media_active) IFM_FDX) {
conf |= AWIN_GMAC_MAC_CONF_FULLDPLX;
+ flow |= __SHIFTIN(0x200, AWIN_GMAC_MAC_FLOWCTRL_PAUSE);
+ }
+ if (mii-mii_media_active IFM_ETH_TXPAUSE) {
+ flow |= AWIN_GMAC_MAC_FLOWCTRL_TFE;
+ }
+ if (mii-mii_media_active IFM_ETH_RXPAUSE) {
+ flow |= AWIN_GMAC_MAC_FLOWCTRL_RFE;
+ }
+ bus_space_write_4(sc-sc_bst, sc-sc_bsh,
+ AWIN_GMAC_MAC_FLOWCTRL, flow);
#ifdef DWC_GMAC_DEBUG
aprint_normal_dev(sc-sc_dev,
@@ -720,9 +735,9 @@ dwc_gmac_init(struct ifnet *ifp)
* XXX - the GMAC_BUSMODE_PRIORXTX bits are undocumented.
*/
bus_space_write_4(sc-sc_bst, sc-sc_bsh, AWIN_GMAC_DMA_BUSMODE,
- GMAC_BUSMODE_FIXEDBURST |
- __SHIFTIN(GMAC_BUSMODE_PRIORXTX_41, GMAC_BUSMODE_PRIORXTX) |
- __SHIFTIN(8, GMCA_BUSMODE_PBL));
+ GMAC_BUSMODE_FIXEDBURST | GMAC_BUSMODE_4PBL |
+ __SHIFTIN(2, GMAC_BUSMODE_RPBL) |
+ __SHIFTIN(2, GMAC_BUSMODE_PBL));
/*
* Set up address filter
@@ -758,7 +773,7 @@ dwc_gmac_init(struct ifnet *ifp)
*/
bus_space_write_4(sc-sc_bst, sc-sc_bsh,
AWIN_GMAC_DMA_OPMODE, GMAC_DMA_OP_RXSTART | GMAC_DMA_OP_TXSTART |
- GMAC_DMA_OP_STOREFORWARD);
+ GMAC_DMA_OP_RXSTOREFORWARD | GMAC_DMA_OP_TXSTOREFORWARD);
ifp-if_flags |= IFF_RUNNING;
ifp-if_flags = ~IFF_OACTIVE;
@@ -967,7 +982,7 @@ dwc_gmac_tx_intr(struct dwc_gmac_softc *
#endif
desc = sc-sc_txq.t_desc[i];
- dwc_gmac_txdesc_sync(sc, i, i+1,
+ dwc_gmac_txdesc_sync(sc, i, TX_NEXT(i),
BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
flags = le32toh(desc-ddesc_status);
Index: src/sys/dev/ic/dwc_gmac_reg.h
diff -u src/sys/dev/ic/dwc_gmac_reg.h:1.12 src/sys/dev/ic/dwc_gmac_reg.h:1.13
--- src/sys/dev/ic/dwc_gmac_reg.h:1.12 Sat Oct 25 18:15:18 2014
+++ src/sys/dev/ic/dwc_gmac_reg.h Sat Nov 22 18:31:03 2014
@@ -1,4
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src
Committed By: joerg
Date: Sat Nov 22 18:50:49 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: cik.c ni.c si.c
Log Message:
Drop casts in favour of expressions that actually give the right
pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/radeon/cik.c \
src/sys/external/bsd/drm2/dist/drm/radeon/ni.c \
src/sys/external/bsd/drm2/dist/drm/radeon/si.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/drm2/dist/drm/radeon/cik.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/cik.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/cik.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/cik.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/cik.c Sat Nov 22 18:50:49 2014
@@ -1771,7 +1771,7 @@ int ci_mc_load_microcode(struct radeon_d
{
const __be32 *fw_data;
u32 running, blackout = 0;
- u32 *io_mc_regs;
+ const u32 *io_mc_regs;
int i, regs_size, ucode_size;
if (!rdev-mc_fw)
@@ -1781,11 +1781,11 @@ int ci_mc_load_microcode(struct radeon_d
switch (rdev-family) {
case CHIP_BONAIRE:
- io_mc_regs = (u32 *)bonaire_io_mc_regs;
+ io_mc_regs = bonaire_io_mc_regs[0][0];
regs_size = BONAIRE_IO_MC_REGS_SIZE;
break;
case CHIP_HAWAII:
- io_mc_regs = (u32 *)hawaii_io_mc_regs;
+ io_mc_regs = hawaii_io_mc_regs[0][0];
regs_size = HAWAII_IO_MC_REGS_SIZE;
break;
default:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/ni.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/ni.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/ni.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/ni.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/ni.c Sat Nov 22 18:50:49 2014
@@ -609,7 +609,7 @@ int ni_mc_load_microcode(struct radeon_d
{
const __be32 *fw_data;
u32 mem_type, running, blackout = 0;
- u32 *io_mc_regs;
+ const u32 *io_mc_regs;
int i, ucode_size, regs_size;
if (!rdev-mc_fw)
@@ -617,23 +617,23 @@ int ni_mc_load_microcode(struct radeon_d
switch (rdev-family) {
case CHIP_BARTS:
- io_mc_regs = (u32 *)barts_io_mc_regs;
+ io_mc_regs = barts_io_mc_regs[0][0];
ucode_size = BTC_MC_UCODE_SIZE;
regs_size = BTC_IO_MC_REGS_SIZE;
break;
case CHIP_TURKS:
- io_mc_regs = (u32 *)turks_io_mc_regs;
+ io_mc_regs = turks_io_mc_regs[0][0];
ucode_size = BTC_MC_UCODE_SIZE;
regs_size = BTC_IO_MC_REGS_SIZE;
break;
case CHIP_CAICOS:
default:
- io_mc_regs = (u32 *)caicos_io_mc_regs;
+ io_mc_regs = caicos_io_mc_regs[0][0];
ucode_size = BTC_MC_UCODE_SIZE;
regs_size = BTC_IO_MC_REGS_SIZE;
break;
case CHIP_CAYMAN:
- io_mc_regs = (u32 *)cayman_io_mc_regs;
+ io_mc_regs = cayman_io_mc_regs[0][0];
ucode_size = CAYMAN_MC_UCODE_SIZE;
regs_size = BTC_IO_MC_REGS_SIZE;
break;
Index: src/sys/external/bsd/drm2/dist/drm/radeon/si.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/si.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/si.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/si.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/si.c Sat Nov 22 18:50:49 2014
@@ -1471,7 +1471,7 @@ int si_mc_load_microcode(struct radeon_d
{
const __be32 *fw_data;
u32 running, blackout = 0;
- u32 *io_mc_regs;
+ const u32 *io_mc_regs;
int i, regs_size, ucode_size;
if (!rdev-mc_fw)
@@ -1481,24 +1481,24 @@ int si_mc_load_microcode(struct radeon_d
switch (rdev-family) {
case CHIP_TAHITI:
- io_mc_regs = (u32 *)tahiti_io_mc_regs;
+ io_mc_regs = tahiti_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
case CHIP_PITCAIRN:
- io_mc_regs = (u32 *)pitcairn_io_mc_regs;
+ io_mc_regs = pitcairn_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
case CHIP_VERDE:
default:
- io_mc_regs = (u32 *)verde_io_mc_regs;
+ io_mc_regs = verde_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
case CHIP_OLAND:
- io_mc_regs = (u32 *)oland_io_mc_regs;
+ io_mc_regs = oland_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
case CHIP_HAINAN:
- io_mc_regs = (u32 *)hainan_io_mc_regs;
+ io_mc_regs = hainan_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
}
CVS commit: src/sys
Module Name:src
Committed By: riastradh
Date: Sat Nov 22 19:18:08 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_agpsupport.c drm_pci.c
drm_stub.c
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_agpsupport.h
src/sys/external/bsd/drm2/drm: drm_drv.c
src/sys/external/bsd/drm2/pci: drm_pci.c drm_pci_module.c
src/sys/modules/drmkms: Makefile
src/sys/modules/drmkms_pci: Makefile
Log Message:
Move all PCI/AGP code back to drmkms_pci module where it belongs.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/drm_pci.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/drm_stub.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/pci/drm_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/pci/drm_pci_module.c
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/drmkms/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/drmkms_pci/Makefile
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/drm2/dist/drm/drm_agpsupport.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c:1.5 src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c:1.5 Tue Nov 11 02:33:28 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c Sat Nov 22 19:18:07 2014
@@ -518,16 +518,6 @@ void drm_agp_clear(struct drm_device *de
dev-agp-enabled = 0;
}
-void drm_agp_destroy(struct drm_device *dev)
-{
- if (dev-agp) {
- arch_phys_wc_del(dev-agp-agp_mtrr);
- drm_agp_clear(dev);
- kfree(dev-agp);
- dev-agp = NULL;
- }
-}
-
#ifndef __NetBSD__ /* XXX Dead code that doesn't make sense... */
/**
* Binds a collection of pages into AGP memory at the given offset, returning
Index: src/sys/external/bsd/drm2/dist/drm/drm_pci.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_pci.c:1.4 src/sys/external/bsd/drm2/dist/drm/drm_pci.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/drm_pci.c:1.4 Tue Nov 11 02:33:28 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_pci.c Sat Nov 22 19:18:07 2014
@@ -277,7 +277,12 @@ static void drm_pci_agp_init(struct drm_
void drm_pci_agp_destroy(struct drm_device *dev)
{
- drm_agp_destroy(dev);
+ if (dev-agp) {
+ arch_phys_wc_del(dev-agp-agp_mtrr);
+ drm_agp_clear(dev);
+ kfree(dev-agp);
+ dev-agp = NULL;
+ }
}
static struct drm_bus drm_pci_bus = {
Index: src/sys/external/bsd/drm2/dist/drm/drm_stub.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_stub.c:1.6 src/sys/external/bsd/drm2/dist/drm/drm_stub.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/drm_stub.c:1.6 Tue Nov 11 02:33:28 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_stub.c Sat Nov 22 19:18:07 2014
@@ -848,8 +848,10 @@ void drm_dev_unregister(struct drm_devic
if (dev-driver-unload)
dev-driver-unload(dev);
+#ifndef __NetBSD__ /* Moved to drm_pci. */
if (dev-agp)
- drm_agp_destroy(dev);
+ drm_pci_agp_destroy(dev);
+#endif
drm_vblank_cleanup(dev);
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.7 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.8
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.7 Sat Jul 26 21:15:45 2014
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sat Nov 22 19:18:07 2014
@@ -1607,9 +1607,11 @@ struct drm_agp_hooks {
drm_ioctl_t *agph_bind_ioctl;
drm_ioctl_t *agph_unbind_ioctl;
int (*agph_release)(struct drm_device *);
+ void (*agph_clear)(struct drm_device *);
};
extern int drm_agp_release_hook(struct drm_device *);
+extern void drm_agp_clear_hook(struct drm_device *);
extern int drm_agp_register(const struct drm_agp_hooks *);
extern void drm_agp_deregister(const struct drm_agp_hooks *);
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.4
--- src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h:1.3 Tue Nov 11 02:49:16 2014
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h Sat Nov 22 19:18:07 2014
@@ -27,7 +27,6 @@ struct agp_memory *drm_agp_bind_pages(st
struct drm_agp_head *drm_agp_init(struct drm_device *dev);
void drm_agp_clear(struct drm_device *dev);
-void drm_agp_destroy(struct drm_device *dev);
int drm_agp_acquire(struct drm_device *dev);
int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sat Nov 22 19:41:27 UTC 2014
Modified Files:
src/tools/gcc: Makefile
Log Message:
use --disable-shared on m68000 for mknative.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.72 src/tools/gcc/Makefile:1.73
--- src/tools/gcc/Makefile:1.72 Fri Oct 10 20:23:22 2014
+++ src/tools/gcc/Makefile Sat Nov 22 19:41:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2014/10/10 20:23:22 mrg Exp $
+# $NetBSD: Makefile,v 1.73 2014/11/22 19:41:27 mrg Exp $
.include bsd.own.mk
@@ -181,6 +181,10 @@ NATIVE_CONFIGURE_ARGS+= --enable-tls
NATIVE_CONFIGURE_ARGS+= --enable-initfini-array
.endif
+.if ${MACHINE_ARCH} == m68000
+NATIVE_CONFIGURE_ARGS+= --disable-shared
+.endif
+
NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
--disable-symvers \
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Sat Nov 22 19:42:11 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/crtstuff/arch: m68000.mk
src/external/gpl3/gcc/lib/libbacktrace/arch/m68000:
backtrace-supported.h config.h
src/external/gpl3/gcc/lib/libgcc/arch/m68000: defs.mk
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/m68000: gcov-iov.h
src/external/gpl3/gcc/lib/libgomp/arch/m68000: config.h libgomp.spec
src/external/gpl3/gcc/lib/libiberty/arch/m68000: config.h
src/external/gpl3/gcc/lib/libobjc/arch/m68000: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: c++config.h
gstdint.h
src/external/gpl3/gcc/usr.bin/gcc/arch/m68000: auto-host.h bversion.h
configargs.h defs.mk plugin-version.h tm.h
Log Message:
regenerate mknative files for m68000 now that the build actually completes.
this includes a hack matt@ found -- remove -fPIC from libgcc's defs.mk, i
have not yet figured out how to stop confgiure adding it.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libbacktrace/arch/m68000/backtrace-supported.h \
src/external/gpl3/gcc/lib/libbacktrace/arch/m68000/config.h
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/arch/m68000/defs.mk
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/m68000/gcov-iov.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgomp/arch/m68000/config.h \
src/external/gpl3/gcc/lib/libgomp/arch/m68000/libgomp.spec
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libiberty/arch/m68000/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libobjc/arch/m68000/config.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/c++config.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/gstdint.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/auto-host.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/bversion.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/plugin-version.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/configargs.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/defs.mk
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/tm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk:1.5 src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk:1.6
--- src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk:1.5 Sat Mar 1 10:00:31 2014
+++ src/external/gpl3/gcc/lib/crtstuff/arch/m68000.mk Sat Nov 22 19:42:11 2014
@@ -1,11 +1,11 @@
# This file is automatically generated. DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp
-# Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp
+# Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp
+# Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp
#
-G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include 68000-I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I${GNUHOSTDIST}/gcc/../libbacktrace
+G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I${GNUHOSTDIST}/gcc/../libbacktrace
G_CRTSTUFF_CFLAGS=
G_CRTSTUFF_T_CFLAGS=
G_CRTSTUFF_T_CFLAGS_S=
-G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 NETBSD_ENABLE_PTHREADS MOTOROLA=1 USE_GAS=1
+G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 NETBSD_ENABLE_PTHREADS MOTOROLA=1 USE_GAS=1 CHAR_FAST8=1 SHORT_FAST16=1
G_xm_file=
G_xm_defines=
Index: src/external/gpl3/gcc/lib/libbacktrace/arch/m68000/backtrace-supported.h
diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/m68000/backtrace-supported.h:1.1 src/external/gpl3/gcc/lib/libbacktrace/arch/m68000/backtrace-supported.h:1.2
--- src/external/gpl3/gcc/lib/libbacktrace/arch/m68000/backtrace-supported.h:1.1 Sat Mar 1 10:00:32 2014
+++ src/external/gpl3/gcc/lib/libbacktrace/arch/m68000/backtrace-supported.h Sat Nov 22 19:42:11 2014
@@ -1,6 +1,6 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp */
-/* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp */
+/* Generated from: NetBSD:
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Sat Nov 22 19:48:36 UTC 2014 Modified Files: src/sys/arch/evbmips/conf: CI20 Log Message: Fix copy and pasto in #ident To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/CI20 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/evbmips/conf/CI20 diff -u src/sys/arch/evbmips/conf/CI20:1.1 src/sys/arch/evbmips/conf/CI20:1.2 --- src/sys/arch/evbmips/conf/CI20:1.1 Sat Nov 22 15:17:02 2014 +++ src/sys/arch/evbmips/conf/CI20 Sat Nov 22 19:48:36 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CI20,v 1.1 2014/11/22 15:17:02 macallan Exp $ +# $NetBSD: CI20,v 1.2 2014/11/22 19:48:36 martin Exp $ # # MIPS Creator CI20 # @@ -8,7 +8,7 @@ include arch/evbmips/conf/std.ingenic #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident DB120-$Revision: 1.1 $ +#ident CI20-$Revision: 1.2 $ maxusers 32
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: joerg
Date: Sat Nov 22 19:50:00 UTC 2014
Modified Files:
src/sys/dev/ic: i82557var.h
Log Message:
Replace void * cast with proper __UNVOLATILE.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/i82557var.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/dev/ic/i82557var.h
diff -u src/sys/dev/ic/i82557var.h:1.50 src/sys/dev/ic/i82557var.h:1.51
--- src/sys/dev/ic/i82557var.h:1.50 Thu Feb 2 19:43:03 2012
+++ src/sys/dev/ic/i82557var.h Sat Nov 22 19:50:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557var.h,v 1.50 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: i82557var.h,v 1.51 2014/11/22 19:50:00 joerg Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001 The NetBSD Foundation, Inc.
@@ -323,8 +323,8 @@ do { \
/* NOTE: the RFA is misaligned, so we must copy. */ \
/* BIG_ENDIAN: no need to swap to store 0x */ \
__v = 0x; \
- memcpy((void *)__rfa-link_addr, __v, sizeof(__v)); \
- memcpy((void *)__rfa-rbd_addr, __v, sizeof(__v)); \
+ memcpy(__UNVOLATILE(__rfa-link_addr), __v, sizeof(__v)); \
+ memcpy(__UNVOLATILE(__rfa-rbd_addr), __v, sizeof(__v)); \
\
FXP_RFASYNC((sc), (m), \
BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); \
@@ -337,7 +337,7 @@ do { \
RFA_ALIGNMENT_FUDGE);\
FXP_RFASYNC((sc), __p_m,\
BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); \
- memcpy((void *)__p_rfa-link_addr, __v, \
+ memcpy(__UNVOLATILE(__p_rfa-link_addr), __v, \
sizeof(__v)); \
__p_rfa-rfa_control = htole16(~(FXP_RFA_CONTROL_EL| \
FXP_RFA_CONTROL_S));\
CVS commit: src/sys/arch/arm/omap
Module Name:src
Committed By: joerg
Date: Sat Nov 22 19:50:28 UTC 2014
Modified Files:
src/sys/arch/arm/omap: am335x_cm_padconf.c sitara_cm.h
Log Message:
Preserve const.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/am335x_cm_padconf.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/sitara_cm.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/omap/am335x_cm_padconf.c
diff -u src/sys/arch/arm/omap/am335x_cm_padconf.c:1.2 src/sys/arch/arm/omap/am335x_cm_padconf.c:1.3
--- src/sys/arch/arm/omap/am335x_cm_padconf.c:1.2 Mon May 6 18:53:40 2013
+++ src/sys/arch/arm/omap/am335x_cm_padconf.c Sat Nov 22 19:50:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: am335x_cm_padconf.c,v 1.2 2013/05/06 18:53:40 rkujawa Exp $ */
+/* $NetBSD: am335x_cm_padconf.c,v 1.3 2014/11/22 19:50:28 joerg Exp $ */
/*-
* Copyright (c) 2012 Damjan Marion dmar...@freebsd.org
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: am335x_cm_padconf.c,v 1.2 2013/05/06 18:53:40 rkujawa Exp $);
+__KERNEL_RCSID(0, $NetBSD: am335x_cm_padconf.c,v 1.3 2014/11/22 19:50:28 joerg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -295,8 +295,8 @@ const struct sitara_cm_padconf ti_padcon
const struct sitara_cm_device sitara_cm_dev = {
.padconf_muxmode_mask = 0x7,
.padconf_sate_mask = 0x78,
- .padstate = (struct sitara_cm_padstate *) ti_padstate_devmap,
- .padconf = (struct sitara_cm_padconf *) ti_padconf_devmap,
+ .padstate = ti_padstate_devmap,
+ .padconf = ti_padconf_devmap,
};
int
Index: src/sys/arch/arm/omap/sitara_cm.h
diff -u src/sys/arch/arm/omap/sitara_cm.h:1.1 src/sys/arch/arm/omap/sitara_cm.h:1.2
--- src/sys/arch/arm/omap/sitara_cm.h:1.1 Wed Apr 17 14:31:02 2013
+++ src/sys/arch/arm/omap/sitara_cm.h Sat Nov 22 19:50:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sitara_cm.h,v 1.1 2013/04/17 14:31:02 bouyer Exp $ */
+/* $NetBSD: sitara_cm.h,v 1.2 2014/11/22 19:50:28 joerg Exp $ */
/*
* Copyright (c) 2010
* Ben Gray ben.r.g...@gmail.com.
@@ -59,8 +59,8 @@ struct sitara_cm_padstate {
struct sitara_cm_device {
uint16_t padconf_muxmode_mask;
uint16_t padconf_sate_mask;
- struct sitara_cm_padstate *padstate;
- struct sitara_cm_padconf *padconf;
+ const struct sitara_cm_padstate *padstate;
+ const struct sitara_cm_padconf *padconf;
};
int sitara_cm_padconf_set(const char *padname, const char *muxmode,
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: joerg
Date: Sun Nov 23 01:38:49 UTC 2014
Modified Files:
src/sys/dev/ic: ahcisata_core.c
Log Message:
Provide the timeout argument to ahci_exec_fis in ms. Use 1ms delays
when we are not allowed to sleep, full ticks otherwise.
Bump the timeout for reset to 100ms, 10ms is not enough on the
Cubietruck.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/ahcisata_core.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/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.51 src/sys/dev/ic/ahcisata_core.c:1.52
--- src/sys/dev/ic/ahcisata_core.c:1.51 Mon Feb 24 12:19:05 2014
+++ src/sys/dev/ic/ahcisata_core.c Sun Nov 23 01:38:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.51 2014/02/24 12:19:05 jmcneill Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.52 2014/11/23 01:38:49 joerg Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahcisata_core.c,v 1.51 2014/02/24 12:19:05 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahcisata_core.c,v 1.52 2014/11/23 01:38:49 joerg Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -636,7 +636,14 @@ ahci_exec_fis(struct ata_channel *chp, i
int i;
uint32_t is;
- timeout = timeout * 10; /* wait is 10ms */
+ /*
+ * Base timeout is specified in ms.
+ * If we are allowed to sleep, wait a tick each round.
+ * Otherwise delay for 1ms on each round.
+ */
+ if (flags AT_WAIT)
+ timeout = MAX(1, mstohz(timeout));
+
AHCI_CMDH_SYNC(sc, achp, 0, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
/* start command */
AHCI_WRITE(sc, AHCI_P_CI(chp-ch_channel), 1 0);
@@ -660,10 +667,11 @@ ahci_exec_fis(struct ata_channel *chp, i
return ERR_DF;
}
if (flags AT_WAIT)
- tsleep(sc, PRIBIO, ahcifis, mstohz(10));
+ tsleep(sc, PRIBIO, ahcifis, 1);
else
- delay(1);
+ delay(1000);
}
+
aprint_debug(%s channel %d: timeout sending FIS\n,
AHCINAME(sc), chp-ch_channel);
return TIMEOUT;
@@ -709,7 +717,7 @@ again:
cmd_tbl-cmdt_cfis[fis_type] = RHD_FISTYPE;
cmd_tbl-cmdt_cfis[rhd_c] = drive;
cmd_tbl-cmdt_cfis[rhd_control] = WDCTL_RST;
- switch(ahci_exec_fis(chp, 1, flags)) {
+ switch(ahci_exec_fis(chp, 100, flags)) {
case ERR_DF:
case TIMEOUT:
aprint_error(%s channel %d: setting WDCTL_RST failed
@@ -727,7 +735,7 @@ again:
cmd_tbl-cmdt_cfis[fis_type] = RHD_FISTYPE;
cmd_tbl-cmdt_cfis[rhd_c] = drive;
cmd_tbl-cmdt_cfis[rhd_control] = 0;
- switch(ahci_exec_fis(chp, 31, flags)) {
+ switch(ahci_exec_fis(chp, 310, flags)) {
case ERR_DF:
case TIMEOUT:
if ((sc-sc_ahci_quirks AHCI_QUIRK_BADPMPRESET) != 0
CVS commit: src/external/bsd/ntp/dist/sntp/libopts
Module Name:src
Committed By: joerg
Date: Sun Nov 23 01:47:59 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/sntp/libopts: init.c
src/external/bsd/ntp/dist/sntp/libopts/autoopts: options.h
Log Message:
Replace very question pointer games to override const, mark the member
writeable when inside the guts of the library.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/sntp/libopts/init.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/sntp/libopts/init.c
diff -u src/external/bsd/ntp/dist/sntp/libopts/init.c:1.2 src/external/bsd/ntp/dist/sntp/libopts/init.c:1.3
--- src/external/bsd/ntp/dist/sntp/libopts/init.c:1.2 Sat Dec 28 03:20:15 2013
+++ src/external/bsd/ntp/dist/sntp/libopts/init.c Sun Nov 23 01:47:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.2 2013/12/28 03:20:15 christos Exp $ */
+/* $NetBSD: init.c,v 1.3 2014/11/23 01:47:59 joerg Exp $ */
/**
* \file initialize.c
@@ -103,20 +103,17 @@ validate_struct(tOptions * opts, char co
*/
if (opts-pzProgName == NULL) {
char const * pz = strrchr(pname, DIRCH);
-char const ** pp =
-(char const **)(void **)(intptr_t)(opts-pzProgName);
if (pz != NULL)
-*pp = pz+1;
+opts-pzProgName = pz+1;
else
-*pp = pname;
+opts-pzProgName = pname;
pz = pathfind(getenv(PATH), (char *)(intptr_t)pname, rx);
if (pz != NULL)
pname = (void *)(intptr_t)pz;
-pp = (char const **)(void **)(intptr_t)(opts-pzProgPath);
-*pp = pname;
+opts-pzProgPath = pname;
/*
* when comparing long names, these are equivalent
Index: src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h
diff -u src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h:1.6 src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h:1.7
--- src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h:1.6 Sat Dec 28 03:20:15 2013
+++ src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h Sun Nov 23 01:47:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: options.h,v 1.6 2013/12/28 03:20:15 christos Exp $ */
+/* $NetBSD: options.h,v 1.7 2014/11/23 01:47:59 joerg Exp $ */
/* -*- buffer-read-only: t -*- vi: set ro:
*
@@ -602,9 +602,17 @@ struct options {
char * pzCurOpt; /// current option text
/// Public, the full path of the program
+#if AUTOOPTS_INTERNAL
+char const *pzProgPath;
+#else
char const * const pzProgPath;
+#endif
/// Public, the name of the executable, without any path
+#if AUTOOPTS_INTERNAL
+char const *pzProgName;
+#else
char const * const pzProgName;
+#endif
/// Public, the upper-cased, shell variable syntax-ed program name
char const * const pzPROGNAME;
/// the name of the rc file (configuration file)
CVS commit: src/tests/usr.bin/netpgpverify
Module Name:src Committed By: agc Date: Sun Nov 23 01:56:35 UTC 2014 Modified Files: src/tests/usr.bin/netpgpverify: t_netpgpverify.sh Log Message: Since the netpgpverify rewrite to have no external pre-requisites, the output format for signatures has changed cosmetically (mainly whitespace changes). Re-format all the test cases so that the tests now pass again with the new output format: Tests root: /usr/tests/usr.bin/netpgpverify t_netpgpverify (1/1): 2 test cases netpgpverify_dsa: [0.261980s] Passed. netpgpverify_rsa: [0.237469s] Passed. [0.509571s] Summary for 1 test programs: 2 passed test cases. 0 failed test cases. 0 expected failed test cases. 0 skipped test cases. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/netpgpverify/t_netpgpverify.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/netpgpverify/t_netpgpverify.sh diff -u src/tests/usr.bin/netpgpverify/t_netpgpverify.sh:1.1 src/tests/usr.bin/netpgpverify/t_netpgpverify.sh:1.2 --- src/tests/usr.bin/netpgpverify/t_netpgpverify.sh:1.1 Tue Nov 20 07:55:54 2012 +++ src/tests/usr.bin/netpgpverify/t_netpgpverify.sh Sun Nov 23 01:56:35 2014 @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: t_netpgpverify.sh,v 1.1 2012/11/20 07:55:54 agc Exp $ +# $NetBSD: t_netpgpverify.sh,v 1.2 2014/11/23 01:56:35 agc Exp $ # Copyright (c) 2012 Alistair Crooks a...@netbsd.org # All rights reserved. @@ -8420,14 +8420,12 @@ AP1CJKn36vgtcny/R9KueIw/50Hok2rrFrDqzC8m EOF cat expected16 EOF Good signature for b.gpg made Mon Sep 10 00:15:38 2012 -signature 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 -fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 -uid Alistair Crooks a...@alistaircrooks.com -uid Alistair Crooks a...@pkgsrc.org -uid Alistair Crooks a...@netbsd.org -uid Alistair Crooks a...@netflix.com -encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12 -fingerprint: 57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 +signature 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 +fingerprint d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 +uid Alistair Crooks a...@alistaircrooks.com +uid Alistair Crooks a...@pkgsrc.org +uid Alistair Crooks a...@netbsd.org +uid Alistair Crooks a...@netflix.com EOF cat expected17 EOF @@ -8497,14 +8495,12 @@ fingerprint: 57c0 c1e6 bf71 8845 416b 9 EOF cat expected22 EOF Good signature for [stdin] made Sun Sep 30 10:50:20 2012 -signature 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 -fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 -uid Alistair Crooks a...@alistaircrooks.com -uid Alistair Crooks a...@pkgsrc.org -uid Alistair Crooks a...@netbsd.org -uid Alistair Crooks a...@netflix.com -encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12 -fingerprint: 57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 +signature 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 +fingerprint d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 +uid Alistair Crooks a...@alistaircrooks.com +uid Alistair Crooks a...@pkgsrc.org +uid Alistair Crooks a...@netbsd.org +uid Alistair Crooks a...@netflix.com EOF cat expected23 EOF @@ -8518,14 +8514,12 @@ fingerprint: 1915 0801 fbd8 f45d 89f2 0 EOF cat expected24 EOF Good signature for [stdin] made Mon Sep 10 00:15:38 2012 -signature 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 -fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 -uid Alistair Crooks a...@alistaircrooks.com -uid Alistair Crooks a...@pkgsrc.org -uid Alistair Crooks a...@netbsd.org -uid Alistair Crooks a...@netflix.com -encryption 2048/RSA (Encrypt or Sign) 79deb61e488eee74 2004-01-12 -fingerprint: 57c0 c1e6 bf71 8845 416b 9522 79de b61e 488e ee74 +signature 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 +fingerprint d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 +uid Alistair Crooks a...@alistaircrooks.com +uid Alistair Crooks a...@pkgsrc.org +uid Alistair Crooks a...@netbsd.org +uid Alistair Crooks a...@netflix.com EOF cat expected25 EOF @@ -8548,20 +8542,16 @@ fingerprint: 1915 0801 fbd8 f45d 89f2 0 EOF cat expected27 EOF Good signature for [stdin] made Mon Oct 15 09:28:54 2012 -signature 4096/RSA (Encrypt or Sign) 064973ac4c4a706e 2009-06-23 -fingerprint: ddee 2bdb 9c98 a0d1 d4fb dbf7 0649 73ac 4c4a 706e -uid NetBSD Security Officer security-offi...@netbsd.org -encryption 4096/RSA (Encrypt or Sign) 9ff2c24fdf2ce620
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: christos
Date: Sun Nov 23 02:15:52 UTC 2014
Modified Files:
src/sys/arch/sparc/sparc: openfirm.c
Log Message:
avoid shadowed variable
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/sparc/openfirm.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/sparc/sparc/openfirm.c
diff -u src/sys/arch/sparc/sparc/openfirm.c:1.18 src/sys/arch/sparc/sparc/openfirm.c:1.19
--- src/sys/arch/sparc/sparc/openfirm.c:1.18 Mon Jul 18 17:00:28 2011
+++ src/sys/arch/sparc/sparc/openfirm.c Sat Nov 22 21:15:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirm.c,v 1.18 2011/07/18 21:00:28 martin Exp $ */
+/* $NetBSD: openfirm.c,v 1.19 2014/11/23 02:15:52 christos Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: openfirm.c,v 1.18 2011/07/18 21:00:28 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: openfirm.c,v 1.19 2014/11/23 02:15:52 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -554,7 +554,7 @@ OF_seek(int handle, u_quad_t pos)
}
void
-OF_boot(const char *bootspec)
+OF_boot(const char *bspec)
{
struct {
cell_t name;
@@ -564,12 +564,12 @@ OF_boot(const char *bootspec)
} args;
int l;
- if ((l = strlen(bootspec)) = NBPG)
+ if ((l = strlen(bspec)) = NBPG)
panic(OF_boot);
args.name = ADR2CELL(boot);
args.nargs = 1;
args.nreturns = 0;
- args.bootspec = ADR2CELL(bootspec);
+ args.bootspec = ADR2CELL(bspec);
openfirmware(args);
panic(OF_boot failed);
}
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Sun Nov 23 04:52:53 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: addition to ticket 1934 To generate a diff of this commit: cvs rdiff -u -r1.1.2.81 -r1.1.2.82 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.81 src/doc/CHANGES-5.3:1.1.2.82 --- src/doc/CHANGES-5.3:1.1.2.81 Fri Nov 21 08:58:32 2014 +++ src/doc/CHANGES-5.3 Sun Nov 23 04:52:53 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.81 2014/11/21 08:58:32 sborrill Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.82 2014/11/23 04:52:53 snj Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -1164,6 +1164,7 @@ sys/dev/raidframe/rf_reconstruct.c 1.12 Fixes PR kern/49244. [oster, ticket #1933] +distrib/sets/lists/base/mi 1.1090 doc/3RDPARTY patch share/zoneinfo/NEWSnew share/zoneinfo/africapatch
CVS commit: [netbsd-5] src/distrib/sets/lists/base
Module Name:src Committed By: snj Date: Sun Nov 23 04:52:14 UTC 2014 Modified Files: src/distrib/sets/lists/base [netbsd-5]: mi Log Message: Pull up following revision(s) (requested by apb in ticket #1934): distrib/sets/lists/base/mi: revision 1.1090 Add ./usr/share/zoneinfo/Pacific/Bougainville for tzdata2014i To generate a diff of this commit: cvs rdiff -u -r1.780.2.30 -r1.780.2.31 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.780.2.30 src/distrib/sets/lists/base/mi:1.780.2.31 --- src/distrib/sets/lists/base/mi:1.780.2.30 Fri Aug 15 22:54:35 2014 +++ src/distrib/sets/lists/base/mi Sun Nov 23 04:52:14 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.30 2014/08/15 22:54:35 riz Exp $ +# $NetBSD: mi,v 1.780.2.31 2014/11/23 04:52:14 snj Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4881,6 +4881,7 @@ ./usr/share/zoneinfo/Pacific base-sys-share ./usr/share/zoneinfo/Pacific/Apia base-sys-share share ./usr/share/zoneinfo/Pacific/Auckland base-sys-share share +./usr/share/zoneinfo/Pacific/Bougainville base-sys-share share ./usr/share/zoneinfo/Pacific/Chatham base-sys-share share ./usr/share/zoneinfo/Pacific/Chuuk base-sys-share share ./usr/share/zoneinfo/Pacific/Easter base-sys-share share
CVS commit: [netbsd-5-1] src/distrib/sets/lists/base
Module Name:src Committed By: snj Date: Sun Nov 23 04:55:39 UTC 2014 Modified Files: src/distrib/sets/lists/base [netbsd-5-1]: mi Log Message: Pull up following revision(s) (requested by apb in ticket #1934): distrib/sets/lists/base/mi: revision 1.1090 Add ./usr/share/zoneinfo/Pacific/Bougainville for tzdata2014i To generate a diff of this commit: cvs rdiff -u -r1.780.2.16.2.7 -r1.780.2.16.2.8 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.780.2.16.2.7 src/distrib/sets/lists/base/mi:1.780.2.16.2.8 --- src/distrib/sets/lists/base/mi:1.780.2.16.2.7 Fri Aug 15 23:02:40 2014 +++ src/distrib/sets/lists/base/mi Sun Nov 23 04:55:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.16.2.7 2014/08/15 23:02:40 riz Exp $ +# $NetBSD: mi,v 1.780.2.16.2.8 2014/11/23 04:55:39 snj Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4872,6 +4872,7 @@ ./usr/share/zoneinfo/Pacific base-sys-share ./usr/share/zoneinfo/Pacific/Apia base-sys-share share ./usr/share/zoneinfo/Pacific/Auckland base-sys-share share +./usr/share/zoneinfo/Pacific/Bougainville base-sys-share share ./usr/share/zoneinfo/Pacific/Chatham base-sys-share share ./usr/share/zoneinfo/Pacific/Chuuk base-sys-share share ./usr/share/zoneinfo/Pacific/Easter base-sys-share share
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: snj Date: Sun Nov 23 04:56:23 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: addition to ticket 1934 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-5.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.6 diff -u src/doc/CHANGES-5.1.6:1.1.2.3 src/doc/CHANGES-5.1.6:1.1.2.4 --- src/doc/CHANGES-5.1.6:1.1.2.3 Fri Nov 21 09:17:25 2014 +++ src/doc/CHANGES-5.1.6 Sun Nov 23 04:56:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.3 2014/11/21 09:17:25 sborrill Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.4 2014/11/23 04:56:23 snj Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -20,6 +20,7 @@ sys/dev/raidframe/rf_reconstruct.c 1.12 Fixes PR kern/49244. [oster, ticket #1933] +distrib/sets/lists/base/mi 1.1090 doc/3RDPARTY patch share/zoneinfo/NEWSnew share/zoneinfo/africapatch
CVS commit: [netbsd-5-2] src/distrib/sets/lists/base
Module Name:src Committed By: snj Date: Sun Nov 23 04:59:33 UTC 2014 Modified Files: src/distrib/sets/lists/base [netbsd-5-2]: mi Log Message: Pull up following revision(s) (requested by apb in ticket #1934): distrib/sets/lists/base/mi: revision 1.1090 Add ./usr/share/zoneinfo/Pacific/Bougainville for tzdata2014i To generate a diff of this commit: cvs rdiff -u -r1.780.2.25.2.3 -r1.780.2.25.2.4 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.780.2.25.2.3 src/distrib/sets/lists/base/mi:1.780.2.25.2.4 --- src/distrib/sets/lists/base/mi:1.780.2.25.2.3 Fri Aug 15 23:06:18 2014 +++ src/distrib/sets/lists/base/mi Sun Nov 23 04:59:32 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.25.2.3 2014/08/15 23:06:18 riz Exp $ +# $NetBSD: mi,v 1.780.2.25.2.4 2014/11/23 04:59:32 snj Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4880,6 +4880,7 @@ ./usr/share/zoneinfo/Pacific base-sys-share ./usr/share/zoneinfo/Pacific/Apia base-sys-share share ./usr/share/zoneinfo/Pacific/Auckland base-sys-share share +./usr/share/zoneinfo/Pacific/Bougainville base-sys-share share ./usr/share/zoneinfo/Pacific/Chatham base-sys-share share ./usr/share/zoneinfo/Pacific/Chuuk base-sys-share share ./usr/share/zoneinfo/Pacific/Easter base-sys-share share
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: snj Date: Sun Nov 23 05:00:24 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: addition to ticket 1934 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-5.2.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.4 diff -u src/doc/CHANGES-5.2.4:1.1.2.3 src/doc/CHANGES-5.2.4:1.1.2.4 --- src/doc/CHANGES-5.2.4:1.1.2.3 Fri Nov 21 09:19:38 2014 +++ src/doc/CHANGES-5.2.4 Sun Nov 23 05:00:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.3 2014/11/21 09:19:38 sborrill Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.4 2014/11/23 05:00:24 snj Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -20,6 +20,7 @@ sys/dev/raidframe/rf_reconstruct.c 1.12 Fixes PR kern/49244. [oster, ticket #1933] +distrib/sets/lists/base/mi 1.1090 doc/3RDPARTY patch share/zoneinfo/NEWSnew share/zoneinfo/africapatch
