CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Wed Aug 13 06:26:32 UTC 2014 Modified Files: src/sys/dev/usb: uhub.c Log Message: SS device detection needs more work. #if 0 previous attempt for now. PR/49106: panic: ehci_open: bad device speed 4 To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/dev/usb/uhub.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/usb/uhub.c diff -u src/sys/dev/usb/uhub.c:1.125 src/sys/dev/usb/uhub.c:1.126 --- src/sys/dev/usb/uhub.c:1.125 Tue Aug 12 13:36:40 2014 +++ src/sys/dev/usb/uhub.c Wed Aug 13 06:26:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uhub.c,v 1.125 2014/08/12 13:36:40 skrll Exp $ */ +/* $NetBSD: uhub.c,v 1.126 2014/08/13 06:26:32 skrll Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ /* @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.125 2014/08/12 13:36:40 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.126 2014/08/13 06:26:32 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -540,9 +540,12 @@ uhub_explore(usbd_device_handle dev) } /* Figure out device speed */ +#if 0 if (status UPS_SUPER_SPEED) speed = USB_SPEED_SUPER; - else if (status UPS_HIGH_SPEED) + else +#endif + if (status UPS_HIGH_SPEED) speed = USB_SPEED_HIGH; else if (status UPS_LOW_SPEED) speed = USB_SPEED_LOW;
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: macallan
Date: Wed Aug 13 09:41:51 UTC 2014
Modified Files:
src/sys/arch/macppc/dev: cudavar.h
Log Message:
add PRAM access commands
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/dev/cudavar.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/macppc/dev/cudavar.h
diff -u src/sys/arch/macppc/dev/cudavar.h:1.2 src/sys/arch/macppc/dev/cudavar.h:1.3
--- src/sys/arch/macppc/dev/cudavar.h:1.2 Tue Apr 29 06:53:02 2008
+++ src/sys/arch/macppc/dev/cudavar.h Wed Aug 13 09:41:50 2014
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cudavar.h,v 1.2 2008/04/29 06:53:02 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: cudavar.h,v 1.3 2014/08/13 09:41:50 macallan Exp $);
#ifndef CUDAVAR_H
#define CUDAVAR_H
@@ -43,10 +43,12 @@ __KERNEL_RCSID(0, $NetBSD: cudavar.h,v
/* Cuda commands */
#define CMD_AUTOPOLL 1
#define CMD_READ_RTC 3
+#define CMD_READ_PRAM 7 /* addr is 16bit, upper byte first */
#define CMD_WRITE_RTC 9
#define CMD_POWEROFF 10
+#define CMD_WRITE_PRAM 12
#define CMD_RESET 17
-#define CMD_IIC 34
+#define CMD_IIC 34
struct cuda_attach_args {
void *cookie;
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: macallan
Date: Wed Aug 13 10:56:36 UTC 2014
Modified Files:
src/sys/arch/macppc/dev: cuda.c
Log Message:
if we get garbage from the RTC try again a couple times
this seems to happen more frequently when the PRAM battery goes bad
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/macppc/dev/cuda.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/macppc/dev/cuda.c
diff -u src/sys/arch/macppc/dev/cuda.c:1.19 src/sys/arch/macppc/dev/cuda.c:1.20
--- src/sys/arch/macppc/dev/cuda.c:1.19 Fri Mar 14 21:59:41 2014
+++ src/sys/arch/macppc/dev/cuda.c Wed Aug 13 10:56:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cuda.c,v 1.19 2014/03/14 21:59:41 mrg Exp $ */
+/* $NetBSD: cuda.c,v 1.20 2014/08/13 10:56:35 macallan Exp $ */
/*-
* Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cuda.c,v 1.19 2014/03/14 21:59:41 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: cuda.c,v 1.20 2014/08/13 10:56:35 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -559,8 +559,8 @@ switch_start:
if (sc-sc_received 255) {
/* bitch only once */
if (sc-sc_received == 256) {
-printf(%s: input overflow\n,
-device_xname(sc-sc_dev));
+aprint_error_dev(sc-sc_dev,
+input overflow\n);
ending = 1;
}
} else
@@ -596,7 +596,8 @@ switch_start:
me-handler(me-cookie,
sc-sc_received - 1, sc-sc_in[1]);
} else {
- printf(no handler for type %02x\n, type);
+ aprint_error_dev(sc-sc_dev,
+ no handler for type %02x\n, type);
panic(barf);
}
}
@@ -678,6 +679,7 @@ switch_start:
} else {
/* send next byte */
cuda_write_reg(sc, vSR, sc-sc_out[sc-sc_sent]);
+ DPRINTF(%02x, sc-sc_out[sc-sc_sent]);
cuda_toggle_ack(sc); /* signal byte ready to
* shift */
}
@@ -755,15 +757,27 @@ cuda_todr_get(todr_chip_handle_t tch, st
uint8_t cmd[] = { CUDA_PSEUDO, CMD_READ_RTC};
sc-sc_tod = 0;
- cuda_send(sc, 0, 2, cmd);
+ while (sc-sc_tod == 0) {
+ cuda_send(sc, 0, 2, cmd);
- while ((sc-sc_tod == 0) (cnt 10)) {
- tsleep(sc-sc_todev, 0, todr, 10);
- cnt++;
- }
+ while ((sc-sc_tod == 0) (cnt 10)) {
+ tsleep(sc-sc_todev, 0, todr, 10);
+ cnt++;
+ }
- if (sc-sc_tod == 0)
- return EIO;
+ if (sc-sc_tod == 0) {
+ aprint_error_dev(sc-sc_dev,
+ unable to read a sane RTC value\n);
+ return EIO;
+ }
+ if ((sc-sc_tod 0xf000UL) ||
+ (sc-sc_tod DIFF19041970)) {
+ /* huh? try again */
+ sc-sc_tod = 0;
+ aprint_verbose_dev(sc-sc_dev,
+ got garbage reading RTC, trying again\n);
+ }
+ }
tvp-tv_sec = sc-sc_tod - DIFF19041970;
DPRINTF(tod: % PRIo64 \n, tvp-tv_sec);
@@ -787,6 +801,7 @@ cuda_todr_set(todr_chip_handle_t tch, st
}
return 0;
}
+ aprint_error_dev(sc-sc_dev, %s failed\n, __func__);
return -1;
}
@@ -950,6 +965,7 @@ cuda_i2c_exec(void *cookie, i2c_op_t op,
if (sc-sc_error) {
sc-sc_error = 0;
+ aprint_error_dev(sc-sc_dev, error doing I2C\n);
return -1;
}
@@ -974,7 +990,8 @@ cuda_i2c_exec(void *cookie, i2c_op_t op,
}
if (sc-sc_error) {
- printf(error trying to read\n);
+ aprint_error_dev(sc-sc_dev,
+ error trying to read from I2C\n);
sc-sc_error = 0;
return -1;
}
CVS commit: src/usr.bin/sed
Module Name:src
Committed By: christos
Date: Wed Aug 13 11:35:34 UTC 2014
Modified Files:
src/usr.bin/sed: process.c
Log Message:
PR/49109: Jeremie Le Hen: fix sed relative addressin (1,+N)
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192108
http://svnweb.freebsd.org/base?view=revisionrevision=269302
XXX: pullup 7.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/sed/process.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sed/process.c
diff -u src/usr.bin/sed/process.c:1.45 src/usr.bin/sed/process.c:1.46
--- src/usr.bin/sed/process.c:1.45 Wed Jun 25 22:14:32 2014
+++ src/usr.bin/sed/process.c Wed Aug 13 07:35:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: process.c,v 1.45 2014/06/26 02:14:32 christos Exp $ */
+/* $NetBSD: process.c,v 1.46 2014/08/13 11:35:34 christos Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: process.c,v 1.45 2014/06/26 02:14:32 christos Exp $);
+__RCSID($NetBSD: process.c,v 1.46 2014/08/13 11:35:34 christos Exp $);
#ifdef __FBSDID
__FBSDID($FreeBSD: head/usr.bin/sed/process.c 192732 2009-05-25 06:45:33Z brian $);
#endif
@@ -295,24 +295,32 @@ applies(struct s_command *cp)
r = 1;
else if (cp-a2)
if (cp-startline 0) {
- if (MATCH(cp-a2)) {
-cp-startline = 0;
-lastaddr = 1;
-r = 1;
- } else if (linenum - cp-startline = cp-a2-u.l)
-r = 1;
- else if ((cp-a2-type == AT_LINE
- linenum cp-a2-u.l) ||
- (cp-a2-type == AT_RELLINE
- linenum - cp-startline cp-a2-u.l)) {
-/*
- * We missed the 2nd address due to a branch,
- * so just close the range and return false.
- */
-cp-startline = 0;
-r = 0;
- } else
-r = 1;
+ switch (cp-a2-type) {
+ case AT_RELLINE:
+if (linenum - cp-startline = cp-a2-u.l)
+ r = 1;
+else {
+ cp-startline = 0;
+ r = 0;
+}
+break;
+ default:
+if (MATCH(cp-a2)) {
+ cp-startline = 0;
+ lastaddr = 1;
+ r = 1;
+} else if (cp-a2-type == AT_LINE
+linenum cp-a2-u.l) {
+ /*
+ * We missed the 2nd address due to a
+ * branch, so just close the range and
+ * return false.
+ */
+ cp-startline = 0;
+ r = 0;
+} else
+ r = 1;
+ }
} else if (cp-a1 MATCH(cp-a1)) {
/*
* If the second address is a number less than or
CVS commit: src/sbin/ccdconfig
Module Name:src Committed By: apb Date: Wed Aug 13 13:14:35 UTC 2014 Modified Files: src/sbin/ccdconfig: ccdconfig.8 Log Message: Interleave 0 means concatenate serially, do not interleave. This information was in the ccd(4) man page, but not in ccdconfig(8) or ccd.conf(5). To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sbin/ccdconfig/ccdconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ccdconfig/ccdconfig.8 diff -u src/sbin/ccdconfig/ccdconfig.8:1.26 src/sbin/ccdconfig/ccdconfig.8:1.27 --- src/sbin/ccdconfig/ccdconfig.8:1.26 Sat Apr 27 17:12:36 2013 +++ src/sbin/ccdconfig/ccdconfig.8 Wed Aug 13 13:14:35 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: ccdconfig.8,v 1.26 2013/04/27 17:12:36 christos Exp $ +.\ $NetBSD: ccdconfig.8,v 1.27 2014/08/13 13:14:35 apb Exp $ .\ .\ Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 17, 2003 +.Dd August 13, 2014 .Dt CCDCONFIG 8 .Os .Sh NAME @@ -98,6 +98,8 @@ to be verbose. A ccd is described on the command line and in the ccd configuration file by the name of the ccd, the interleave factor, the ccd configuration flags, and a list of one or more devices. +An interleave factor of 0 means that the devices are +concatenated serially, not interleaved. The flags may be represented as a decimal number, a hexadecimal number, a comma-separated list of strings, or the word .Dq none .
CVS commit: src/external/bsd/pcc/dist/pcc/arch/amd64
Module Name:src
Committed By: plunky
Date: Wed Aug 13 13:18:08 UTC 2014
Modified Files:
src/external/bsd/pcc/dist/pcc/arch/amd64: code.c
Log Message:
remove unused variable, as reported by Brad Harder
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/pcc/dist/pcc/arch/amd64/code.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pcc/dist/pcc/arch/amd64/code.c
diff -u src/external/bsd/pcc/dist/pcc/arch/amd64/code.c:1.1.1.5 src/external/bsd/pcc/dist/pcc/arch/amd64/code.c:1.2
--- src/external/bsd/pcc/dist/pcc/arch/amd64/code.c:1.1.1.5 Thu Jul 24 19:15:26 2014
+++ src/external/bsd/pcc/dist/pcc/arch/amd64/code.c Wed Aug 13 13:18:08 2014
@@ -1,5 +1,5 @@
/* Id: code.c,v 1.74 2014/07/03 14:03:50 ragge Exp */
-/* $NetBSD: code.c,v 1.1.1.5 2014/07/24 19:15:26 plunky Exp $ */
+/* $NetBSD: code.c,v 1.2 2014/08/13 13:18:08 plunky Exp $ */
/*
* Copyright (c) 2008 Michael Shalayeff
* Copyright (c) 2003 Anders Magnusson (ra...@ludd.luth.se).
@@ -619,10 +619,9 @@ mkvacall(char *fun, NODE *a, int typ)
NODE *
amd64_builtin_va_arg(const struct bitable *bt, NODE *a)
{
- NODE *ap, *r, *dp;
+ NODE *r, *dp;
int typ, sz;
- ap = a-n_left;
dp = a-n_right;
nsse = ngpr = 0;
CVS commit: src/external/bsd/pcc/dist/pcc/cc/ccom
Module Name:src
Committed By: plunky
Date: Wed Aug 13 13:37:20 UTC 2014
Modified Files:
src/external/bsd/pcc/dist/pcc/cc/ccom: cgram.y
Log Message:
update to r1.377 from upstream, commit message from ragge:
Allow for use of restrict in array declarations (as gcc does).
Fixes gnu regex compilation as reported by William D. Jones on
NetBSD current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/pcc/dist/pcc/cc/ccom/cgram.y
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/pcc/dist/pcc/cc/ccom/cgram.y
diff -u src/external/bsd/pcc/dist/pcc/cc/ccom/cgram.y:1.1.1.7 src/external/bsd/pcc/dist/pcc/cc/ccom/cgram.y:1.2
--- src/external/bsd/pcc/dist/pcc/cc/ccom/cgram.y:1.1.1.7 Thu Jul 24 19:23:21 2014
+++ src/external/bsd/pcc/dist/pcc/cc/ccom/cgram.y Wed Aug 13 13:37:20 2014
@@ -1,5 +1,5 @@
-/* Id: cgram.y,v 1.376 2014/07/02 15:31:41 ragge Exp */
-/* $NetBSD: cgram.y,v 1.1.1.7 2014/07/24 19:23:21 plunky Exp $ */
+/* Id: cgram.y,v 1.377 2014/07/25 09:30:39 ragge Exp */
+/* $NetBSD: cgram.y,v 1.2 2014/08/13 13:37:20 plunky Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ra...@ludd.luth.se).
@@ -355,7 +355,7 @@ declarator: '*' declarator { $$ = bdt
tfree($3); /* XXX - handle */
$$ = biop(LB, $1, $4);
}
- | declarator '[' ']' { $$ = biop(LB, $1, bcon(NOOFFSET)); }
+ | declarator '[' maybe_r ']' { $$ = biop(LB, $1, bcon(NOOFFSET)); }
| declarator '[' '*' ']' { $$ = biop(LB, $1, bcon(NOOFFSET)); }
| declarator '(' parameter_type_list ')' {
$$ = bdty(CALL, $1, $3);
@@ -441,17 +441,17 @@ abstract_declarator:
$$-n_left = $3;
}
| '(' abstract_declarator ')' { $$ = $2; }
- | '[' ']' attr_var {
+ | '[' maybe_r ']' attr_var {
$$ = block(LB, bdty(NAME, NULL), bcon(NOOFFSET),
- INT, 0, gcc_attr_wrapper($3));
+ INT, 0, gcc_attr_wrapper($4));
}
| '[' e ']' attr_var {
$$ = block(LB, bdty(NAME, NULL), $2,
INT, 0, gcc_attr_wrapper($4));
}
- | abstract_declarator '[' ']' attr_var {
+ | abstract_declarator '[' maybe_r ']' attr_var {
$$ = block(LB, $1, bcon(NOOFFSET),
- INT, 0, gcc_attr_wrapper($4));
+ INT, 0, gcc_attr_wrapper($5));
}
| abstract_declarator '[' e ']' attr_var {
$$ = block(LB, $1, $3, INT, 0, gcc_attr_wrapper($5));
@@ -472,8 +472,13 @@ abstract_declarator:
}
;
-ib2: { }
+ib2: { }
+ ;
+
+maybe_r: { }
+ | C_QUALIFIER { nfree($1); }
;
+
/*
* KR arg declaration, between ) and {
*/
CVS commit: src/external/bsd/tcpdump/dist
Module Name:src Committed By: wiz Date: Wed Aug 13 13:53:14 UTC 2014 Modified Files: src/external/bsd/tcpdump/dist: tcpdump.1.in Log Message: Add missing TP so that -a is not hidden in the -A description. From Anon Ymous. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tcpdump/dist/tcpdump.1.in 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/tcpdump/dist/tcpdump.1.in diff -u src/external/bsd/tcpdump/dist/tcpdump.1.in:1.7 src/external/bsd/tcpdump/dist/tcpdump.1.in:1.8 --- src/external/bsd/tcpdump/dist/tcpdump.1.in:1.7 Tue Dec 31 17:33:31 2013 +++ src/external/bsd/tcpdump/dist/tcpdump.1.in Wed Aug 13 13:53:14 2014 @@ -207,6 +207,7 @@ special privileges. .B \-A Print each packet (minus its link level header) in ASCII. Handy for capturing web pages. +.TP .B \-a Attempt to convert network and broadcast addresses to names. .TP
CVS commit: src/sys/fs/ptyfs
Module Name:src
Committed By: hannken
Date: Wed Aug 13 14:10:00 UTC 2014
Modified Files:
src/sys/fs/ptyfs: ptyfs.h ptyfs_subr.c ptyfs_vfsops.c ptyfs_vnops.c
Log Message:
- Add a map of active controlling ptys per mount and no longer abuse
the vnode lifecycle.
- No longer set recycle on VOP_INACTIVE().
- Make ptyfs_used_get() private to ptyfs_subr.c
- Stop copying device attributes from traditional ptys on first allocation.
- Remove unneeded argument lwp from ptyfs_allocvp() and ptyfs_free_get().
OK: Christos Zoulas
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/fs/ptyfs/ptyfs.h
cvs rdiff -u -r1.29 -r1.30 src/sys/fs/ptyfs/ptyfs_subr.c
cvs rdiff -u -r1.50 -r1.51 src/sys/fs/ptyfs/ptyfs_vfsops.c
cvs rdiff -u -r1.47 -r1.48 src/sys/fs/ptyfs/ptyfs_vnops.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/fs/ptyfs/ptyfs.h
diff -u src/sys/fs/ptyfs/ptyfs.h:1.12 src/sys/fs/ptyfs/ptyfs.h:1.13
--- src/sys/fs/ptyfs/ptyfs.h:1.12 Fri Apr 4 18:10:29 2014
+++ src/sys/fs/ptyfs/ptyfs.h Wed Aug 13 14:10:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs.h,v 1.12 2014/04/04 18:10:29 christos Exp $ */
+/* $NetBSD: ptyfs.h,v 1.13 2014/08/13 14:10:00 hannken Exp $ */
/*
* Copyright (c) 1993
@@ -106,11 +106,14 @@ struct ptyfsnode {
};
struct ptyfsmount {
+ kmutex_t pmnt_lock;
TAILQ_ENTRY(ptyfsmount) pmnt_le;
struct mount *pmnt_mp;
gid_t pmnt_gid;
mode_t pmnt_mode;
int pmnt_flags;
+ int pmnt_bitmap_size;
+ uint8_t *pmnt_bitmap;
};
#define VFSTOPTY(mp) ((struct ptyfsmount *)(mp)-mnt_data)
@@ -150,9 +153,10 @@ struct ptyfs_args {
#define PTYFSTOV(ptyfs) ((ptyfs)-ptyfs_vnode)
int ptyfs_freevp(struct vnode *);
-struct vnode *ptyfs_used_get(ptyfstype, int, struct mount *, int);
-int ptyfs_allocvp(struct mount *, struct vnode **, ptyfstype, int,
-struct lwp *);
+void ptyfs_set_active(struct mount *, int);
+void ptyfs_clr_active(struct mount *, int);
+int ptyfs_next_active(struct mount *, int);
+int ptyfs_allocvp(struct mount *, struct vnode **, ptyfstype, int);
void ptyfs_hashinit(void);
void ptyfs_hashreinit(void);
void ptyfs_hashdone(void);
Index: src/sys/fs/ptyfs/ptyfs_subr.c
diff -u src/sys/fs/ptyfs/ptyfs_subr.c:1.29 src/sys/fs/ptyfs/ptyfs_subr.c:1.30
--- src/sys/fs/ptyfs/ptyfs_subr.c:1.29 Thu Mar 27 17:31:56 2014
+++ src/sys/fs/ptyfs/ptyfs_subr.c Wed Aug 13 14:10:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_subr.c,v 1.29 2014/03/27 17:31:56 christos Exp $ */
+/* $NetBSD: ptyfs_subr.c,v 1.30 2014/08/13 14:10:00 hannken Exp $ */
/*
* Copyright (c) 1993
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ptyfs_subr.c,v 1.29 2014/03/27 17:31:56 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptyfs_subr.c,v 1.30 2014/08/13 14:10:00 hannken Exp $);
#include sys/param.h
#include sys/systm.h
@@ -100,12 +100,11 @@ static LIST_HEAD(ptyfs_hashhead, ptyfsno
static u_long ptyfs_used_mask, ptyfs_free_mask; /* size of hash table - 1 */
static kmutex_t ptyfs_used_slock, ptyfs_free_slock;
-static void ptyfs_getinfo(struct ptyfsnode *, struct lwp *);
-
static void ptyfs_hashins(struct ptyfsnode *);
static void ptyfs_hashrem(struct ptyfsnode *);
-static struct ptyfsnode *ptyfs_free_get(ptyfstype, int, struct lwp *);
+static struct vnode *ptyfs_used_get(ptyfstype, int, struct mount *, int);
+static struct ptyfsnode *ptyfs_free_get(ptyfstype, int);
static void ptyfs_rehash(kmutex_t *, struct ptyfs_hashhead **,
u_long *);
@@ -113,74 +112,6 @@ static void ptyfs_rehash(kmutex_t *, str
#define PTYHASH(type, pty, mask) (PTYFS_FILENO(type, pty) % (mask + 1))
-static void
-ptyfs_getinfo(struct ptyfsnode *ptyfs, struct lwp *l)
-{
- extern struct ptm_pty *ptyfs_save_ptm;
-
- if (ptyfs-ptyfs_type == PTYFSroot) {
- ptyfs-ptyfs_mode = S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|
- S_IROTH|S_IXOTH;
- goto out;
- } else
- ptyfs-ptyfs_mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|
- S_IROTH|S_IWOTH;
-
- if (ptyfs_save_ptm != NULL) {
- int error;
- struct pathbuf *pb;
- struct nameidata nd;
- char ttyname[64];
- kauth_cred_t cred;
- struct vattr va;
-
- /*
- * We support traditional ptys, so we copy the info
- * from the inode
- */
- if ((error = (*ptyfs_save_ptm-makename)(
- NULL, l, ttyname, sizeof(ttyname),
- ptyfs-ptyfs_pty, ptyfs-ptyfs_type == PTYFSpts ? 't'
- : 'p')) != 0)
-goto out;
- pb = pathbuf_create(ttyname);
- if (pb == NULL) {
- error = ENOMEM;
- goto out;
- }
- NDINIT(nd, LOOKUP, NOFOLLOW|LOCKLEAF, pb);
- if ((error = namei(nd)) != 0) {
- pathbuf_destroy(pb);
- goto out;
- }
- cred = kauth_cred_alloc();
- error = VOP_GETATTR(nd.ni_vp, va, cred);
- kauth_cred_free(cred);
- VOP_UNLOCK(nd.ni_vp);
- vrele(nd.ni_vp);
- pathbuf_destroy(pb);
- if (error)
- goto out;
- ptyfs-ptyfs_uid = va.va_uid;
- ptyfs-ptyfs_gid = va.va_gid;
- ptyfs-ptyfs_mode = va.va_mode;
- ptyfs-ptyfs_flags = va.va_flags;
-
CVS commit: src/sbin/ccdconfig
Module Name:src Committed By: apb Date: Wed Aug 13 14:13:04 UTC 2014 Modified Files: src/sbin/ccdconfig: ccd.conf.5 Log Message: Interleave 0 means concatenate serially, do not interleave. This information was in the ccd(4) man page, but not in ccdconfig(8) or ccd.conf(5). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sbin/ccdconfig/ccd.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ccdconfig/ccd.conf.5 diff -u src/sbin/ccdconfig/ccd.conf.5:1.4 src/sbin/ccdconfig/ccd.conf.5:1.5 --- src/sbin/ccdconfig/ccd.conf.5:1.4 Tue May 17 11:46:15 2005 +++ src/sbin/ccdconfig/ccd.conf.5 Wed Aug 13 14:13:04 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: ccd.conf.5,v 1.4 2005/05/17 11:46:15 grant Exp $ +.\ $NetBSD: ccd.conf.5,v 1.5 2014/08/13 14:13:04 apb Exp $ .\ .\ Copyright (c) 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -29,7 +29,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 11, 2002 +.Dd August 13, 2014 .Dt CCD.CONF 5 .Os .Sh NAME @@ -68,6 +68,8 @@ The name of the ccd. .It Ar ileave The interleave, expressed in units of .Dv DEV_BSIZE . +For serial concatenation, specify +.Ql 0 . .It Ar flags The flags for the device, which may be represented as a decimal number, a hexadecimal number, a comma-separated list of strings, or the word
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: pooka
Date: Wed Aug 13 14:35:46 UTC 2014
Modified Files:
src/sys/dev/pci: if_vioif.c
Log Message:
Don't use config_deferred_interrupts() for vioif_deferred_init(),
just run it once as part of if_init(). The problem with the former
is that it will execute the deferred init routine in-place when !cold,
and since vioif_deferred_init() finishing depends on virtio interrupts
which are established only after config_deferred_interrupts() is called,
the vioif attach method would deadlock when !cold.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/if_vioif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.7 src/sys/dev/pci/if_vioif.c:1.8
--- src/sys/dev/pci/if_vioif.c:1.7 Tue Jul 22 02:21:50 2014
+++ src/sys/dev/pci/if_vioif.c Wed Aug 13 14:35:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.7 2014/07/22 02:21:50 ozaki-r Exp $ */
+/* $NetBSD: if_vioif.c,v 1.8 2014/08/13 14:35:46 pooka Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.7 2014/07/22 02:21:50 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_vioif.c,v 1.8 2014/08/13 14:35:46 pooka Exp $);
#include sys/param.h
#include sys/systm.h
@@ -155,7 +155,7 @@ struct vioif_softc {
uint8_t sc_mac[ETHER_ADDR_LEN];
struct ethercom sc_ethercom;
- short sc_ifflags;
+ short sc_deferred_init_done;
/* bus_dmamem */
bus_dma_segment_t sc_hdr_segs[1];
@@ -602,8 +602,6 @@ vioif_attach(device_t parent, device_t s
if (vioif_alloc_mems(sc) 0)
goto err;
- if (vsc-sc_nvqs == 3)
- config_interrupts(self, vioif_deferred_init);
strlcpy(ifp-if_xname, device_xname(self), IFNAMSIZ);
ifp-if_softc = sc;
@@ -670,6 +668,14 @@ vioif_init(struct ifnet *ifp)
vioif_stop(ifp, 0);
+ if (!sc-sc_deferred_init_done) {
+ struct virtio_softc *vsc = sc-sc_virtio;
+
+ sc-sc_deferred_init_done = 1;
+ if (vsc-sc_nvqs == 3)
+ vioif_deferred_init(sc-sc_dev);
+ }
+
/* Have to set false before vioif_populate_rx_mbufs */
sc-sc_stopping = false;
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: joerg
Date: Wed Aug 13 14:41:45 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
powerpc64 uses the same sources as powerpc and needs the long double as
double-double sources.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.24 src/lib/libc/compiler_rt/Makefile.inc:1.25
--- src/lib/libc/compiler_rt/Makefile.inc:1.24 Sun Aug 10 23:39:08 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Wed Aug 13 14:41:45 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.24 2014/08/10 23:39:08 matt Exp $
+# $NetBSD: Makefile.inc,v 1.25 2014/08/13 14:41:45 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-.if ${LIBC_MACHINE_ARCH} == powerpc
+.if ${LIBC_MACHINE_ARCH} == powerpc || ${LIBC_MACHINE_ARCH} == powerpc64
COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
.else
@@ -200,7 +200,7 @@ GENERIC_SRCS+= \
InstrProfilingFile.c \
InstrProfilingPlatformOther.c
-.if ${LIBC_MACHINE_ARCH} == powerpc
+.if ${LIBC_MACHINE_ARCH} == powerpc || ${LIBC_MACHINE_ARCH} == powerpc64
GENERIC_SRCS+= \
fixtfdi.c \
fixunstfdi.c \
CVS commit: src
Module Name:src Committed By: joerg Date: Wed Aug 13 14:43:48 UTC 2014 Modified Files: src/doc: TODO.clang src/lib/libc/compat/sys: compat___semctl13.c compat_semctl.c src/lib/libc/sys: semctl.c Log Message: Use the lint path as workaround for Clang on 32bit PPC for now. Document this hack. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/doc/TODO.clang cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/sys/compat___semctl13.c \ src/lib/libc/compat/sys/compat_semctl.c cvs rdiff -u -r1.16 -r1.17 src/lib/libc/sys/semctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.clang diff -u src/doc/TODO.clang:1.13 src/doc/TODO.clang:1.14 --- src/doc/TODO.clang:1.13 Sun Aug 10 19:12:08 2014 +++ src/doc/TODO.clang Wed Aug 13 14:43:48 2014 @@ -1,4 +1,4 @@ -$NetBSD: TODO.clang,v 1.13 2014/08/10 19:12:08 joerg Exp $ +$NetBSD: TODO.clang,v 1.14 2014/08/13 14:43:48 joerg Exp $ Hacks for the clang integration --- @@ -14,3 +14,9 @@ g++ otherwise on trivial input. src/external/mit/xorg/lib/pixman uses -fno-integrated-as on ARM for the macro (ab)use. + +Clang does support union arguments for va_arg on 32bit PowerPC, hack +around to get the files to compiles are in: +lib/libc/compat/sys/compat___semctl13.c +lib/libc/compat/sys/compat_semctl.c +lib/libc/sys/semctl.c Index: src/lib/libc/compat/sys/compat___semctl13.c diff -u src/lib/libc/compat/sys/compat___semctl13.c:1.4 src/lib/libc/compat/sys/compat___semctl13.c:1.5 --- src/lib/libc/compat/sys/compat___semctl13.c:1.4 Sun Aug 10 17:55:08 2014 +++ src/lib/libc/compat/sys/compat___semctl13.c Wed Aug 13 14:43:48 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: compat___semctl13.c,v 1.4 2014/08/10 17:55:08 joerg Exp $ */ +/* $NetBSD: compat___semctl13.c,v 1.5 2014/08/13 14:43:48 joerg Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: compat___semctl13.c,v 1.4 2014/08/10 17:55:08 joerg Exp $); +__RCSID($NetBSD: compat___semctl13.c,v 1.5 2014/08/13 14:43:48 joerg Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h @@ -47,6 +47,9 @@ __RCSID($NetBSD: compat___semctl13.c,v #include compat/sys/time.h #include sys/sem.h #include compat/sys/sem.h +#if defined(__clang__) defined(__powerpc__) !defined(__powerpc64__) +#define __lint__ +#endif #ifdef __lint__ #include string.h #endif Index: src/lib/libc/compat/sys/compat_semctl.c diff -u src/lib/libc/compat/sys/compat_semctl.c:1.4 src/lib/libc/compat/sys/compat_semctl.c:1.5 --- src/lib/libc/compat/sys/compat_semctl.c:1.4 Sun Aug 10 17:55:08 2014 +++ src/lib/libc/compat/sys/compat_semctl.c Wed Aug 13 14:43:48 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_semctl.c,v 1.4 2014/08/10 17:55:08 joerg Exp $ */ +/* $NetBSD: compat_semctl.c,v 1.5 2014/08/13 14:43:48 joerg Exp $ */ /* * Copyright (c) 1994, 1995 Christopher G. Demetriou @@ -36,7 +36,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: compat_semctl.c,v 1.4 2014/08/10 17:55:08 joerg Exp $); +__RCSID($NetBSD: compat_semctl.c,v 1.5 2014/08/13 14:43:48 joerg Exp $); #endif /* LIBC_SCCS and not lint */ #define __LIBC12_SOURCE__ @@ -46,6 +46,9 @@ __RCSID($NetBSD: compat_semctl.c,v 1.4 #include sys/null.h #include compat/sys/sem.h #include stdarg.h +#if defined(__clang__) defined(__powerpc__) !defined(__powerpc64__) +#define __lint__ +#endif #ifdef __lint__ #include string.h #endif Index: src/lib/libc/sys/semctl.c diff -u src/lib/libc/sys/semctl.c:1.16 src/lib/libc/sys/semctl.c:1.17 --- src/lib/libc/sys/semctl.c:1.16 Sun Aug 10 17:55:09 2014 +++ src/lib/libc/sys/semctl.c Wed Aug 13 14:43:48 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: semctl.c,v 1.16 2014/08/10 17:55:09 joerg Exp $ */ +/* $NetBSD: semctl.c,v 1.17 2014/08/13 14:43:48 joerg Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,13 +30,16 @@ */ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: semctl.c,v 1.16 2014/08/10 17:55:09 joerg Exp $); +__RCSID($NetBSD: semctl.c,v 1.17 2014/08/13 14:43:48 joerg Exp $); #endif /* LIBC_SCCS and not lint */ #include sys/types.h #include sys/ipc.h #include sys/sem.h #include stdarg.h +#if defined(__clang__) defined(__powerpc__) !defined(__powerpc64__) +#define __lint__ +#endif #ifdef __lint__ #include string.h #endif
CVS commit: src/sys/rump/dev
Module Name:src
Committed By: pooka
Date: Wed Aug 13 15:01:32 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libpci_if_pcn: Makefile PCI_IF_PCN.ioconf
pcn_at_pci.c shlib_version
Log Message:
Add component for the pcnet PCI driver to rump kernels. Virtualbox
emulates it by default, so it's nice-to-have for that.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_if_pcn/Makefile \
src/sys/rump/dev/lib/libpci_if_pcn/PCI_IF_PCN.ioconf \
src/sys/rump/dev/lib/libpci_if_pcn/pcn_at_pci.c \
src/sys/rump/dev/lib/libpci_if_pcn/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.12 src/sys/rump/dev/Makefile.rumpdevcomp:1.13
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.12 Thu Jul 17 08:16:12 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Wed Aug 13 15:01:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.12 2014/07/17 08:16:12 prlw1 Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.13 2014/08/13 15:01:32 pooka Exp $
#
RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \
@@ -7,7 +7,7 @@ RUMPDEVCOMP= audio bpf cgd disk dm drvct
RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb
-RUMPPCIDEVS= pci pci_if_iwn pci_if_wm
+RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm
# Not really a PCI device, but
RUMPPCIDEVS+= miiphy
Added files:
Index: src/sys/rump/dev/lib/libpci_if_pcn/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_pcn/Makefile:1.1
--- /dev/null Wed Aug 13 15:01:32 2014
+++ src/sys/rump/dev/lib/libpci_if_pcn/Makefile Wed Aug 13 15:01:32 2014
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2014/08/13 15:01:32 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_pci_if_pcn
+IOCONF= PCI_IF_PCN.ioconf
+
+SRCS= pcn_at_pci.c
+
+SRCS+= if_pcn.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libpci_if_pcn/PCI_IF_PCN.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_pcn/PCI_IF_PCN.ioconf:1.1
--- /dev/null Wed Aug 13 15:01:32 2014
+++ src/sys/rump/dev/lib/libpci_if_pcn/PCI_IF_PCN.ioconf Wed Aug 13 15:01:32 2014
@@ -0,0 +1,11 @@
+# $NetBSD: PCI_IF_PCN.ioconf,v 1.1 2014/08/13 15:01:32 pooka Exp $
+#
+
+ioconf pci_if_pcn
+
+include conf/files
+include dev/pci/files.pci
+
+pseudo-root pci*
+
+pcn* at pci? dev ? function ?
Index: src/sys/rump/dev/lib/libpci_if_pcn/pcn_at_pci.c
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_pcn/pcn_at_pci.c:1.1
--- /dev/null Wed Aug 13 15:01:32 2014
+++ src/sys/rump/dev/lib/libpci_if_pcn/pcn_at_pci.c Wed Aug 13 15:01:32 2014
@@ -0,0 +1,44 @@
+/* $NetBSD: pcn_at_pci.c,v 1.1 2014/08/13 15:01:32 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: pcn_at_pci.c,v 1.1 2014/08/13 15:01:32 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/bus.h
+
+#include rump_private.h
+#include ioconf.c
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_pci_if_pcn,
+ cfattach_ioconf_pci_if_pcn, cfdata_ioconf_pci_if_pcn);
+}
Index: src/sys/rump/dev/lib/libpci_if_pcn/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_pcn/shlib_version:1.1
--- /dev/null Wed Aug 13 15:01:32 2014
+++
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Wed Aug 13 15:06:28 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Fix for PR/49061
only kassert in pmap_kenter_pa if PMAP_CACHE_PIVT !ARM_MMU_EXTENDED
To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.296 src/sys/arch/arm/arm32/pmap.c:1.297
--- src/sys/arch/arm/arm32/pmap.c:1.296 Wed Aug 13 05:56:03 2014
+++ src/sys/arch/arm/arm32/pmap.c Wed Aug 13 15:06:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.296 2014/08/13 05:56:03 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.297 2014/08/13 15:06:28 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
#include arm/locore.h
//#include arm/arm32/katelib.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.296 2014/08/13 05:56:03 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.297 2014/08/13 15:06:28 matt Exp $);
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -3770,7 +3770,9 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
pool_put(pmap_pv_pool, pv);
#endif
}
+#if defined(PMAP_CACHE_VIPT) !defined(ARM_MMU_EXTENDED)
KASSERT(md == NULL || !pmap_page_locked_p(md));
+#endif
if (pmap_initialized) {
UVMHIST_LOG(maphist, -- done (ptep %p: %#x - %#x),
ptep, opte, npte, 0);
CVS commit: src/lib/libc/arch/powerpc64/sys
Module Name:src Committed By: joerg Date: Wed Aug 13 15:19:22 UTC 2014 Modified Files: src/lib/libc/arch/powerpc64/sys: sbrk.S Log Message: Spell LdAddr consistently To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/sys/sbrk.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/powerpc64/sys/sbrk.S diff -u src/lib/libc/arch/powerpc64/sys/sbrk.S:1.3 src/lib/libc/arch/powerpc64/sys/sbrk.S:1.4 --- src/lib/libc/arch/powerpc64/sys/sbrk.S:1.3 Fri Jul 7 06:50:06 2006 +++ src/lib/libc/arch/powerpc64/sys/sbrk.S Wed Aug 13 15:19:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sbrk.S,v 1.3 2006/07/07 06:50:06 ross Exp $ */ +/* $NetBSD: sbrk.S,v 1.4 2014/08/13 15:19:22 joerg Exp $ */ #include SYS.h @@ -23,7 +23,7 @@ _C_LABEL(__curbrk): .endm ENTRY(_sbrk) - ldAddr %r6,__curbrk + LdAddr %r6,__curbrk add %r3,%r3,%r6 mr %r7,%r3# r7 = new break li %r0,SYS_break
CVS commit: src/lib/libc/arch/powerpc64/gen
Module Name:src Committed By: joerg Date: Wed Aug 13 15:41:22 UTC 2014 Modified Files: src/lib/libc/arch/powerpc64/gen: swapcontext.S Log Message: [] - () To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/powerpc64/gen/swapcontext.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/powerpc64/gen/swapcontext.S diff -u src/lib/libc/arch/powerpc64/gen/swapcontext.S:1.4 src/lib/libc/arch/powerpc64/gen/swapcontext.S:1.5 --- src/lib/libc/arch/powerpc64/gen/swapcontext.S:1.4 Wed Sep 12 02:00:52 2012 +++ src/lib/libc/arch/powerpc64/gen/swapcontext.S Wed Aug 13 15:41:21 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: swapcontext.S,v 1.4 2012/09/12 02:00:52 manu Exp $ */ +/* $NetBSD: swapcontext.S,v 1.5 2014/08/13 15:41:21 joerg Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -33,14 +33,14 @@ #if defined(LIBC_SCCS) !defined(lint) .text - .asciz $NetBSD: swapcontext.S,v 1.4 2012/09/12 02:00:52 manu Exp $ + .asciz $NetBSD: swapcontext.S,v 1.5 2014/08/13 15:41:21 joerg Exp $ #endif /* LIBC_SCCS !lint */ ENTRY(swapcontext) mc_off = 56# offset of uc_mcontext stdu %r1,-SF_SZ(%r1) # set up new stack frame mflr %r0 - std %r0,[SF_SZ+SF_LR](%r1) # save link register + std %r0,(SF_SZ+SF_LR)(%r1) # save link register std %r3,SF_PARAM(%r1) # must save oucp (was 8) std %r4,SF_PARAM+8(%r1) # must save ucp (was 12) bl ._getcontext # getcontext(oucp)
CVS commit: src/sbin/mount_ptyfs
Module Name:src Committed By: hannken Date: Wed Aug 13 15:48:38 UTC 2014 Modified Files: src/sbin/mount_ptyfs: mount_ptyfs.8 Log Message: Adapt to reality -- already open BSD style nodes do not appear on ptyfs mounts (this changed some months ago). To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sbin/mount_ptyfs/mount_ptyfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_ptyfs/mount_ptyfs.8 diff -u src/sbin/mount_ptyfs/mount_ptyfs.8:1.13 src/sbin/mount_ptyfs/mount_ptyfs.8:1.14 --- src/sbin/mount_ptyfs/mount_ptyfs.8:1.13 Fri Apr 4 21:19:35 2014 +++ src/sbin/mount_ptyfs/mount_ptyfs.8 Wed Aug 13 15:48:38 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount_ptyfs.8,v 1.13 2014/04/04 21:19:35 christos Exp $ +.\ $NetBSD: mount_ptyfs.8,v 1.14 2014/08/13 15:48:38 hannken Exp $ .\ .\ .\ Copyright (c) 2004, 2014 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 4, 2014 +.Dd August 13, 2014 .Dt MOUNT_PTYFS 8 .Os .Sh NAME @@ -57,8 +57,7 @@ at boot time. .Pp The filesystem contains pseudo-terminal slave device nodes which are allocated dynamically via -.Xr ptm 4 , -or they are already open via traditional BSD style ptys. +.Xr ptm 4 . .Pp The options are as follows: .Bl -tag -width indent
CVS commit: src/libexec/ld.elf_so/arch/powerpc
Module Name:src
Committed By: joerg
Date: Wed Aug 13 15:56:52 UTC 2014
Modified Files:
src/libexec/ld.elf_so/arch/powerpc: Makefile.inc
Log Message:
Build position independent on PPC64, too.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/libexec/ld.elf_so/arch/powerpc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/powerpc/Makefile.inc
diff -u src/libexec/ld.elf_so/arch/powerpc/Makefile.inc:1.13 src/libexec/ld.elf_so/arch/powerpc/Makefile.inc:1.14
--- src/libexec/ld.elf_so/arch/powerpc/Makefile.inc:1.13 Thu Mar 6 07:47:39 2014
+++ src/libexec/ld.elf_so/arch/powerpc/Makefile.inc Wed Aug 13 15:56:52 2014
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.inc,v 1.13 2014/03/06 07:47:39 matt Exp $
+# $NetBSD: Makefile.inc,v 1.14 2014/08/13 15:56:52 joerg Exp $
SRCS+= ppc_reloc.c
LDFLAGS+= -Wl,-e,_rtld_start
# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic
+
.if ${LDELFSO_MACHINE_ARCH} == powerpc64
SRCS+= rtld_start64.S
CPPFLAGS+= -DELFSIZE=64
.else
SRCS+= rtld_start.S
-CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32
LDFLAGS+= -Wl,--script,${.CURDIR}/arch/powerpc/ld.so.script
.endif
-
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: justin Date: Wed Aug 13 17:14:42 UTC 2014 Modified Files: src/sys/arch/aarch64/include: int_fmtio.h Log Message: Add formatting for aarch64 as using arm ones errors for ll on 64 bit types To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/include/int_fmtio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/aarch64/include/int_fmtio.h diff -u src/sys/arch/aarch64/include/int_fmtio.h:1.1 src/sys/arch/aarch64/include/int_fmtio.h:1.2 --- src/sys/arch/aarch64/include/int_fmtio.h:1.1 Sun Aug 10 05:47:38 2014 +++ src/sys/arch/aarch64/include/int_fmtio.h Wed Aug 13 17:14:41 2014 @@ -1,3 +1,219 @@ -/* $NetBSD: int_fmtio.h,v 1.1 2014/08/10 05:47:38 matt Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.2 2014/08/13 17:14:41 justin Exp $ */ +/*- + * Copyright (c) 2001 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Klaus Klein. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _AARCH64_INT_FMTIO_H_ +#define _AARCH64_INT_FMTIO_H_ + +#ifdef _LP64 +#ifdef __INTPTR_FMTd__ +#include sys/common_int_fmtio.h +#else +/* + * 7.8.1 Macros for format specifiers + */ + +/* fprintf macros for signed integers */ +#define PRId8 d /* int8_t */ +#define PRId16 d /* int16_t */ +#define PRId32 d /* int32_t */ +#define PRId64 ld /* int64_t */ +#define PRIdLEAST8 d /* int_least8_t */ +#define PRIdLEAST16 d /* int_least16_t */ +#define PRIdLEAST32 d /* int_least32_t */ +#define PRIdLEAST64 ld /* int_least64_t */ +#define PRIdFAST8 d /* int_fast8_t */ +#define PRIdFAST16 d /* int_fast16_t */ +#define PRIdFAST32 d /* int_fast32_t */ +#define PRIdFAST64 ld /* int_fast64_t */ +#define PRIdMAX ld /* intmax_t */ +#define PRIdPTR ld /* intptr_t */ + +#define PRIi8 i /* int8_t */ +#define PRIi16 i /* int16_t */ +#define PRIi32 i /* int32_t */ +#define PRIi64 li /* int64_t */ +#define PRIiLEAST8 i /* int_least8_t */ +#define PRIiLEAST16 i /* int_least16_t */ +#define PRIiLEAST32 i /* int_least32_t */ +#define PRIiLEAST64 li /* int_least64_t */ +#define PRIiFAST8 i /* int_fast8_t */ +#define PRIiFAST16 i /* int_fast16_t */ +#define PRIiFAST32 i /* int_fast32_t */ +#define PRIiFAST64 li /* int_fast64_t */ +#define PRIiMAX li /* intmax_t */ +#define PRIiPTR li /* intptr_t */ + +/* fprintf macros for unsigned integers */ + +#define PRIo8 o /* uint8_t */ +#define PRIo16 o /* uint16_t */ +#define PRIo32 o /* uint32_t */ +#define PRIo64 lo /* uint64_t */ +#define PRIoLEAST8 o /* uint_least8_t */ +#define PRIoLEAST16 o /* uint_least16_t */ +#define PRIoLEAST32 o /* uint_least32_t */ +#define PRIoLEAST64 lo /* uint_least64_t */ +#define PRIoFAST8 o /* uint_fast8_t */ +#define PRIoFAST16 o /* uint_fast16_t */ +#define PRIoFAST32 o /* uint_fast32_t */ +#define PRIoFAST64 lo /* uint_fast64_t */ +#define PRIoMAX lo /* uintmax_t */ +#define PRIoPTR lo /* uintptr_t */ + +#define PRIu8 u /* uint8_t */ +#define PRIu16 u /* uint16_t */ +#define PRIu32 u /* uint32_t */ +#define PRIu64 lu /* uint64_t */ +#define PRIuLEAST8 u /* uint_least8_t */ +#define PRIuLEAST16 u /* uint_least16_t */ +#define PRIuLEAST32 u /* uint_least32_t */ +#define PRIuLEAST64 lu /* uint_least64_t */ +#define PRIuFAST8 u /* uint_fast8_t */ +#define PRIuFAST16 u /* uint_fast16_t */ +#define PRIuFAST32 u /* uint_fast32_t */ +#define PRIuFAST64 lu /* uint_fast64_t */ +#define PRIuMAX lu /* uintmax_t */ +#define PRIuPTR lu /* uintptr_t */ + +#define PRIx8 x /* uint8_t */ +#define PRIx16 x /*
CVS commit: src/share/mk
Module Name:src
Committed By: justin
Date: Wed Aug 13 18:25:11 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Respect EXTERNAL_TOOLCHAIN on aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.830 -r1.831 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.830 src/share/mk/bsd.own.mk:1.831
--- src/share/mk/bsd.own.mk:1.830 Mon Aug 11 22:28:50 2014
+++ src/share/mk/bsd.own.mk Wed Aug 13 18:25:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.830 2014/08/11 22:28:50 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.831 2014/08/13 18:25:11 justin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -50,7 +50,7 @@ TOOLCHAIN_MISSING?= yes
TOOLCHAIN_MISSING?= no
-.if ${MACHINE_CPU} == aarch64 ${MKLLVM:Uyes} != no
+.if ${MACHINE_CPU} == aarch64 !defined(EXTERNAL_TOOLCHAIN) ${MKLLVM:Uyes} != no
MKLLVM?= yes
HAVE_LLVM?= yes
MKGCC?= no
CVS commit: src/sys/arch/aarch64/include
Module Name:src
Committed By: matt
Date: Wed Aug 13 19:32:35 UTC 2014
Modified Files:
src/sys/arch/aarch64/include: lock.h
Log Message:
Use __ATOMIC_RELAXED in __cpu_simple_lock_init
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/include/lock.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/include/lock.h
diff -u src/sys/arch/aarch64/include/lock.h:1.1 src/sys/arch/aarch64/include/lock.h:1.2
--- src/sys/arch/aarch64/include/lock.h:1.1 Sun Aug 10 05:47:38 2014
+++ src/sys/arch/aarch64/include/lock.h Wed Aug 13 19:32:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.1 2014/08/10 05:47:38 matt Exp $ */
+/* $NetBSD: lock.h,v 1.2 2014/08/13 19:32:35 matt Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@ __cpu_simple_lock_set(__cpu_simple_lock_
static __inline void __unused
__cpu_simple_lock_init(__cpu_simple_lock_t *alp)
{
- __atomic_clear(alp, __ATOMIC_ACQUIRE);
+ __atomic_clear(alp, __ATOMIC_RELAXED);
}
static __inline void __unused
CVS commit: src/sys/netipsec
Module Name:src Committed By: plunky Date: Wed Aug 13 19:43:47 UTC 2014 Modified Files: src/sys/netipsec: ipsec.c Log Message: C99 6.5.15 Conditional operator note 3 states that the second and third operators of a ?: operation shoud (amongst other conditions) either both be integer type, or both void type. cast the second to (void) then, as log() is already a void and no result is desired. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/netipsec/ipsec.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/netipsec/ipsec.c diff -u src/sys/netipsec/ipsec.c:1.63 src/sys/netipsec/ipsec.c:1.64 --- src/sys/netipsec/ipsec.c:1.63 Fri May 30 01:39:03 2014 +++ src/sys/netipsec/ipsec.c Wed Aug 13 19:43:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec.c,v 1.63 2014/05/30 01:39:03 christos Exp $ */ +/* $NetBSD: ipsec.c,v 1.64 2014/08/13 19:43:47 plunky Exp $ */ /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.63 2014/05/30 01:39:03 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.64 2014/08/13 19:43:47 plunky Exp $); /* * IPsec controller part. @@ -1748,7 +1748,7 @@ ipsec_get_reqlevel(const struct ipsecreq (((lev) != IPSEC_LEVEL_USE (lev) != IPSEC_LEVEL_REQUIRE \ (lev) != IPSEC_LEVEL_UNIQUE) ? \ (ipsec_debug ? log(LOG_INFO, fixed system default level #lev \ - :%d-%d\n, (lev), IPSEC_LEVEL_REQUIRE) : 0), \ + :%d-%d\n, (lev), IPSEC_LEVEL_REQUIRE) : (void)0), \ (lev) = IPSEC_LEVEL_REQUIRE, (lev)\ : (lev))
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Wed Aug 13 19:48:17 UTC 2014 Modified Files: src/sys/arch/alpha/include: int_fmtio.h src/sys/arch/arm/include: int_fmtio.h src/sys/arch/hppa/include: int_fmtio.h src/sys/arch/ia64/include: int_fmtio.h src/sys/arch/m68k/include: int_fmtio.h src/sys/arch/mips/include: int_fmtio.h src/sys/arch/powerpc/include: int_fmtio.h src/sys/arch/sh3/include: int_fmtio.h src/sys/arch/sparc/include: int_fmtio.h src/sys/arch/vax/include: int_fmtio.h Log Message: include sys/common_int_fmtio.h if __INTPTR_FMTd__ is defined To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/include/int_fmtio.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/int_fmtio.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/int_fmtio.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/int_fmtio.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/m68k/include/int_fmtio.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/include/int_fmtio.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/int_fmtio.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sh3/include/int_fmtio.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc/include/int_fmtio.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/include/int_fmtio.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/alpha/include/int_fmtio.h diff -u src/sys/arch/alpha/include/int_fmtio.h:1.4 src/sys/arch/alpha/include/int_fmtio.h:1.5 --- src/sys/arch/alpha/include/int_fmtio.h:1.4 Mon Apr 28 20:23:11 2008 +++ src/sys/arch/alpha/include/int_fmtio.h Wed Aug 13 19:48:17 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.4 2008/04/28 20:23:11 martin Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.5 2014/08/13 19:48:17 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _ALPHA_INT_FMTIO_H_ #define _ALPHA_INT_FMTIO_H_ +#ifdef __INTPTR_FMTd__ +#include sys/common_int_fmtio.h +#else /* * 7.8.1 Macros for format specifiers */ @@ -209,4 +212,6 @@ #define SCNxMAX lx /* uintmax_t */ #define SCNxPTR lx /* uintptr_t */ +#endif /* !__INTPTR_FMTd__ */ + #endif /* !_ALPHA_INT_FMTIO_H_ */ Index: src/sys/arch/arm/include/int_fmtio.h diff -u src/sys/arch/arm/include/int_fmtio.h:1.8 src/sys/arch/arm/include/int_fmtio.h:1.9 --- src/sys/arch/arm/include/int_fmtio.h:1.8 Fri Jul 25 21:43:13 2014 +++ src/sys/arch/arm/include/int_fmtio.h Wed Aug 13 19:48:17 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.8 2014/07/25 21:43:13 joerg Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.9 2014/08/13 19:48:17 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -210,6 +210,7 @@ #define SCNxFAST64 llx /* uint_fast64_t */ #define SCNxMAX llx /* uintmax_t */ #define SCNxPTR lx /* uintptr_t */ -#endif + +#endif /* !__INTPTR_FMTd__ */ #endif /* !_ARM_INT_FMTIO_H_ */ Index: src/sys/arch/hppa/include/int_fmtio.h diff -u src/sys/arch/hppa/include/int_fmtio.h:1.2 src/sys/arch/hppa/include/int_fmtio.h:1.3 --- src/sys/arch/hppa/include/int_fmtio.h:1.2 Mon Apr 28 20:23:23 2008 +++ src/sys/arch/hppa/include/int_fmtio.h Wed Aug 13 19:48:17 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.2 2008/04/28 20:23:23 martin Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.3 2014/08/13 19:48:17 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _HPPA_INT_FMTIO_H_ #define _HPPA_INT_FMTIO_H_ +#ifdef __INTPTR_FMTd__ +#include sys/common_int_fmtio.h +#else /* * 7.8.1 Macros for format specifiers */ @@ -209,4 +212,6 @@ #define SCNxMAX llx /* uintmax_t */ #define SCNxPTR lx /* uintptr_t */ +#endif /* !__INTPTR_FMTd__ */ + #endif /* !_HPPA_INT_FMTIO_H_ */ Index: src/sys/arch/ia64/include/int_fmtio.h diff -u src/sys/arch/ia64/include/int_fmtio.h:1.2 src/sys/arch/ia64/include/int_fmtio.h:1.3 --- src/sys/arch/ia64/include/int_fmtio.h:1.2 Mon Apr 28 20:23:25 2008 +++ src/sys/arch/ia64/include/int_fmtio.h Wed Aug 13 19:48:17 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.2 2008/04/28 20:23:25 martin Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.3 2014/08/13 19:48:17 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _IA64_INT_FMTIO_H_ #define _IA64_INT_FMTIO_H_ +#ifdef __INTPTR_FMTd__ +#include sys/common_int_fmtio.h +#else /* * 7.8.1 Macros for format specifiers */ @@ -209,4 +212,6 @@ #define SCNxMAX lx /* uintmax_t */ #define SCNxPTR lx /* uintptr_t */ +#endif /* !__INTPTR_FMTd__ */ + #endif /* !_IA64_INT_FMTIO_H_ */ Index: src/sys/arch/m68k/include/int_fmtio.h diff -u src/sys/arch/m68k/include/int_fmtio.h:1.3 src/sys/arch/m68k/include/int_fmtio.h:1.4 --- src/sys/arch/m68k/include/int_fmtio.h:1.3 Mon Apr 28 20:23:26 2008 +++ src/sys/arch/m68k/include/int_fmtio.h Wed Aug 13 19:48:17 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_fmtio.h,v 1.3 2008/04/28 20:23:26
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: matt Date: Wed Aug 13 19:51:27 UTC 2014 Modified Files: src/sys/arch/aarch64/include: int_fmtio.h Log Message: Back out last change. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/include/int_fmtio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/aarch64/include/int_fmtio.h diff -u src/sys/arch/aarch64/include/int_fmtio.h:1.2 src/sys/arch/aarch64/include/int_fmtio.h:1.3 --- src/sys/arch/aarch64/include/int_fmtio.h:1.2 Wed Aug 13 17:14:41 2014 +++ src/sys/arch/aarch64/include/int_fmtio.h Wed Aug 13 19:51:27 2014 @@ -1,219 +1,3 @@ -/* $NetBSD: int_fmtio.h,v 1.2 2014/08/13 17:14:41 justin Exp $ */ +/* $NetBSD: int_fmtio.h,v 1.3 2014/08/13 19:51:27 matt Exp $ */ -/*- - * Copyright (c) 2001 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Klaus Klein. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in the - *documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _AARCH64_INT_FMTIO_H_ -#define _AARCH64_INT_FMTIO_H_ - -#ifdef _LP64 -#ifdef __INTPTR_FMTd__ -#include sys/common_int_fmtio.h -#else -/* - * 7.8.1 Macros for format specifiers - */ - -/* fprintf macros for signed integers */ -#define PRId8 d /* int8_t */ -#define PRId16 d /* int16_t */ -#define PRId32 d /* int32_t */ -#define PRId64 ld /* int64_t */ -#define PRIdLEAST8 d /* int_least8_t */ -#define PRIdLEAST16 d /* int_least16_t */ -#define PRIdLEAST32 d /* int_least32_t */ -#define PRIdLEAST64 ld /* int_least64_t */ -#define PRIdFAST8 d /* int_fast8_t */ -#define PRIdFAST16 d /* int_fast16_t */ -#define PRIdFAST32 d /* int_fast32_t */ -#define PRIdFAST64 ld /* int_fast64_t */ -#define PRIdMAX ld /* intmax_t */ -#define PRIdPTR ld /* intptr_t */ - -#define PRIi8 i /* int8_t */ -#define PRIi16 i /* int16_t */ -#define PRIi32 i /* int32_t */ -#define PRIi64 li /* int64_t */ -#define PRIiLEAST8 i /* int_least8_t */ -#define PRIiLEAST16 i /* int_least16_t */ -#define PRIiLEAST32 i /* int_least32_t */ -#define PRIiLEAST64 li /* int_least64_t */ -#define PRIiFAST8 i /* int_fast8_t */ -#define PRIiFAST16 i /* int_fast16_t */ -#define PRIiFAST32 i /* int_fast32_t */ -#define PRIiFAST64 li /* int_fast64_t */ -#define PRIiMAX li /* intmax_t */ -#define PRIiPTR li /* intptr_t */ - -/* fprintf macros for unsigned integers */ - -#define PRIo8 o /* uint8_t */ -#define PRIo16 o /* uint16_t */ -#define PRIo32 o /* uint32_t */ -#define PRIo64 lo /* uint64_t */ -#define PRIoLEAST8 o /* uint_least8_t */ -#define PRIoLEAST16 o /* uint_least16_t */ -#define PRIoLEAST32 o /* uint_least32_t */ -#define PRIoLEAST64 lo /* uint_least64_t */ -#define PRIoFAST8 o /* uint_fast8_t */ -#define PRIoFAST16 o /* uint_fast16_t */ -#define PRIoFAST32 o /* uint_fast32_t */ -#define PRIoFAST64 lo /* uint_fast64_t */ -#define PRIoMAX lo /* uintmax_t */ -#define PRIoPTR lo /* uintptr_t */ - -#define PRIu8 u /* uint8_t */ -#define PRIu16 u /* uint16_t */ -#define PRIu32 u /* uint32_t */ -#define PRIu64 lu /* uint64_t */ -#define PRIuLEAST8 u /* uint_least8_t */ -#define PRIuLEAST16 u /* uint_least16_t */ -#define PRIuLEAST32 u /* uint_least32_t */ -#define PRIuLEAST64 lu /* uint_least64_t */ -#define PRIuFAST8 u /* uint_fast8_t */ -#define PRIuFAST16 u /* uint_fast16_t */ -#define PRIuFAST32 u /* uint_fast32_t */ -#define PRIuFAST64 lu /* uint_fast64_t */ -#define PRIuMAX lu /* uintmax_t */ -#define PRIuPTR lu /* uintptr_t */ - -#define PRIx8 x /* uint8_t */ -#define PRIx16 x /* uint16_t */ -#define PRIx32 x /* uint32_t */ -#define
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Wed Aug 13 20:51:27 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Use compiler-rt and libc++ with LLVM on PowerPC64.
To generate a diff of this commit:
cvs rdiff -u -r1.831 -r1.832 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.831 src/share/mk/bsd.own.mk:1.832
--- src/share/mk/bsd.own.mk:1.831 Wed Aug 13 18:25:11 2014
+++ src/share/mk/bsd.own.mk Wed Aug 13 20:51:26 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.831 2014/08/13 18:25:11 justin Exp $
+# $NetBSD: bsd.own.mk,v 1.832 2014/08/13 20:51:26 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -96,6 +96,7 @@ _LIBC_COMPILER_RT.${MACHINE_ARCH}= yes
_LIBC_COMPILER_RT.aarch64= yes
_LIBC_COMPILER_RT.i386= yes
_LIBC_COMPILER_RT.powerpc= yes
+_LIBC_COMPILER_RT.powerpc64= yes
_LIBC_COMPILER_RT.x86_64= yes
.if ${MKLLVM:Uno} == yes ${_LIBC_COMPILER_RT.${MACHINE_ARCH}:Uno} == yes
@@ -1101,10 +1102,11 @@ MKNLS:= no
.if !empty(MACHINE_ARCH:Mearm*)
_NEEDS_LIBCXX.${MACHINE_ARCH}= yes
.endif
-_NEEDS_LIBCXX.i386= yes
-_NEEDS_LIBCXX.powerpc= yes
-_NEEDS_LIBCXX.x86_64= yes
-_NEEDS_LIBCXX.aarch64= yes
+_NEEDS_LIBCXX.i386= yes
+_NEEDS_LIBCXX.powerpc= yes
+_NEEDS_LIBCXX.powerpc64= yes
+_NEEDS_LIBCXX.x86_64= yes
+_NEEDS_LIBCXX.aarch64= yes
.if ${MKLLVM} == yes ${_NEEDS_LIBCXX.${MACHINE_ARCH}:Uno} == yes
MKLIBCXX:= yes
CVS commit: src/distrib/evbppc/ramdisk
Module Name:src
Committed By: joerg
Date: Wed Aug 13 20:52:05 UTC 2014
Modified Files:
src/distrib/evbppc/ramdisk: Makefile
Log Message:
Bump ramdisk size to 3.2MB and include dhcpcd.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/evbppc/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbppc/ramdisk/Makefile
diff -u src/distrib/evbppc/ramdisk/Makefile:1.17 src/distrib/evbppc/ramdisk/Makefile:1.18
--- src/distrib/evbppc/ramdisk/Makefile:1.17 Fri Aug 8 16:56:30 2014
+++ src/distrib/evbppc/ramdisk/Makefile Wed Aug 13 20:52:05 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2014/08/08 16:56:30 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2014/08/13 20:52:05 joerg Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2880k
+IMAGESIZE= 3200k
MAKEFS_FLAGS= -f 15
WARNS= 1
@@ -32,6 +32,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
${CRUNCHBIN}: libhack.o
.include ${DISTRIBDIR}/common/Makefile.crunch
+.include ${DISTRIBDIR}/common/Makefile.dhcpcd
.include ${DISTRIBDIR}/common/Makefile.makedev
.include ${DISTRIBDIR}/common/Makefile.image
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: riastradh
Date: Wed Aug 13 20:56:21 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux: pci.h
Log Message:
Fix shifts masks in Linux pci_read_config_{word,byte}.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/linux/pci.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.7 src/sys/external/bsd/drm2/include/linux/pci.h:1.8
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.7 Wed Aug 6 13:52:06 2014
+++ src/sys/external/bsd/drm2/include/linux/pci.h Wed Aug 13 20:56:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.7 2014/08/06 13:52:06 riastradh Exp $ */
+/* $NetBSD: pci.h,v 1.8 2014/08/13 20:56:21 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -200,7 +200,7 @@ pci_read_config_word(struct pci_dev *pde
{
KASSERT(!ISSET(reg, 1));
*valuep = pci_conf_read(pdev-pd_pa.pa_pc, pdev-pd_pa.pa_tag,
- (reg ~ 3)) (8 * (reg 3));
+ (reg ~ 2)) (8 * (reg 2));
return 0;
}
@@ -208,7 +208,7 @@ static inline int
pci_read_config_byte(struct pci_dev *pdev, int reg, uint8_t *valuep)
{
*valuep = pci_conf_read(pdev-pd_pa.pa_pc, pdev-pd_pa.pa_tag,
- (reg ~ 1)) (8 * (reg 1));
+ (reg ~ 3)) (8 * (reg 3));
return 0;
}
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: matt Date: Wed Aug 13 21:10:31 UTC 2014 Modified Files: src/sys/arch/arm/arm: sig_machdep.c Log Message: When creating a mcontext, make sure the PSR we are saving is actually valid. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/arm/arm/sig_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/arm/arm/sig_machdep.c diff -u src/sys/arch/arm/arm/sig_machdep.c:1.47 src/sys/arch/arm/arm/sig_machdep.c:1.48 --- src/sys/arch/arm/arm/sig_machdep.c:1.47 Sun Aug 18 06:28:18 2013 +++ src/sys/arch/arm/arm/sig_machdep.c Wed Aug 13 21:10:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sig_machdep.c,v 1.47 2013/08/18 06:28:18 matt Exp $ */ +/* $NetBSD: sig_machdep.c,v 1.48 2014/08/13 21:10:31 matt Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -44,7 +44,7 @@ #include sys/param.h -__KERNEL_RCSID(0, $NetBSD: sig_machdep.c,v 1.47 2013/08/18 06:28:18 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: sig_machdep.c,v 1.48 2014/08/13 21:10:31 matt Exp $); #include sys/mount.h /* XXX only needed by syscallargs.h */ #include sys/cpu.h @@ -184,6 +184,9 @@ cpu_getmcontext(struct lwp *l, mcontext_ gr[_REG_PC] = tf-tf_pc; gr[_REG_CPSR] = tf-tf_spsr; + KASSERTMSG(VALID_R15_PSR(gr[_REG_PC], gr[_REG_CPSR]), %#x %#x, + gr[_REG_PC], gr[_REG_CPSR]); + if ((ras_pc = (__greg_t)ras_lookup(l-l_proc, (void *) gr[_REG_PC])) != -1) gr[_REG_PC] = ras_pc;
CVS commit: src/sys/arch/arm
Module Name:src Committed By: matt Date: Wed Aug 13 21:41:32 UTC 2014 Modified Files: src/sys/arch/arm/arm: ast.c process_machdep.c syscall.c src/sys/arch/arm/arm32: fault.c src/sys/arch/arm/include: locore.h Log Message: Add __NO_FIQ to prevent testing of the PSR FIQ bit Use VALID_R15_PSR(pc, spsr) instead of testing explicitly To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/arm/ast.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/arm/process_machdep.c cvs rdiff -u -r1.59 -r1.60 src/sys/arch/arm/arm/syscall.c cvs rdiff -u -r1.100 -r1.101 src/sys/arch/arm/arm32/fault.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/include/locore.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/arm/ast.c diff -u src/sys/arch/arm/arm/ast.c:1.23 src/sys/arch/arm/arm/ast.c:1.24 --- src/sys/arch/arm/arm/ast.c:1.23 Fri Mar 28 21:43:49 2014 +++ src/sys/arch/arm/arm/ast.c Wed Aug 13 21:41:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ast.c,v 1.23 2014/03/28 21:43:49 matt Exp $ */ +/* $NetBSD: ast.c,v 1.24 2014/08/13 21:41:32 matt Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ast.c,v 1.23 2014/03/28 21:43:49 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ast.c,v 1.24 2014/08/13 21:41:32 matt Exp $); #include opt_ddb.h @@ -86,7 +86,8 @@ userret(struct lwp *l) #endif #if defined(__PROG32) defined(DIAGNOSTIC) - KASSERT((lwp_trapframe(l)-tf_spsr IF32_bits) == 0); + KASSERT(VALID_R15_PSR(lwp_trapframe(l)-tf_pc, + lwp_trapframe(l)-tf_spsr)); #endif } @@ -111,7 +112,7 @@ ast(struct trapframe *tf) #endif #ifdef __PROG32 - KASSERT((tf-tf_spsr IF32_bits) == 0); + KASSERT(VALID_R15_PSR(tf-tf_pc, tf-tf_spsr)); #endif curcpu()-ci_data.cpu_ntrap++; Index: src/sys/arch/arm/arm/process_machdep.c diff -u src/sys/arch/arm/arm/process_machdep.c:1.29 src/sys/arch/arm/arm/process_machdep.c:1.30 --- src/sys/arch/arm/arm/process_machdep.c:1.29 Sat Jan 4 00:10:02 2014 +++ src/sys/arch/arm/arm/process_machdep.c Wed Aug 13 21:41:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: process_machdep.c,v 1.29 2014/01/04 00:10:02 dsl Exp $ */ +/* $NetBSD: process_machdep.c,v 1.30 2014/08/13 21:41:32 matt Exp $ */ /* * Copyright (c) 1993 The Regents of the University of California. @@ -133,7 +133,7 @@ #include sys/param.h -__KERNEL_RCSID(0, $NetBSD: process_machdep.c,v 1.29 2014/01/04 00:10:02 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: process_machdep.c,v 1.30 2014/08/13 21:41:32 matt Exp $); #include sys/proc.h #include sys/ptrace.h @@ -158,15 +158,12 @@ process_read_regs(struct lwp *l, struct regs-r_pc = tf-tf_pc; regs-r_cpsr = tf-tf_spsr; + KASSERT(VALID_R15_PSR(tf-tf_pc, tf-tf_spsr)); + #ifdef THUMB_CODE if (tf-tf_spsr PSR_T_bit) regs-r_pc |= 1; #endif -#ifdef DIAGNOSTIC - if ((tf-tf_spsr PSR_MODE) == PSR_USR32_MODE - (tf-tf_spsr IF32_bits)) - panic(process_read_regs: IRQs/FIQs blocked in user process); -#endif return(0); } @@ -204,11 +201,7 @@ process_write_regs(struct lwp *l, const if ((regs-r_pc 1) || (regs-r_cpsr PSR_T_bit)) tf-tf_spsr |= PSR_T_bit; #endif -#ifdef DIAGNOSTIC - if ((tf-tf_spsr PSR_MODE) == PSR_USR32_MODE - (tf-tf_spsr IF32_bits)) - panic(process_read_regs: IRQs/FIQs blocked in user process); -#endif + KASSERT(VALID_R15_PSR(tf-tf_pc, tf-tf_spsr)); #else /* __PROG26 */ if ((regs-r_pc (R15_MODE | R15_IRQ_DISABLE | R15_FIQ_DISABLE)) != 0) return EPERM; Index: src/sys/arch/arm/arm/syscall.c diff -u src/sys/arch/arm/arm/syscall.c:1.59 src/sys/arch/arm/arm/syscall.c:1.60 --- src/sys/arch/arm/arm/syscall.c:1.59 Wed Jan 29 18:45:21 2014 +++ src/sys/arch/arm/arm/syscall.c Wed Aug 13 21:41:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.59 2014/01/29 18:45:21 matt Exp $ */ +/* $NetBSD: syscall.c,v 1.60 2014/08/13 21:41:32 matt Exp $ */ /*- * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ #include sys/param.h -__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.59 2014/01/29 18:45:21 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.60 2014/08/13 21:41:32 matt Exp $); #include sys/cpu.h #include sys/device.h @@ -109,7 +109,7 @@ swi_handler(trapframe_t *tf) if ((tf-tf_r15 R15_IRQ_DISABLE) == 0) int_on(); #else - KASSERT((tf-tf_spsr IF32_bits) == 0); + KASSERT(VALID_R15_PSR(tf-tf_pc, tf-tf_spsr)); restore_interrupts(tf-tf_spsr IF32_bits); #endif Index: src/sys/arch/arm/arm32/fault.c diff -u src/sys/arch/arm/arm32/fault.c:1.100 src/sys/arch/arm/arm32/fault.c:1.101 --- src/sys/arch/arm/arm32/fault.c:1.100 Sat Apr 12 09:11:47 2014 +++ src/sys/arch/arm/arm32/fault.c Wed Aug 13 21:41:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fault.c,v 1.100 2014/04/12 09:11:47 skrll Exp $ */ +/* $NetBSD: fault.c,v 1.101 2014/08/13 21:41:32 matt Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src
Committed By: riz
Date: Wed Aug 13 21:47:18 UTC 2014
Modified Files:
src/sys/dev/usb [netbsd-7]: xhci.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #11):
sys/dev/usb/xhci.c: revision 1.25
Serialise xhci_intr1 calls with sc_intr_lock. From Takahiro HAYASHI.
To generate a diff of this commit:
cvs rdiff -u -r1.23.2.1 -r1.23.2.2 src/sys/dev/usb/xhci.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/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.23.2.1 src/sys/dev/usb/xhci.c:1.23.2.2
--- src/sys/dev/usb/xhci.c:1.23.2.1 Mon Aug 11 15:36:45 2014
+++ src/sys/dev/usb/xhci.c Wed Aug 13 21:47:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.23.2.1 2014/08/11 15:36:45 martin Exp $ */
+/* $NetBSD: xhci.c,v 1.23.2.2 2014/08/13 21:47:18 riz Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.23.2.1 2014/08/11 15:36:45 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.23.2.2 2014/08/13 21:47:18 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -853,10 +853,16 @@ int
xhci_intr(void *v)
{
struct xhci_softc * const sc = v;
+ int ret = 0;
- if (sc == NULL || sc-sc_dying || !device_has_power(sc-sc_dev))
+ if (sc == NULL)
return 0;
+ mutex_spin_enter(sc-sc_intr_lock);
+
+ if (sc-sc_dying || !device_has_power(sc-sc_dev))
+ goto done;
+
DPRINTF((%s: %s\n, __func__, device_xname(sc-sc_dev)));
/* If we get an interrupt while polling, then just ignore it. */
@@ -864,10 +870,13 @@ xhci_intr(void *v)
#ifdef DIAGNOSTIC
DPRINTFN(16, (xhci_intr: ignored interrupt while polling\n));
#endif
- return 0;
+ goto done;
}
- return xhci_intr1(sc);
+ ret = xhci_intr1(sc);
+done:
+ mutex_spin_exit(sc-sc_intr_lock);
+ return ret;
}
int
@@ -1314,7 +1323,9 @@ xhci_poll(struct usbd_bus *bus)
DPRINTF((%s: %s\n, __func__, device_xname(sc-sc_dev)));
+ mutex_spin_enter(sc-sc_intr_lock);
xhci_intr1(sc);
+ mutex_spin_exit(sc-sc_intr_lock);
return;
}
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src Committed By: riz Date: Wed Aug 13 21:50:39 UTC 2014 Modified Files: src/sys/dev/usb [netbsd-7]: files.usb usb.h Log Message: Pull up following revision(s) (requested by skrll in ticket #12): sys/dev/usb/files.usb: revision 1.133 sys/dev/usb/usb.h: revision 1.108 Add XHCI_DEBUG. From Takahiro HAYASHI with tweaks from me. One day someone(tm) will tidyup USB debug stuff. To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.132.2.1 src/sys/dev/usb/files.usb cvs rdiff -u -r1.106 -r1.106.4.1 src/sys/dev/usb/usb.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/files.usb diff -u src/sys/dev/usb/files.usb:1.132 src/sys/dev/usb/files.usb:1.132.2.1 --- src/sys/dev/usb/files.usb:1.132 Sat Apr 5 23:47:26 2014 +++ src/sys/dev/usb/files.usb Wed Aug 13 21:50:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.usb,v 1.132 2014/04/05 23:47:26 khorben Exp $ +# $NetBSD: files.usb,v 1.132.2.1 2014/08/13 21:50:39 riz Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide @@ -6,7 +6,8 @@ defflag USBVERBOSE defflag opt_usb.h USB_FRAG_DMA_WORKAROUND -defflag opt_usb.h EHCI_DEBUG OHCI_DEBUG UHCI_DEBUG UHUB_DEBUG USB_DEBUG +defflag opt_usb.h UHUB_DEBUG USB_DEBUG +defflag opt_usb.h EHCI_DEBUG OHCI_DEBUG UHCI_DEBUG XHCI_DEBUG defflag opt_umodem.h UMODEM_DEBUG defflag opt_uvideo.h UVIDEO_DEBUG Index: src/sys/dev/usb/usb.h diff -u src/sys/dev/usb/usb.h:1.106 src/sys/dev/usb/usb.h:1.106.4.1 --- src/sys/dev/usb/usb.h:1.106 Fri Nov 1 14:32:54 2013 +++ src/sys/dev/usb/usb.h Wed Aug 13 21:50:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: usb.h,v 1.106 2013/11/01 14:32:54 skrll Exp $ */ +/* $NetBSD: usb.h,v 1.106.4.1 2014/08/13 21:50:39 riz Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */ /* @@ -125,6 +125,7 @@ MALLOC_DECLARE(M_USBHC); #define UVSCOM_DEBUG 1 #define UYUREX_DEBUG 1 #define UZCOM_DEBUG 1 +#define XHCI_DEBUG 1 #define ZYD_DEBUG 1 #define Static #else
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: riz Date: Wed Aug 13 21:50:56 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets 11, 12 To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.7 src/doc/CHANGES-7.0:1.1.2.8 --- src/doc/CHANGES-7.0:1.1.2.7 Tue Aug 12 19:02:55 2014 +++ src/doc/CHANGES-7.0 Wed Aug 13 21:50:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.7 2014/08/12 19:02:55 riz Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.8 2014/08/13 21:50:56 riz Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -82,3 +82,14 @@ sys/arch/sparc/sparc/autoconf.c 1.258 Add device name mapping for qfe (quad hme) cards. PR#49103. [martin, ticket #7] +sys/dev/usb/xhci.c1.25 + + Serialise xhci_intr1 calls with sc_intr_lock. From Takahiro HAYASHI. + [skrll, ticket #11] + +sys/dev/usb/files.usb1.133 +sys/dev/usb/usb.h1.108 + + Add XHCI_DEBUG. + [skrll, ticket #12] +
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: matt
Date: Wed Aug 13 22:16:24 UTC 2014
Modified Files:
src/sys/arch/arm/include: profile.h
Log Message:
Don't save r4 since we don't use it.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/include/profile.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/profile.h
diff -u src/sys/arch/arm/include/profile.h:1.14 src/sys/arch/arm/include/profile.h:1.15
--- src/sys/arch/arm/include/profile.h:1.14 Sun May 11 02:02:14 2014
+++ src/sys/arch/arm/include/profile.h Wed Aug 13 22:16:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: profile.h,v 1.14 2014/05/11 02:02:14 joerg Exp $ */
+/* $NetBSD: profile.h,v 1.15 2014/08/13 22:16:24 matt Exp $ */
/*
* Copyright (c) 2001 Ben Harris
@@ -90,10 +90,10 @@
/*\
* Preserve registers that are trashed during mcount \
*/\
- __asm(push {r0-r4, ip, lr});\
+ __asm(push {r0-r3, ip, lr});\
__asm(.cfi_def_cfa_offset 24);\
__asm(.cfi_offset 14, -4); \
- __asm(.cfi_offset 4, -8); \
+ __asm(.cfi_offset 12, -8); \
__asm(.cfi_offset 3, -12); \
__asm(.cfi_offset 2, -16); \
__asm(.cfi_offset 1, -20); \
@@ -116,7 +116,7 @@
/*\
* Restore registers that were trashed during mcount \
*/\
- __asm(pop {r0-r4, lr, pc});\
+ __asm(pop {r0-r3, lr, pc});\
__asm(.cfi_endproc); \
__asm(.size MCOUNT_ASM_NAME , .- MCOUNT_ASM_NAME);
#else
@@ -132,11 +132,11 @@
/*\
* Preserve registers that are trashed during mcount \
*/\
- __asm(push {r0-r4, ip, lr});\
- __asm(.save {r0-r4, lr}); \
+ __asm(push {r0-r3, ip, lr});\
+ __asm(.save {r0-r3, lr}); \
__asm(.cfi_def_cfa_offset 24);\
__asm(.cfi_offset 14, -4); \
- __asm(.cfi_offset 4, -8); \
+ __asm(.cfi_offset 12, -8); \
__asm(.cfi_offset 3, -12); \
__asm(.cfi_offset 2, -16); \
__asm(.cfi_offset 1, -20); \
@@ -159,7 +159,7 @@
/*\
* Restore registers that were trashed during mcount \
*/\
- __asm(pop {r0-r4, lr, pc});\
+ __asm(pop {r0-r3, lr, pc});\
__asm(.cfi_endproc); \
__asm(.fnend); \
__asm(.size MCOUNT_ASM_NAME , .- MCOUNT_ASM_NAME);
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Wed Aug 13 22:25:40 UTC 2014 Modified Files: src/sys/arch/alpha/include: int_mwgwtypes.h src/sys/arch/ia64/include: int_mwgwtypes.h src/sys/arch/m68k/include: int_mwgwtypes.h src/sys/arch/mips/include: int_mwgwtypes.h src/sys/arch/powerpc/include: int_mwgwtypes.h src/sys/arch/sh3/include: int_mwgwtypes.h src/sys/arch/sparc/include: int_mwgwtypes.h src/sys/arch/vax/include: int_mwgwtypes.h Log Message: include sys/common_int_mwgwtypes.h if __UINT_FAST64_TYPE__ is defined. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/include/int_mwgwtypes.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/int_mwgwtypes.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/include/int_mwgwtypes.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/include/int_mwgwtypes.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/int_mwgwtypes.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sh3/include/int_mwgwtypes.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/include/int_mwgwtypes.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/include/int_mwgwtypes.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/alpha/include/int_mwgwtypes.h diff -u src/sys/arch/alpha/include/int_mwgwtypes.h:1.5 src/sys/arch/alpha/include/int_mwgwtypes.h:1.6 --- src/sys/arch/alpha/include/int_mwgwtypes.h:1.5 Mon Apr 28 20:23:11 2008 +++ src/sys/arch/alpha/include/int_mwgwtypes.h Wed Aug 13 22:25:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_mwgwtypes.h,v 1.5 2008/04/28 20:23:11 martin Exp $ */ +/* $NetBSD: int_mwgwtypes.h,v 1.6 2014/08/13 22:25:39 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _ALPHA_INT_MWGWTYPES_H_ #define _ALPHA_INT_MWGWTYPES_H_ +#ifdef __UINT_FAST64_TYPE__ +#include sys/common_int_mwgwtypes.h +#else /* * 7.18.1 Integer types */ @@ -74,4 +77,6 @@ typedef unsigned long int uint_fast64_t typedef long int intmax_t; typedef unsigned long int uintmax_t; +#endif /* !__UINT_FAST64_TYPE__ */ + #endif /* !_ALPHA_INT_MWGWTYPES_H_ */ Index: src/sys/arch/ia64/include/int_mwgwtypes.h diff -u src/sys/arch/ia64/include/int_mwgwtypes.h:1.2 src/sys/arch/ia64/include/int_mwgwtypes.h:1.3 --- src/sys/arch/ia64/include/int_mwgwtypes.h:1.2 Mon Apr 28 20:23:25 2008 +++ src/sys/arch/ia64/include/int_mwgwtypes.h Wed Aug 13 22:25:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_mwgwtypes.h,v 1.2 2008/04/28 20:23:25 martin Exp $ */ +/* $NetBSD: int_mwgwtypes.h,v 1.3 2014/08/13 22:25:39 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _IA64_INT_MWGWTYPES_H_ #define _IA64_INT_MWGWTYPES_H_ +#ifdef __UINT_FAST64_TYPE__ +#include sys/common_int_mwgwtypes.h +#else /* * 7.18.1 Integer types */ @@ -74,4 +77,6 @@ typedef unsigned long int uint_fast64_t typedef long int intmax_t; typedef unsigned long int uintmax_t; +#endif /* !__UINT_FAST64_TYPE__ */ + #endif /* !_IA64_INT_MWGWTYPES_H_ */ Index: src/sys/arch/m68k/include/int_mwgwtypes.h diff -u src/sys/arch/m68k/include/int_mwgwtypes.h:1.4 src/sys/arch/m68k/include/int_mwgwtypes.h:1.5 --- src/sys/arch/m68k/include/int_mwgwtypes.h:1.4 Mon Apr 28 20:23:26 2008 +++ src/sys/arch/m68k/include/int_mwgwtypes.h Wed Aug 13 22:25:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_mwgwtypes.h,v 1.4 2008/04/28 20:23:26 martin Exp $ */ +/* $NetBSD: int_mwgwtypes.h,v 1.5 2014/08/13 22:25:39 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _M68K_INT_MWGWTYPES_H_ #define _M68K_INT_MWGWTYPES_H_ +#ifdef __UINT_FAST64_TYPE__ +#include sys/common_int_mwgwtypes.h +#else /* * 7.18.1 Integer types */ @@ -84,4 +87,7 @@ typedef long long int intmax_t; typedef unsigned long long int uintmax_t; #endif +#ifdef __UINT_FAST64_TYPE__ +#include sys/common_int_mwgwtypes.h +#else #endif /* !_M68K_INT_MWGWTYPES_H_ */ Index: src/sys/arch/mips/include/int_mwgwtypes.h diff -u src/sys/arch/mips/include/int_mwgwtypes.h:1.5 src/sys/arch/mips/include/int_mwgwtypes.h:1.6 --- src/sys/arch/mips/include/int_mwgwtypes.h:1.5 Mon Apr 28 20:23:28 2008 +++ src/sys/arch/mips/include/int_mwgwtypes.h Wed Aug 13 22:25:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_mwgwtypes.h,v 1.5 2008/04/28 20:23:28 martin Exp $ */ +/* $NetBSD: int_mwgwtypes.h,v 1.6 2014/08/13 22:25:39 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _MIPS_INT_MWGWTYPES_H_ #define _MIPS_INT_MWGWTYPES_H_ +#ifdef __UINT_FAST64_TYPE__ +#include sys/common_int_mwgwtypes.h +#else /* * 7.18.1 Integer types */ @@ -92,4 +95,6 @@ typedef long long int intmax_t; typedef unsigned long long int uintmax_t; #endif +#endif /* !__UINT_FAST64_TYPE__ */ + #endif /* !_MIPS_INT_MWGWTYPES_H_ */ Index:
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Wed Aug 13 22:31:07 UTC 2014 Modified Files: src/sys/arch/alpha/include: int_limits.h src/sys/arch/ia64/include: int_limits.h src/sys/arch/m68k/include: int_limits.h src/sys/arch/mips/include: int_limits.h src/sys/arch/powerpc/include: int_limits.h src/sys/arch/sh3/include: int_limits.h src/sys/arch/sparc/include: int_limits.h src/sys/arch/vax/include: int_limits.h Log Message: Include sys/common_init_limits.h if __SIG_ATOMIC_MAX__ is defined. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/include/int_limits.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/include/int_limits.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/include/int_limits.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/include/int_limits.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/include/int_limits.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sh3/include/int_limits.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/include/int_limits.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/include/int_limits.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/alpha/include/int_limits.h diff -u src/sys/arch/alpha/include/int_limits.h:1.8 src/sys/arch/alpha/include/int_limits.h:1.9 --- src/sys/arch/alpha/include/int_limits.h:1.8 Mon Feb 6 02:14:13 2012 +++ src/sys/arch/alpha/include/int_limits.h Wed Aug 13 22:31:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_limits.h,v 1.8 2012/02/06 02:14:13 matt Exp $ */ +/* $NetBSD: int_limits.h,v 1.9 2014/08/13 22:31:06 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _ALPHA_INT_LIMITS_H_ #define _ALPHA_INT_LIMITS_H_ +#ifdef __SIG_ATOMIC_MAX__ +#include sys/common_int_limits.h +#else /* * 7.18.2 Limits of specified-width integer types */ @@ -124,4 +127,6 @@ /* limit of size_t */ #define SIZE_MAX 0xUL /* size_t */ +#endif /* !__SIG_ATOMIC_MAX__ */ + #endif /* !_ALPHA_INT_LIMITS_H_ */ Index: src/sys/arch/ia64/include/int_limits.h diff -u src/sys/arch/ia64/include/int_limits.h:1.4 src/sys/arch/ia64/include/int_limits.h:1.5 --- src/sys/arch/ia64/include/int_limits.h:1.4 Mon Apr 28 20:23:25 2008 +++ src/sys/arch/ia64/include/int_limits.h Wed Aug 13 22:31:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_limits.h,v 1.4 2008/04/28 20:23:25 martin Exp $ */ +/* $NetBSD: int_limits.h,v 1.5 2014/08/13 22:31:06 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _IA64_INT_LIMITS_H_ #define _IA64_INT_LIMITS_H_ +#ifdef __SIG_ATOMIC_MAX__ +#include sys/common_int_limits.h +#else /* * 7.18.2 Limits of specified-width integer types */ @@ -124,4 +127,6 @@ /* limit of size_t */ #define SIZE_MAX 0xUL /* size_t */ +#endif /* !__SIG_ATOMIC_MAX__ */ + #endif /* !_IA64_INT_LIMITS_H_ */ Index: src/sys/arch/m68k/include/int_limits.h diff -u src/sys/arch/m68k/include/int_limits.h:1.7 src/sys/arch/m68k/include/int_limits.h:1.8 --- src/sys/arch/m68k/include/int_limits.h:1.7 Mon Apr 28 20:23:26 2008 +++ src/sys/arch/m68k/include/int_limits.h Wed Aug 13 22:31:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_limits.h,v 1.7 2008/04/28 20:23:26 martin Exp $ */ +/* $NetBSD: int_limits.h,v 1.8 2014/08/13 22:31:07 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _M68K_INT_LIMITS_H_ #define _M68K_INT_LIMITS_H_ +#ifdef __SIG_ATOMIC_MAX__ +#include sys/common_int_limits.h +#else /* * 7.18.2 Limits of specified-width integer types */ @@ -124,4 +127,6 @@ /* limit of size_t */ #define SIZE_MAX 0xU /* size_t */ +#endif /* !__SIG_ATOMIC_MAX__ */ + #endif /* !_M68K_INT_LIMITS_H_ */ Index: src/sys/arch/mips/include/int_limits.h diff -u src/sys/arch/mips/include/int_limits.h:1.8 src/sys/arch/mips/include/int_limits.h:1.9 --- src/sys/arch/mips/include/int_limits.h:1.8 Mon Apr 28 20:23:28 2008 +++ src/sys/arch/mips/include/int_limits.h Wed Aug 13 22:31:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_limits.h,v 1.8 2008/04/28 20:23:28 martin Exp $ */ +/* $NetBSD: int_limits.h,v 1.9 2014/08/13 22:31:07 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _MIPS_INT_LIMITS_H_ #define _MIPS_INT_LIMITS_H_ +#ifdef __SIG_ATOMIC_MAX__ +#include sys/common_int_limits.h +#else /* * 7.18.2 Limits of specified-width integer types */ @@ -181,4 +184,6 @@ #define SIZE_MAX 0xU /* size_t */ #endif +#endif /* !__SIG_ATOMIC_MAX__ */ + #endif /* !_MIPS_INT_LIMITS_H_ */ Index: src/sys/arch/powerpc/include/int_limits.h diff -u src/sys/arch/powerpc/include/int_limits.h:1.8 src/sys/arch/powerpc/include/int_limits.h:1.9 --- src/sys/arch/powerpc/include/int_limits.h:1.8 Mon Apr 28 20:23:32 2008 +++ src/sys/arch/powerpc/include/int_limits.h Wed Aug 13 22:31:07 2014 @@ -1,4
CVS commit: xsrc/external/mit/xf86-video-nv/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Aug 13 22:45:12 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c
Log Message:
put pci_device_has_kernel_driver(dev) into #if NV_TEST_FOR_KERNEL_DRIVER
at least for now there is nothing that keeps the nv driver from running
if a kernel driver other than vga is attached
Now this works again on macppc ( and x86 if you use for example genfb )
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4 Sun Jun 2 08:29:33 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Wed Aug 13 22:45:12 2014
@@ -911,15 +911,23 @@ NVPciProbe(DriverPtr drv, int entity, st
NVGetPCIXpressChip(dev) : dev-vendor_id 16 | dev-device_id;
const char *name = xf86TokenToString(NVKnownChipsets, id);
+/*
+ * XXX
+ * disable this test for now since it's bogus
+ * it will trigger whenever there's a driver other than vga attached to the
+ * device we're trying to probe, yet this works fine on top of gffb or genfb
+ * might need to revisit this when we have working DRM on non-x86
+ */
+#if NV_TEST_FOR_KERNEL_DRIVER
if (pci_device_has_kernel_driver(dev)) {
xf86DrvMsg(0, X_ERROR,
NV_NAME : The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n,
- (int)id, name, dev-bus, dev-domain, dev-dev, dev-func);
+ id, name, dev-bus, dev-domain, dev-dev, dev-func);
xf86DrvMsg(0, X_ERROR,
NV_NAME : This driver cannot operate until it has been unloaded.\n);
return FALSE;
}
-
+#endif
if(dev-vendor_id == PCI_VENDOR_NVIDIA !name
!NVIsSupported(id) !NVIsG80(id)) {
/* See if pci.ids knows what the heck this thing is */
@@ -927,11 +935,11 @@ NVPciProbe(DriverPtr drv, int entity, st
if(name)
xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n,
- (int)id, name, dev-bus, dev-domain, dev-dev, dev-func);
+ id, name, dev-bus, dev-domain, dev-dev, dev-func);
else
xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d\n,
- (int)id, dev-bus, dev-domain, dev-dev, dev-func);
+ id, dev-bus, dev-domain, dev-dev, dev-func);
return FALSE;
}
@@ -1212,7 +1220,7 @@ NVCloseScreen(CLOSE_SCREEN_ARGS_DECL)
NVLockUnlock(pNv, 1);
}
}
-
+
NVUnmapMem(pScrn);
#ifndef AVOID_VGAHW
vgaHWUnmapMem(pScrn);
@@ -1260,7 +1268,6 @@ NVFreeScreen(FREE_SCREEN_ARGS_DECL)
* This only gets called when a screen is being deleted. It does not
* get called routinely at the end of a server generation.
*/
-
if (xf86LoaderCheckSymbol(vgaHWFreeHWRec))
vgaHWFreeHWRec(pScrn);
NVFreeRec(pScrn);
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nv
Module Name:src
Committed By: macallan
Date: Wed Aug 13 22:48:16 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
Log Message:
mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled for now
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6 Fri Jun 14 04:43:38 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Wed Aug 13 22:48:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/14 04:43:38 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/08/13 22:48:15 macallan Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -15,6 +15,16 @@ MAN= nv.4
CPPFLAGS+= -DAVOID_VGAHW
.endif
+.if ${MACHINE} == i386 || ${MACHINE} == amd64
+# XXX
+# the test uses pci_device_has_kernel_driver() which, for now at least, only
+# makes sense on x86 ( it just checks if the kernel driver handling the
+# device is vga ) - and even there, genfb and the like don't do anything
+# that would prevent this driver from working. Might need to revisit this once
+# the new DRM2 code has nvidia support
+#CPPFLAGS+= -DNV_TEST_FOR_KERNEL_DRIVER
+.endif
+
CPPFLAGS+= -DHAVE_XAA_H
.include ../Makefile.xf86-driver
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Wed Aug 13 22:51:59 UTC 2014 Modified Files: src/sys/arch/alpha/include: int_const.h src/sys/arch/ia64/include: int_const.h src/sys/arch/m68k/include: int_const.h src/sys/arch/mips/include: int_const.h src/sys/arch/powerpc/include: int_const.h src/sys/arch/sh3/include: int_const.h src/sys/arch/sparc/include: int_const.h src/sys/arch/vax/include: int_const.h Log Message: Include sys/common_int_const.h if __INTMAX_C_SUFFIX__ is defined. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/include/int_const.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/int_const.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/m68k/include/int_const.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/include/int_const.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/int_const.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sh3/include/int_const.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc/include/int_const.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/include/int_const.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/alpha/include/int_const.h diff -u src/sys/arch/alpha/include/int_const.h:1.3 src/sys/arch/alpha/include/int_const.h:1.4 --- src/sys/arch/alpha/include/int_const.h:1.3 Sat May 29 17:33:57 2010 +++ src/sys/arch/alpha/include/int_const.h Wed Aug 13 22:51:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_const.h,v 1.3 2010/05/29 17:33:57 tnozaki Exp $ */ +/* $NetBSD: int_const.h,v 1.4 2014/08/13 22:51:58 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _ALPHA_INT_CONST_H_ #define _ALPHA_INT_CONST_H_ +#ifdef __INTMAX_C_SUFFIX__ +#include sys/common_int_const.h +#else /* * 7.18.4 Macros for integer constants */ @@ -53,4 +56,6 @@ #define INTMAX_C(c) c ## L #define UINTMAX_C(c) c ## UL +#endif /* !__INTMAX_C_SUFFIX__ */ + #endif /* !_ALPHA_INT_CONST_H_ */ Index: src/sys/arch/ia64/include/int_const.h diff -u src/sys/arch/ia64/include/int_const.h:1.3 src/sys/arch/ia64/include/int_const.h:1.4 --- src/sys/arch/ia64/include/int_const.h:1.3 Sat May 29 17:33:57 2010 +++ src/sys/arch/ia64/include/int_const.h Wed Aug 13 22:51:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_const.h,v 1.3 2010/05/29 17:33:57 tnozaki Exp $ */ +/* $NetBSD: int_const.h,v 1.4 2014/08/13 22:51:58 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _IA64_INT_CONST_H_ #define _IA64_INT_CONST_H_ +#ifdef __INTMAX_C_SUFFIX__ +#include sys/common_int_const.h +#else /* XXX: cherry: needs to be audited */ /* * 7.18.4 Macros for integer constants @@ -54,4 +57,6 @@ #define INTMAX_C(c) c ## L #define UINTMAX_C(c) c ## UL +#endif /* !__INTMAX_C_SUFFIX__ */ + #endif /* !_IA64_INT_CONST_H_ */ Index: src/sys/arch/m68k/include/int_const.h diff -u src/sys/arch/m68k/include/int_const.h:1.3 src/sys/arch/m68k/include/int_const.h:1.4 --- src/sys/arch/m68k/include/int_const.h:1.3 Sat May 29 17:33:57 2010 +++ src/sys/arch/m68k/include/int_const.h Wed Aug 13 22:51:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_const.h,v 1.3 2010/05/29 17:33:57 tnozaki Exp $ */ +/* $NetBSD: int_const.h,v 1.4 2014/08/13 22:51:58 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _M68K_INT_CONST_H_ #define _M68K_INT_CONST_H_ +#ifdef __INTMAX_C_SUFFIX__ +#include sys/common_int_const.h +#else /* * 7.18.4 Macros for integer constants */ @@ -53,4 +56,6 @@ #define INTMAX_C(c) c ## LL #define UINTMAX_C(c) c ## ULL +#endif /* !__INTMAX_C_SUFFIX__ */ + #endif /* !_M68K_INT_CONST_H_ */ Index: src/sys/arch/mips/include/int_const.h diff -u src/sys/arch/mips/include/int_const.h:1.4 src/sys/arch/mips/include/int_const.h:1.5 --- src/sys/arch/mips/include/int_const.h:1.4 Sat May 29 17:33:57 2010 +++ src/sys/arch/mips/include/int_const.h Wed Aug 13 22:51:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_const.h,v 1.4 2010/05/29 17:33:57 tnozaki Exp $ */ +/* $NetBSD: int_const.h,v 1.5 2014/08/13 22:51:58 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,6 +32,9 @@ #ifndef _MIPS_INT_CONST_H_ #define _MIPS_INT_CONST_H_ +#ifdef __INTMAX_C_SUFFIX__ +#include sys/common_int_const.h +#else /* * 7.18.4 Macros for integer constants */ @@ -66,4 +69,6 @@ #define UINTMAX_C(c) c ## ULL #endif +#endif /* !__INTMAX_C_SUFFIX__ */ + #endif /* !_MIPS_INT_CONST_H_ */ Index: src/sys/arch/powerpc/include/int_const.h diff -u src/sys/arch/powerpc/include/int_const.h:1.4 src/sys/arch/powerpc/include/int_const.h:1.5 --- src/sys/arch/powerpc/include/int_const.h:1.4 Sat May 29 17:33:58 2010 +++ src/sys/arch/powerpc/include/int_const.h Wed Aug 13 22:51:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_const.h,v 1.4 2010/05/29 17:33:58 tnozaki Exp $ */ +/* $NetBSD: int_const.h,v 1.5 2014/08/13 22:51:59 matt Exp $
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Wed Aug 13 22:56:56 UTC 2014 Modified Files: src/sys/arch/alpha/include: int_types.h src/sys/arch/ia64/include: int_types.h src/sys/arch/m68k/include: int_types.h src/sys/arch/mips/include: int_types.h src/sys/arch/powerpc/include: int_types.h src/sys/arch/sh3/include: int_types.h src/sys/arch/sparc/include: int_types.h src/sys/arch/vax/include: int_types.h Log Message: Include sys/common_int_types.h if __UINTPTR_TYPE__ is defined. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/include/int_types.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/int_types.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/include/int_types.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/include/int_types.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/int_types.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sh3/include/int_types.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/include/int_types.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/include/int_types.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/alpha/include/int_types.h diff -u src/sys/arch/alpha/include/int_types.h:1.9 src/sys/arch/alpha/include/int_types.h:1.10 --- src/sys/arch/alpha/include/int_types.h:1.9 Sat Dec 24 20:06:46 2005 +++ src/sys/arch/alpha/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.9 2005/12/24 20:06:46 perry Exp $ */ +/* $NetBSD: int_types.h,v 1.10 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -34,6 +34,9 @@ #ifndef _ALPHA_INT_TYPES_H_ #define _ALPHA_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include sys/common_int_types.h +#else #include sys/cdefs.h /* @@ -63,4 +66,6 @@ typedef unsigned long int __uint64_ typedef long int __intptr_t; typedef unsigned long int __uintptr_t; +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_ALPHA_INT_TYPES_H_ */ Index: src/sys/arch/ia64/include/int_types.h diff -u src/sys/arch/ia64/include/int_types.h:1.1 src/sys/arch/ia64/include/int_types.h:1.2 --- src/sys/arch/ia64/include/int_types.h:1.1 Fri Apr 7 14:21:18 2006 +++ src/sys/arch/ia64/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.1 2006/04/07 14:21:18 cherry Exp $ */ +/* $NetBSD: int_types.h,v 1.2 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -34,6 +34,9 @@ #ifndef _IA64_INT_TYPES_H_ #define _IA64_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include sys/common_int_types.h +#else /* * 7.18.1 Integer types */ @@ -71,4 +74,6 @@ typedef int __intptr_t; typedef unsigned int __uintptr_t; #endif +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_IA64_INT_TYPES_H_ */ Index: src/sys/arch/m68k/include/int_types.h diff -u src/sys/arch/m68k/include/int_types.h:1.9 src/sys/arch/m68k/include/int_types.h:1.10 --- src/sys/arch/m68k/include/int_types.h:1.9 Sat Dec 24 20:07:15 2005 +++ src/sys/arch/m68k/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.9 2005/12/24 20:07:15 perry Exp $ */ +/* $NetBSD: int_types.h,v 1.10 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -34,6 +34,9 @@ #ifndef _M68K_INT_TYPES_H_ #define _M68K_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include sys/common_int_types.h +#else #include sys/cdefs.h /* @@ -65,4 +68,6 @@ typedef unsigned long long int __uint64_ typedef int __intptr_t; typedef unsigned int __uintptr_t; +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_M68K_INT_TYPES_H_ */ Index: src/sys/arch/mips/include/int_types.h diff -u src/sys/arch/mips/include/int_types.h:1.11 src/sys/arch/mips/include/int_types.h:1.12 --- src/sys/arch/mips/include/int_types.h:1.11 Mon Dec 14 00:46:04 2009 +++ src/sys/arch/mips/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.11 2009/12/14 00:46:04 matt Exp $ */ +/* $NetBSD: int_types.h,v 1.12 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,6 +37,9 @@ #ifndef _MIPS_INT_TYPES_H_ #define _MIPS_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include sys/common_int_types.h +#else #include sys/cdefs.h /* @@ -76,4 +79,6 @@ typedef int __intptr_t; typedef unsigned int __uintptr_t; #endif +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_MIPS_INT_TYPES_H_ */ Index: src/sys/arch/powerpc/include/int_types.h diff -u src/sys/arch/powerpc/include/int_types.h:1.10 src/sys/arch/powerpc/include/int_types.h:1.11 --- src/sys/arch/powerpc/include/int_types.h:1.10 Sat Dec 24 20:07:28 2005 +++ src/sys/arch/powerpc/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.10 2005/12/24 20:07:28 perry Exp $ */ +/* $NetBSD:
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Thu Aug 14 04:14:33 UTC 2014 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Add missing delay slot in DEBUG kernel. To generate a diff of this commit: cvs rdiff -u -r1.369 -r1.370 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.369 src/sys/arch/sparc64/sparc64/locore.s:1.370 --- src/sys/arch/sparc64/sparc64/locore.s:1.369 Wed Jul 30 13:50:33 2014 +++ src/sys/arch/sparc64/sparc64/locore.s Thu Aug 14 04:14:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.369 2014/07/30 13:50:33 palle Exp $ */ +/* $NetBSD: locore.s,v 1.370 2014/08/14 04:14:33 nakayama Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -4465,6 +4465,7 @@ ENTRY_NOPROFILE(cpu_initialize) /* for c set 1f, %o0 ! Debug printf call _C_LABEL(prom_printf) + nop .data 1: .asciz Setting trap base...\r\n
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: hikaru
Date: Thu Aug 14 05:42:16 UTC 2014
Modified Files:
src/sys/arch/x86/pci: if_vmx.c
Log Message:
Set ifflags callback so that the device can enter promiscuous mode.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/pci/if_vmx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/if_vmx.c
diff -u src/sys/arch/x86/pci/if_vmx.c:1.4 src/sys/arch/x86/pci/if_vmx.c:1.5
--- src/sys/arch/x86/pci/if_vmx.c:1.4 Sat Jul 19 06:12:24 2014
+++ src/sys/arch/x86/pci/if_vmx.c Thu Aug 14 05:42:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmx.c,v 1.4 2014/07/19 06:12:24 hikaru Exp $ */
+/* $NetBSD: if_vmx.c,v 1.5 2014/08/14 05:42:16 hikaru Exp $ */
/* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_vmx.c,v 1.4 2014/07/19 06:12:24 hikaru Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_vmx.c,v 1.5 2014/08/14 05:42:16 hikaru Exp $);
#include sys/param.h
#include sys/bus.h
@@ -158,6 +158,7 @@ void vmxnet3_evintr(struct vmxnet3_softc
void vmxnet3_txintr(struct vmxnet3_softc *, struct vmxnet3_txqueue *);
void vmxnet3_rxintr(struct vmxnet3_softc *, struct vmxnet3_rxqueue *);
void vmxnet3_iff(struct vmxnet3_softc *);
+int vmxnet3_ifflags_cb(struct ethercom *);
void vmxnet3_rx_csum(struct vmxnet3_rxcompdesc *, struct mbuf *);
int vmxnet3_getbuf(struct vmxnet3_softc *, struct vmxnet3_rxring *);
void vmxnet3_stop(struct ifnet *, int disable);
@@ -308,6 +309,7 @@ vmxnet3_attach(device_t parent, device_t
if_attach(ifp);
ether_ifattach(ifp, enaddr);
+ ether_set_ifflags_cb(sc-sc_ethercom, vmxnet3_ifflags_cb);
vmxnet3_link_state(sc);
}
@@ -859,6 +861,15 @@ setit:
WRITE_CMD(sc, VMXNET3_CMD_SET_RXMODE);
}
+int
+vmxnet3_ifflags_cb(struct ethercom *ec)
+{
+
+ vmxnet3_iff((struct vmxnet3_softc *)ec-ec_if.if_softc);
+
+ return 0;
+}
+
void
vmxnet3_rx_csum(struct vmxnet3_rxcompdesc *rxcd, struct mbuf *m)
