CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Thu Jan 23 10:11:55 UTC 2014
Modified Files:
src/sys/kern: vnode_if.src
Log Message:
Change vnode operations create, mknod, mkdir and symlink to return
the resulting vnode *vpp unlocked.
Discussed on tech-kern@
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/kern/vnode_if.src
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vnode_if.src
diff -u src/sys/kern/vnode_if.src:1.64 src/sys/kern/vnode_if.src:1.65
--- src/sys/kern/vnode_if.src:1.64 Fri Jan 17 10:52:36 2014
+++ src/sys/kern/vnode_if.src Thu Jan 23 10:11:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: vnode_if.src,v 1.64 2014/01/17 10:52:36 hannken Exp $
+# $NetBSD: vnode_if.src,v 1.65 2014/01/23 10:11:55 hannken Exp $
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
@@ -89,12 +89,12 @@ vop_lookup {
#
#% create dvp L L L
-#% create vpp - L -
+#% create vpp - U -
#
#! create cnp CREATE, LOCKPARENT
#
vop_create {
- VERSION 2
+ VERSION 3
IN LOCKED=YES struct vnode *dvp;
OUT WILLMAKE struct vnode **vpp;
IN struct componentname *cnp;
@@ -103,12 +103,12 @@ vop_create {
#
#% mknod dvp L L L
-#% mknod vpp - L -
+#% mknod vpp - U -
#
#! mknod cnp CREATE, LOCKPARENT
#
vop_mknod {
- VERSION 2
+ VERSION 3
IN LOCKED=YES struct vnode *dvp;
OUT WILLMAKE struct vnode **vpp;
IN struct componentname *cnp;
@@ -301,12 +301,12 @@ vop_rename {
#
#% mkdir dvp L L L
-#% mkdir vpp - L -
+#% mkdir vpp - U -
#
#! mkdir cnp CREATE, LOCKPARENT
#
vop_mkdir {
- VERSION 2
+ VERSION 3
IN LOCKED=YES struct vnode *dvp;
OUT WILLMAKE struct vnode **vpp;
IN struct componentname *cnp;
@@ -327,12 +327,12 @@ vop_rmdir {
#
#% symlinkdvp L L L
-#% symlinkvpp - L -
+#% symlinkvpp - U -
#
#! symlink cnp CREATE, LOCKPARENT
#
vop_symlink {
- VERSION 2
+ VERSION 3
IN LOCKED=YES struct vnode *dvp;
OUT WILLMAKE struct vnode **vpp;
IN struct componentname *cnp;
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: manu Date: Thu Jan 23 10:50:14 UTC 2014 Modified Files: src/sys/compat/netbsd32: netbsd32_event.c Log Message: Fix netbsd32 compatibility bug in kevent() The keo_put_events() callback copies the events from kernel to userland. It is called for sets of up to 8 events (constant chosen in kevbuf definitition in kevent1()). The callback is called with pointer to userland buffer, count of events to copy, and an index parameter which tracks where we are in userland buffer when called multiple time. COMPAT_NETBSD32's flavor of keo_put_events() is netbsd32_kevent_put_events(). It did not honour the index parameter, which caused invalid event data to be returned when userland requested more that 8 events. This caused many reliability problems, and the obvious startup crash of dovecot log process when it accessed udata in the nineth event in its buffer, which was NULL. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/compat/netbsd32/netbsd32_event.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_event.c diff -u src/sys/compat/netbsd32/netbsd32_event.c:1.9 src/sys/compat/netbsd32/netbsd32_event.c:1.10 --- src/sys/compat/netbsd32/netbsd32_event.c:1.9 Mon May 23 21:34:47 2011 +++ src/sys/compat/netbsd32/netbsd32_event.c Thu Jan 23 10:50:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_event.c,v 1.9 2011/05/23 21:34:47 joerg Exp $ */ +/* $NetBSD: netbsd32_event.c,v 1.10 2014/01/23 10:50:14 manu Exp $ */ /* * Copyright (c) 2005 The NetBSD Foundation. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_event.c,v 1.9 2011/05/23 21:34:47 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_event.c,v 1.10 2014/01/23 10:50:14 manu Exp $); #include sys/types.h #include sys/param.h @@ -86,7 +86,7 @@ netbsd32_kevent_put_events(void *private for (i = 0, kev32 = events32; i n; i++, kev32++, events++) netbsd32_from_kevent(events, kev32); - kev32 = (struct netbsd32_kevent *)eventlist; + kev32 = ((struct netbsd32_kevent *)eventlist) + index; return copyout(events32, kev32, n * sizeof(*events32)); }
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src Committed By: martin Date: Thu Jan 23 11:45:46 UTC 2014 Modified Files: src/common/lib/libc/arch/arm/string: ffs.S Log Message: PR port-arm/48543: do provide __ffssi2 as strong alias (in case libgcc.a gets not linked in) for now. OK: skrll@ To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/string/ffs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/string/ffs.S diff -u src/common/lib/libc/arch/arm/string/ffs.S:1.6 src/common/lib/libc/arch/arm/string/ffs.S:1.7 --- src/common/lib/libc/arch/arm/string/ffs.S:1.6 Mon Sep 30 13:07:51 2013 +++ src/common/lib/libc/arch/arm/string/ffs.S Thu Jan 23 11:45:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs.S,v 1.6 2013/09/30 13:07:51 skrll Exp $ */ +/* $NetBSD: ffs.S,v 1.7 2014/01/23 11:45:46 martin Exp $ */ /* * Copyright (c) 2001 Christopher Gilbert * All rights reserved. @@ -30,7 +30,7 @@ #include machine/asm.h -RCSID($NetBSD: ffs.S,v 1.6 2013/09/30 13:07:51 skrll Exp $) +RCSID($NetBSD: ffs.S,v 1.7 2014/01/23 11:45:46 martin Exp $) /* * ffs - find first set bit, this algorithm isolates the first set @@ -44,7 +44,7 @@ RCSID($NetBSD: ffs.S,v 1.6 2013/09/30 1 * This is the ffs algorithm devised by d.seal and posted to comp.sys.arm on * 16 Feb 1994. */ -WEAK_ALIAS(__ffssi2,ffs) +STRONG_ALIAS(__ffssi2,ffs) #if (defined(_ARM_ARCH_5) !defined(__thumb__)) || defined(_ARM_ARCH_T2) #if defined(_ARM_ARCH_T2) ENTRY(ffs)
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: hkenken
Date: Thu Jan 23 12:23:20 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: NETWALKER
src/sys/arch/evbarm/netwalker: netwalker_machdep.c
Log Message:
use ukbd_cnattach()
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/NETWALKER
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/netwalker/netwalker_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/evbarm/conf/NETWALKER
diff -u src/sys/arch/evbarm/conf/NETWALKER:1.21 src/sys/arch/evbarm/conf/NETWALKER:1.22
--- src/sys/arch/evbarm/conf/NETWALKER:1.21 Sun Jun 30 21:38:56 2013
+++ src/sys/arch/evbarm/conf/NETWALKER Thu Jan 23 12:23:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: NETWALKER,v 1.21 2013/06/30 21:38:56 rmind Exp $
+# $NetBSD: NETWALKER,v 1.22 2014/01/23 12:23:20 hkenken Exp $
#
# NETWALKER -- http://www.sharp.co.jp/netwalker/
#
@@ -172,7 +172,7 @@ tzic0 at axi? addr 0xe000 size 0x40
imxuart0 at axi? addr 0x73fbc000 irq 31 # UART1
#imxuart1 at axi? addr 0x73fc irq 32
#imxuart2 at axi? addr 0x7000c000 irq 33
-options IMXUARTCONSOLE
+#options IMXUARTCONSOLE
# Clock Control
imxccm0 at axi? addr 0x73fd4000
Index: src/sys/arch/evbarm/netwalker/netwalker_machdep.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.11 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.12
--- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.11 Sun Aug 18 15:58:21 2013
+++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Thu Jan 23 12:23:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netwalker_machdep.c,v 1.11 2013/08/18 15:58:21 matt Exp $ */
+/* $NetBSD: netwalker_machdep.c,v 1.12 2014/01/23 12:23:20 hkenken Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,7 +102,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netwalker_machdep.c,v 1.11 2013/08/18 15:58:21 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: netwalker_machdep.c,v 1.12 2014/01/23 12:23:20 hkenken Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -113,6 +113,8 @@ __KERNEL_RCSID(0, $NetBSD: netwalker_ma
#include imxuart.h
#include opt_imxuart.h
#include opt_imx.h
+#include opt_imx51_ipuv3.h
+#include wsdisplay.h
#include sys/param.h
#include sys/device.h
@@ -156,6 +158,11 @@ __KERNEL_RCSID(0, $NetBSD: netwalker_ma
#include arm/imx/imx51_iomuxreg.h
#include evbarm/netwalker/netwalker_reg.h
+#include ukbd.h
+#if (NUKBD 0)
+#include dev/usb/ukbdvar.h
+#endif
+
/* Kernel text starts 1MB in from the bottom of the kernel address space. */
#define KERNEL_TEXT_BASE (KERNEL_BASE + 0x0010)
#define KERNEL_VM_BASE (KERNEL_BASE + 0x0100)
@@ -1233,7 +1240,10 @@ consinit(void)
#endif
-#if (NWSDISPLAY 0) defined(IMXLCDCONSOLE)
+#if (NWSDISPLAY 0) defined(IMXIPUCONSOLE)
+#if NUKBD 0
+ ukbd_cnattach();
+#endif
{
extern void netwalker_cnattach(void);
netwalker_cnattach();
CVS commit: src/share/man/man4
Module Name:src Committed By: ryoon Date: Thu Jan 23 13:05:04 UTC 2014 Modified Files: src/share/man/man4: usb.4 Log Message: Add urndis(4), bump date, and copyright year To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/share/man/man4/usb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/usb.4 diff -u src/share/man/man4/usb.4:1.102 src/share/man/man4/usb.4:1.103 --- src/share/man/man4/usb.4:1.102 Sat Oct 26 09:16:19 2013 +++ src/share/man/man4/usb.4 Thu Jan 23 13:05:04 2014 @@ -1,6 +1,6 @@ -.\ $NetBSD: usb.4,v 1.102 2013/10/26 09:16:19 nonaka Exp $ +.\ $NetBSD: usb.4,v 1.103 2014/01/23 13:05:04 ryoon Exp $ .\ -.\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. +.\ Copyright (c) 1999-2014 The NetBSD Foundation, Inc. .\ All rights reserved. .\ .\ This code is derived from software contributed to The NetBSD Foundation @@ -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 May 30, 2012 +.Dd Jan 23, 2014 .Dt USB 4 .Os .Sh NAME @@ -139,6 +139,8 @@ Kawasaki LSI KL5KUSB101B USB Ethernet de Davicom DM9601 10/100 USB Ethernet device .It Xr url 4 Realtek RTL8150L 10/100 USB Ethernet device +.It Xr urndis 4 +USB Remote NDIS Ethernet device .El .Ss Wireless network interfaces .Bl -tag -width 12n -offset ind -compact
CVS commit: src/external/bsd/libc++/dist/libcxxrt/src
Module Name:src Committed By: joerg Date: Thu Jan 23 13:30:38 UTC 2014 Modified Files: src/external/bsd/libc++/dist/libcxxrt/src: unwind-itanium.h Log Message: Force consistent alignemnt of _Unwind_Exception with libgcc_s. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/libc++/dist/libcxxrt/src/unwind-itanium.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libc++/dist/libcxxrt/src/unwind-itanium.h diff -u src/external/bsd/libc++/dist/libcxxrt/src/unwind-itanium.h:1.1.1.2 src/external/bsd/libc++/dist/libcxxrt/src/unwind-itanium.h:1.2 --- src/external/bsd/libc++/dist/libcxxrt/src/unwind-itanium.h:1.1.1.2 Wed Dec 25 20:19:47 2013 +++ src/external/bsd/libc++/dist/libcxxrt/src/unwind-itanium.h Thu Jan 23 13:30:38 2014 @@ -80,7 +80,7 @@ struct _Unwind_Exception _Unwind_Exception_Cleanup_Fn exception_cleanup; unsigned long private_1; unsigned long private_2; - } ; + } __attribute__((__aligned__)); extern _Unwind_Reason_Code _Unwind_RaiseException (struct _Unwind_Exception *); extern _Unwind_Reason_Code _Unwind_ForcedUnwind (struct _Unwind_Exception *,
CVS commit: src/external/bsd/openpam/dist/lib
Module Name:src Committed By: joerg Date: Thu Jan 23 13:41:58 UTC 2014 Modified Files: src/external/bsd/openpam/dist/lib: openpam_log.c Log Message: Apply diagnostic overwrite for clang too. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openpam/dist/lib/openpam_log.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/openpam/dist/lib/openpam_log.c diff -u src/external/bsd/openpam/dist/lib/openpam_log.c:1.7 src/external/bsd/openpam/dist/lib/openpam_log.c:1.8 --- src/external/bsd/openpam/dist/lib/openpam_log.c:1.7 Mon Jan 20 01:15:03 2014 +++ src/external/bsd/openpam/dist/lib/openpam_log.c Thu Jan 23 13:41:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: openpam_log.c,v 1.7 2014/01/20 01:15:03 christos Exp $ */ +/* $NetBSD: openpam_log.c,v 1.8 2014/01/23 13:41:58 joerg Exp $ */ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. @@ -96,7 +96,7 @@ openpam_log(int level, const char *fmt, #else -#if __GNUC_PREREQ__(4, 5) +#if defined(__clang__) || __GNUC_PREREQ__(4, 5) #pragma GCC diagnostic ignored -Wformat-nonliteral #endif void
CVS commit: src/external/bsd/ntp/lib
Module Name:src
Committed By: joerg
Date: Thu Jan 23 14:06:28 UTC 2014
Modified Files:
src/external/bsd/ntp/lib/libiscntp: Makefile
src/external/bsd/ntp/lib/libntp: Makefile
Log Message:
Support LLVM build.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/lib/libiscntp/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/lib/libntp/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/bsd/ntp/lib/libiscntp/Makefile
diff -u src/external/bsd/ntp/lib/libiscntp/Makefile:1.7 src/external/bsd/ntp/lib/libiscntp/Makefile:1.8
--- src/external/bsd/ntp/lib/libiscntp/Makefile:1.7 Mon Jan 20 01:37:53 2014
+++ src/external/bsd/ntp/lib/libiscntp/Makefile Thu Jan 23 14:06:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/01/20 01:37:53 christos Exp $
+# $NetBSD: Makefile,v 1.8 2014/01/23 14:06:28 joerg Exp $
LIBISPRIVATE=yes
@@ -43,7 +43,7 @@ SRCS= assertions.c \
time.c \
sockaddr.c
-.if defined(HAVE_GCC) ${HAVE_GCC} 45
+.if !defined(HAVE_GCC) || ${HAVE_GCC} = 45
COPTS.log.c+= -Wno-error=format-nonliteral
.endif
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.9 src/external/bsd/ntp/lib/libntp/Makefile:1.10
--- src/external/bsd/ntp/lib/libntp/Makefile:1.9 Mon Jan 20 01:32:12 2014
+++ src/external/bsd/ntp/lib/libntp/Makefile Thu Jan 23 14:06:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/01/20 01:32:12 christos Exp $
+# $NetBSD: Makefile,v 1.10 2014/01/23 14:06:28 joerg Exp $
LIBISPRIVATE=yes
@@ -77,7 +77,7 @@ ymd2yd.c
CPPFLAGS+= -I${IDIST}/sntp/libopts
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45
+.if !defined(HAVE_GCC) || ${HAVE_GCC} = 45
COPTS.msyslog.c+= -Wno-error=format-nonliteral
.endif
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Jan 23 14:12:38 UTC 2014 Modified Files: src/share/man/man4: usb.4 Log Message: Spell out month name. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/share/man/man4/usb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/usb.4 diff -u src/share/man/man4/usb.4:1.103 src/share/man/man4/usb.4:1.104 --- src/share/man/man4/usb.4:1.103 Thu Jan 23 13:05:04 2014 +++ src/share/man/man4/usb.4 Thu Jan 23 14:12:38 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: usb.4,v 1.103 2014/01/23 13:05:04 ryoon Exp $ +.\ $NetBSD: usb.4,v 1.104 2014/01/23 14:12:38 wiz Exp $ .\ .\ Copyright (c) 1999-2014 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 Jan 23, 2014 +.Dd January 23, 2014 .Dt USB 4 .Os .Sh NAME
CVS commit: src/external/bsd/tmux/dist
Module Name:src Committed By: joerg Date: Thu Jan 23 14:14:23 UTC 2014 Modified Files: src/external/bsd/tmux/dist: log.c Log Message: Unbreak clang build. Hi xtos. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tmux/dist/log.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/tmux/dist/log.c diff -u src/external/bsd/tmux/dist/log.c:1.5 src/external/bsd/tmux/dist/log.c:1.6 --- src/external/bsd/tmux/dist/log.c:1.5 Mon Jan 20 02:08:27 2014 +++ src/external/bsd/tmux/dist/log.c Thu Jan 23 14:14:23 2014 @@ -1,4 +1,4 @@ -/* $Id: log.c,v 1.5 2014/01/20 02:08:27 christos Exp $ */ +/* $Id: log.c,v 1.6 2014/01/23 14:14:23 joerg Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott n...@users.sourceforge.net @@ -108,7 +108,7 @@ log_vwrite(int pri, const char *msg, va_ #if __GNUC_PREREQ__(4, 6) || defined(__clang__) #pragma GCC diagnostic push #endif -#if __GNUC_PREREQ__(4, 5) +#if __GNUC_PREREQ__(4, 5) || defined(__clang__) #pragma GCC diagnostic ignored -Wformat-nonliteral #endif void printflike1
CVS commit: src/usr.bin/vndcompress
Module Name:src
Committed By: joerg
Date: Thu Jan 23 14:17:05 UTC 2014
Modified Files:
src/usr.bin/vndcompress: offtab.c
Log Message:
Mark offtab_bug[x] as dead.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/vndcompress/offtab.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/vndcompress/offtab.c
diff -u src/usr.bin/vndcompress/offtab.c:1.9 src/usr.bin/vndcompress/offtab.c:1.10
--- src/usr.bin/vndcompress/offtab.c:1.9 Wed Jan 22 14:25:07 2014
+++ src/usr.bin/vndcompress/offtab.c Thu Jan 23 14:17:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: offtab.c,v 1.9 2014/01/22 14:25:07 riastradh Exp $ */
+/* $NetBSD: offtab.c,v 1.10 2014/01/23 14:17:05 joerg Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: offtab.c,v 1.9 2014/01/22 14:25:07 riastradh Exp $);
+__RCSID($NetBSD: offtab.c,v 1.10 2014/01/23 14:17:05 joerg Exp $);
#include sys/types.h
#include sys/endian.h
@@ -49,14 +49,14 @@ __RCSID($NetBSD: offtab.c,v 1.9 2014/01
#include offtab.h
-static void __printflike(1,2)
+static void __printflike(1,2) __dead
offtab_bug(const char *fmt, ...)
{
errx(1, bug in offtab, please report);
}
-static void __printflike(1,2)
+static void __printflike(1,2) __dead
offtab_bugx(const char *fmt, ...)
{
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Jan 23 15:17:59 UTC 2014 Modified Files: src/share/man/man4: igmafb.4 Log Message: New sentence, new line. Sort sections. Remove superfluous Pp. Add missing .El. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/igmafb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/igmafb.4 diff -u src/share/man/man4/igmafb.4:1.1 src/share/man/man4/igmafb.4:1.2 --- src/share/man/man4/igmafb.4:1.1 Tue Jan 21 16:12:56 2014 +++ src/share/man/man4/igmafb.4 Thu Jan 23 15:17:59 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: igmafb.4,v 1.1 2014/01/21 16:12:56 mlelstv Exp $ +.\ $NetBSD: igmafb.4,v 1.2 2014/01/23 15:17:59 wiz Exp $ .\ .\ Copyright (c) 2014 Michael van Elst .\ @@ -40,8 +40,9 @@ driver. Currently .Nm configures the display for the integrated panel in notebooks -and can control the backlight. Automatic detection of the -main display on desktop machines may or may not work. +and can control the backlight. +Automatic detection of the main display on desktop machines may or +may not work. .Pp Supported hardware includes: .Bl -bullet -compact @@ -63,19 +64,20 @@ HD (Westmere) HD2000/3000 (Sandy Bridge) .It HD2500/4000 (Ivy Bridge) -.Pp +.El .Sh SEE ALSO .Xr genfb 4 , .Xr wsdisplay 4 -.Sh BUGS -The driver conflicts with -.Xr genfb 4 , -.Xr agp 4 , and thus with -.Xr drm 4 . -Support for a hardware cursor is missing. .Sh AUTHORS .An -nosplit The .Nm driver was written by .An Michael van Elst . +.Sh BUGS +The driver conflicts with +.Xr genfb 4 , +.Xr agp 4 , +and thus with +.Xr drm 4 . +Support for a hardware cursor is missing.
CVS commit: src/share/man/man9
Module Name:src Committed By: skrll Date: Thu Jan 23 16:35:20 UTC 2014 Modified Files: src/share/man/man9: pcu.9 Log Message: Fix eraseo from yesterday To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/pcu.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/pcu.9 diff -u src/share/man/man9/pcu.9:1.3 src/share/man/man9/pcu.9:1.4 --- src/share/man/man9/pcu.9:1.3 Wed Jan 22 23:43:13 2014 +++ src/share/man/man9/pcu.9 Thu Jan 23 16:35:20 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: pcu.9,v 1.3 2014/01/22 23:43:13 skrll Exp $ +.\ $NetBSD: pcu.9,v 1.4 2014/01/23 16:35:20 skrll Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -89,7 +89,7 @@ Save the specified PCU state to the give Discard the specified PCU state of the current LWP. .It Fn pcu_used_p Return true if PCU was used (i.e. -.Fn pcu_loa +.Fn pcu_load was called) by the LWP. Otherwise, return false. .It Fn pcu_save_all
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Jan 23 17:21:06 UTC 2014
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
Add entry for Intel Quark X1000 UART.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/pci/pucdata.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/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.90 src/sys/dev/pci/pucdata.c:1.91
--- src/sys/dev/pci/pucdata.c:1.90 Mon Jan 20 01:10:38 2014
+++ src/sys/dev/pci/pucdata.c Thu Jan 23 17:21:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.90 2014/01/20 01:10:38 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.91 2014/01/23 17:21:06 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.90 2014/01/20 01:10:38 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.91 2014/01/23 17:21:06 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1877,6 +1877,15 @@ const struct puc_device_description puc_
},
},
+ /* Intel Quark X1000 UART */
+ { Intel Quark X1000 UART,
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X1000_HS_UART, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, 44236800 },
+ },
+ },
+
/* Intel S1200 UART */
{ Intel S1200 UART,
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_S1200_UART, 0, 0 },
CVS commit: src/sys/kern
Module Name:src
Committed By: skrll
Date: Thu Jan 23 17:32:03 UTC 2014
Modified Files:
src/sys/kern: subr_pcu.c
Log Message:
Pass PCU_LOADED to pcu_state_load in the this CPU already has our PCU
state loaded of pcu_load.
ok, gimpy@ and rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/kern/subr_pcu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_pcu.c
diff -u src/sys/kern/subr_pcu.c:1.16 src/sys/kern/subr_pcu.c:1.17
--- src/sys/kern/subr_pcu.c:1.16 Tue Nov 26 20:29:40 2013
+++ src/sys/kern/subr_pcu.c Thu Jan 23 17:32:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pcu.c,v 1.16 2013/11/26 20:29:40 rmind Exp $ */
+/* $NetBSD: subr_pcu.c,v 1.17 2014/01/23 17:32:03 skrll Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_pcu.c,v 1.16 2013/11/26 20:29:40 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_pcu.c,v 1.17 2014/01/23 17:32:03 skrll Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -352,7 +352,10 @@ pcu_load(const pcu_ops_t *pcu)
/* Does this CPU already have our PCU state loaded? */
if (ci == curci) {
KASSERT(curci-ci_pcu_curlwp[id] == l);
- pcu-pcu_state_load(l, PCU_ENABLE); /* Re-enable */
+ KASSERT(pcu_used_p(pcu));
+
+ /* Re-enable */
+ pcu-pcu_state_load(l, PCU_LOADED | PCU_ENABLE);
splx(s);
return;
}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Jan 23 17:43:28 UTC 2014
Modified Files:
src/sys/dev/pci: puccn.c
Log Message:
Add comments and KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/puccn.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/puccn.c
diff -u src/sys/dev/pci/puccn.c:1.11 src/sys/dev/pci/puccn.c:1.12
--- src/sys/dev/pci/puccn.c:1.11 Mon Jul 22 13:40:36 2013
+++ src/sys/dev/pci/puccn.c Thu Jan 23 17:43:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: puccn.c,v 1.11 2013/07/22 13:40:36 soren Exp $ */
+/* $NetBSD: puccn.c,v 1.12 2014/01/23 17:43:28 msaitoh Exp $ */
/*
* Derived from pci.c
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puccn.c,v 1.11 2013/07/22 13:40:36 soren Exp $);
+__KERNEL_RCSID(0, $NetBSD: puccn.c,v 1.12 2014/01/23 17:43:28 msaitoh Exp $);
#include opt_kgdb.h
@@ -106,8 +106,7 @@ pucprobe_doit(struct consdev *cn)
puctag = pa.pa_iot;
pci_decompose_tag(pa.pa_pc, pa.pa_tag, bus, maxdev, NULL);
- /* scan through devices */
-
+ /* Scan through devices and find a communication class device. */
for (; dev = maxdev ; dev++) {
pa.pa_tag = pci_make_tag(pa.pa_pc, bus, dev, 0);
reg = pci_conf_read(pa.pa_pc, pa.pa_tag, PCI_ID_REG);
@@ -139,17 +138,30 @@ resume_scan:
func = 0;
}
+
+ /*
+ * If all devices was scanned and couldn't find any communication
+ * device, return with 0.
+ */
if (!foundport)
return 0;
foundport = 0;
+ /* Check whether the device is in the puc device table or not */
desc = puc_find_description(PCI_VENDOR(pa.pa_id),
PCI_PRODUCT(pa.pa_id), PCI_VENDOR(subsys), PCI_PRODUCT(subsys));
+
+ /* If not, check the next communication device */
if (desc == NULL) {
+ /* Resume from the next function */
func++;
goto resume_scan;
}
+ /*
+ * We found a device and it's on the puc table. Set the tag and
+ * the base address.
+ */
for (i = 0; PUC_PORT_VALID(desc, i); i++)
{
if (desc-ports[i].type != PUC_PORT_TYPE_COM)
@@ -182,15 +194,17 @@ void comgdbinit(struct consdev *);
void
comgdbprobe(struct consdev *cn)
{
+
pucgdbbase = pucprobe_doit(cn);
}
void
comgdbinit(struct consdev *cn)
{
- if (pucgdbbase == 0) {
+
+ if (pucgdbbase == 0)
return;
- }
+
com_kgdb_attach(puctag, pucgdbbase, CONSPEED, COM_FREQ,
COM_TYPE_NORMAL, CONMODE);
}
@@ -199,15 +213,16 @@ comgdbinit(struct consdev *cn)
void
comcnprobe(struct consdev *cn)
{
+
puccnbase = pucprobe_doit(cn);
}
void
comcninit(struct consdev *cn)
{
- if (puccnbase == 0) {
+ if (puccnbase == 0)
return;
- }
+
comcnattach(puctag, puccnbase, CONSPEED, COM_FREQ, COM_TYPE_NORMAL,
CONMODE);
}
CVS commit: src/sys/arch/arm
Module Name:src Committed By: skrll Date: Thu Jan 23 17:44:13 UTC 2014 Modified Files: src/sys/arch/arm/include: vfpreg.h src/sys/arch/arm/vfp: vfp_init.c Log Message: Fix typo in #define name To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/include/vfpreg.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/vfp/vfp_init.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/include/vfpreg.h diff -u src/sys/arch/arm/include/vfpreg.h:1.10 src/sys/arch/arm/include/vfpreg.h:1.11 --- src/sys/arch/arm/include/vfpreg.h:1.10 Fri Aug 2 01:59:00 2013 +++ src/sys/arch/arm/include/vfpreg.h Thu Jan 23 17:44:13 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vfpreg.h,v 1.10 2013/08/02 01:59:00 matt Exp $ */ +/* $NetBSD: vfpreg.h,v 1.11 2014/01/23 17:44:13 skrll Exp $ */ /* * Copyright (c) 2008 ARM Ltd @@ -78,7 +78,7 @@ #define VFP_FPEXC_OFF 0x0004 /* Potential overflow flag */ #define VFP_FPEXC_DZF 0x0002 /* Potential DivByZero flag */ #define VFP_FPEXC_IOF 0x0001 /* Potential inv. op. flag */ -#define VFP_FPEXE_FSUM 0x00ff /* all flag bits */ +#define VFP_FPEXC_FSUM 0x00ff /* all flag bits */ #define VFP_FPSCR_N 0x8000 /* set if compare = result */ #define VFP_FPSCR_Z 0x4000 /* set if compare = result */ Index: src/sys/arch/arm/vfp/vfp_init.c diff -u src/sys/arch/arm/vfp/vfp_init.c:1.30 src/sys/arch/arm/vfp/vfp_init.c:1.31 --- src/sys/arch/arm/vfp/vfp_init.c:1.30 Tue Jan 21 12:47:20 2014 +++ src/sys/arch/arm/vfp/vfp_init.c Thu Jan 23 17:44:13 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vfp_init.c,v 1.30 2014/01/21 12:47:20 skrll Exp $ */ +/* $NetBSD: vfp_init.c,v 1.31 2014/01/23 17:44:13 skrll Exp $ */ /* * Copyright (c) 2008 ARM Ltd @@ -413,7 +413,7 @@ vfp_handler(u_int address, u_int insn, t * Need the clear the exception condition so any signal * can run. */ - armreg_fpexc_write(fpexc ~(VFP_FPEXC_EX|VFP_FPEXE_FSUM)); + armreg_fpexc_write(fpexc ~(VFP_FPEXC_EX|VFP_FPEXC_FSUM)); KSI_INIT_TRAP(ksi); ksi.ksi_signo = SIGFPE;
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: njoly
Date: Thu Jan 23 19:18:08 UTC 2014
Modified Files:
src/sys/compat/linux/common: linux_sched.c
Log Message:
Fix inverted pid/lid arguments in do_sched_{get,set}param calls.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/compat/linux/common/linux_sched.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_sched.c
diff -u src/sys/compat/linux/common/linux_sched.c:1.65 src/sys/compat/linux/common/linux_sched.c:1.66
--- src/sys/compat/linux/common/linux_sched.c:1.65 Thu Aug 18 02:26:38 2011
+++ src/sys/compat/linux/common/linux_sched.c Thu Jan 23 19:18:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sched.c,v 1.65 2011/08/18 02:26:38 christos Exp $ */
+/* $NetBSD: linux_sched.c,v 1.66 2014/01/23 19:18:08 njoly Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.65 2011/08/18 02:26:38 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.66 2014/01/23 19:18:08 njoly Exp $);
#include sys/param.h
#include sys/mount.h
@@ -418,7 +418,7 @@ linux_sys_sched_setparam(struct lwp *l,
goto out;
/* We need the current policy in Linux terms. */
- error = do_sched_getparam(0, SCARG(uap, pid), policy, NULL);
+ error = do_sched_getparam(SCARG(uap, pid), 0, policy, NULL);
if (error)
goto out;
error = sched_native2linux(policy, NULL, policy, NULL);
@@ -429,7 +429,7 @@ linux_sys_sched_setparam(struct lwp *l,
if (error)
goto out;
- error = do_sched_setparam(0, SCARG(uap, pid), policy, sp);
+ error = do_sched_setparam(SCARG(uap, pid), 0, policy, sp);
if (error)
goto out;
@@ -453,7 +453,7 @@ linux_sys_sched_getparam(struct lwp *l,
goto out;
}
- error = do_sched_getparam(0, SCARG(uap, pid), policy, sp);
+ error = do_sched_getparam(SCARG(uap, pid), 0, policy, sp);
if (error)
goto out;
DPRINTF((%s: native: policy %d, priority %d\n,
@@ -502,7 +502,7 @@ linux_sys_sched_setscheduler(struct lwp
DPRINTF((%s: native: policy %d, priority %d\n,
__func__, policy, sp.sched_priority));
- error = do_sched_setparam(0, SCARG(uap, pid), policy, sp);
+ error = do_sched_setparam(SCARG(uap, pid), 0, policy, sp);
if (error)
goto out;
@@ -520,7 +520,7 @@ linux_sys_sched_getscheduler(struct lwp
*retval = -1;
- error = do_sched_getparam(0, SCARG(uap, pid), policy, NULL);
+ error = do_sched_getparam(SCARG(uap, pid), 0, policy, NULL);
if (error)
goto out;
CVS commit: src/sys/arch
Module Name:src
Committed By: matt
Date: Thu Jan 23 19:26:55 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_space.c
src/sys/arch/evbarm/cubie: cubie_machdep.c cubie_start.S
Log Message:
Add a few small changes so that the CUBIEBOARDs can run big endian.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/allwinner/awin_space.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/cubie/cubie_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/cubie/cubie_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_space.c
diff -u src/sys/arch/arm/allwinner/awin_space.c:1.1 src/sys/arch/arm/allwinner/awin_space.c:1.2
--- src/sys/arch/arm/allwinner/awin_space.c:1.1 Wed Sep 4 02:39:01 2013
+++ src/sys/arch/arm/allwinner/awin_space.c Thu Jan 23 19:26:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_space.c,v 1.1 2013/09/04 02:39:01 matt Exp $ */
+/* $NetBSD: awin_space.c,v 1.2 2014/01/23 19:26:55 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_space.c,v 1.1 2013/09/04 02:39:01 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_space.c,v 1.2 2014/01/23 19:26:55 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -48,6 +48,12 @@ bs_protos(bs_notimpl);
bs_protos(generic);
bs_protos(generic_armv4);
+#if __ARMEB__
+#define NSWAP(n) n ## _swap
+#else
+#define NSWAP(n) n
+#endif
+
struct bus_space awin_bs_tag = {
/* cookie */
(void *) 0,
@@ -72,38 +78,38 @@ struct bus_space awin_bs_tag = {
/* read (single) */
generic_bs_r_1,
- generic_armv4_bs_r_2,
- generic_bs_r_4,
+ NSWAP(generic_armv4_bs_r_2),
+ NSWAP(generic_bs_r_4),
bs_notimpl_bs_r_8,
/* read multiple */
generic_bs_rm_1,
- generic_armv4_bs_rm_2,
- generic_bs_rm_4,
+ NSWAP(generic_armv4_bs_rm_2),
+ NSWAP(generic_bs_rm_4),
bs_notimpl_bs_rm_8,
/* read region */
generic_bs_rr_1,
- generic_armv4_bs_rr_2,
- generic_bs_rr_4,
+ NSWAP(generic_armv4_bs_rr_2),
+ NSWAP(generic_bs_rr_4),
bs_notimpl_bs_rr_8,
/* write (single) */
generic_bs_w_1,
- generic_armv4_bs_w_2,
- generic_bs_w_4,
+ NSWAP(generic_armv4_bs_w_2),
+ NSWAP(generic_bs_w_4),
bs_notimpl_bs_w_8,
/* write multiple */
generic_bs_wm_1,
- generic_armv4_bs_wm_2,
- generic_bs_wm_4,
+ NSWAP(generic_armv4_bs_wm_2),
+ NSWAP(generic_bs_wm_4),
bs_notimpl_bs_wm_8,
/* write region */
generic_bs_wr_1,
- generic_armv4_bs_wr_2,
- generic_bs_wr_4,
+ NSWAP(generic_armv4_bs_wr_2),
+ NSWAP(generic_bs_wr_4),
bs_notimpl_bs_wr_8,
/* set multiple */
@@ -114,7 +120,7 @@ struct bus_space awin_bs_tag = {
/* set region */
generic_bs_sr_1,
- generic_armv4_bs_sr_2,
+ NSWAP(generic_armv4_bs_sr_2),
bs_notimpl_bs_sr_4,
bs_notimpl_bs_sr_8,
@@ -127,38 +133,38 @@ struct bus_space awin_bs_tag = {
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
/* read (single) */
generic_bs_r_1,
- generic_armv4_bs_r_2,
- generic_bs_r_4,
+ NSWAP(generic_armv4_bs_r_2),
+ NSWAP(generic_bs_r_4),
bs_notimpl_bs_r_8,
/* read multiple */
generic_bs_rm_1,
- generic_armv4_bs_rm_2,
- generic_bs_rm_4,
+ NSWAP(generic_armv4_bs_rm_2),
+ NSWAP(generic_bs_rm_4),
bs_notimpl_bs_rm_8,
/* read region */
generic_bs_rr_1,
- generic_armv4_bs_rr_2,
- generic_bs_rr_4,
+ NSWAP(generic_armv4_bs_rr_2),
+ NSWAP(generic_bs_rr_4),
bs_notimpl_bs_rr_8,
/* write (single) */
generic_bs_w_1,
- generic_armv4_bs_w_2,
- generic_bs_w_4,
+ NSWAP(generic_armv4_bs_w_2),
+ NSWAP(generic_bs_w_4),
bs_notimpl_bs_w_8,
/* write multiple */
generic_bs_wm_1,
- generic_armv4_bs_wm_2,
- generic_bs_wm_4,
+ NSWAP(generic_armv4_bs_wm_2),
+ NSWAP(generic_bs_wm_4),
bs_notimpl_bs_wm_8,
/* write region */
generic_bs_wr_1,
- generic_armv4_bs_wr_2,
- generic_bs_wr_4,
+ NSWAP(generic_armv4_bs_wr_2),
+ NSWAP(generic_bs_wr_4),
bs_notimpl_bs_wr_8,
#endif
};
Index: src/sys/arch/evbarm/cubie/cubie_machdep.c
diff -u src/sys/arch/evbarm/cubie/cubie_machdep.c:1.8 src/sys/arch/evbarm/cubie/cubie_machdep.c:1.9
--- src/sys/arch/evbarm/cubie/cubie_machdep.c:1.8 Mon Sep 9 17:54:38 2013
+++ src/sys/arch/evbarm/cubie/cubie_machdep.c Thu Jan 23 19:26:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cubie_machdep.c,v 1.8 2013/09/09 17:54:38 matt Exp $ */
+/* $NetBSD: cubie_machdep.c,v 1.9 2014/01/23 19:26:55 matt Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.8 2013/09/09 17:54:38 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.9 2014/01/23 19:26:55 matt Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -358,7 +358,12 @@ initarm(void *arg)
#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
const bool mapallmem_p = true;
- KASSERT(ram_size = KERNEL_VM_BASE - KERNEL_BASE);
+ if (ram_size KERNEL_VM_BASE - KERNEL_BASE) {
+
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: matt
Date: Thu Jan 23 19:28:47 UTC 2014
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
For armv7, CPU_CONTROL_UNAL_ENABLE is MBO/SBPO.
Make sure CPU_CONTROL_EX_BEND is set for big endian kernels.
Don't clear bits we aren't setting.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/arch/arm/arm/cpufunc.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/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.135 src/sys/arch/arm/arm/cpufunc.c:1.136
--- src/sys/arch/arm/arm/cpufunc.c:1.135 Tue Jan 21 19:05:10 2014
+++ src/sys/arch/arm/arm/cpufunc.c Thu Jan 23 19:28:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.135 2014/01/21 19:05:10 christos Exp $ */
+/* $NetBSD: cpufunc.c,v 1.136 2014/01/23 19:28:47 matt Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.135 2014/01/21 19:05:10 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.136 2014/01/23 19:28:47 matt Exp $);
#include opt_compat_netbsd.h
#include opt_cpuoptions.h
@@ -3051,7 +3051,12 @@ armv7_setup(char *args)
{
int cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_IC_ENABLE
- | CPU_CONTROL_DC_ENABLE | CPU_CONTROL_BPRD_ENABLE ;
+ | CPU_CONTROL_DC_ENABLE | CPU_CONTROL_BPRD_ENABLE
+#ifdef __ARMEB__
+ | CPU_CONTROL_EX_BEND
+#endif
+ | CPU_CONTROL_UNAL_ENABLE;
+
#if 0
int cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE
| CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
@@ -3061,7 +3066,6 @@ armv7_setup(char *args)
#endif
#ifdef ARM32_DISABLE_ALIGNMENT_FAULTS
- cpuctrl |= CPU_CONTROL_UNAL_ENABLE;
#else
cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
#endif
@@ -3078,7 +3082,7 @@ armv7_setup(char *args)
/* Set the control register */
curcpu()-ci_ctrl = cpuctrl;
- cpu_control(0x, cpuctrl);
+ cpu_control(cpuctrl, cpuctrl);
}
#endif /* CPU_CORTEX */
CVS commit: src/sys/arch/arm/conf
Module Name:src Committed By: martin Date: Thu Jan 23 20:58:55 UTC 2014 Modified Files: src/sys/arch/arm/conf: Makefile.arm Log Message: Compile the armv4 cpufunc file with -mcpu=arm8 instead of arm9, to avoid an armv4t marked object file which causes failure in the shark objcopy step when creating the a.out version of the kernel. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/conf/Makefile.arm 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/conf/Makefile.arm diff -u src/sys/arch/arm/conf/Makefile.arm:1.40 src/sys/arch/arm/conf/Makefile.arm:1.41 --- src/sys/arch/arm/conf/Makefile.arm:1.40 Sat Jan 4 01:33:11 2014 +++ src/sys/arch/arm/conf/Makefile.arm Thu Jan 23 20:58:55 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.arm,v 1.40 2014/01/04 01:33:11 joerg Exp $ +# $NetBSD: Makefile.arm,v 1.41 2014/01/23 20:58:55 martin Exp $ # Makefile for NetBSD # @@ -47,7 +47,7 @@ CFLAGS+= -mfloat-abi=soft # This files use instructions deprecated for ARMv7+, but still # included in kernel that build with higher -mcpu=... settings. -CPPFLAGS.cpufunc_asm_armv4.S+= -mcpu=arm9 +CPPFLAGS.cpufunc_asm_armv4.S+= -mcpu=arm8 CPPFLAGS.cpufunc_asm_armv6.S+= -mcpu=arm1136j-s CPPFLAGS.cpufunc_asm_arm11.S+= -mcpu=arm1136j-s CPPFLAGS.cpufunc_asm_xscale.S+= -mcpu=xscale
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: jklos Date: Thu Jan 23 21:37:09 UTC 2014 Modified Files: src/sys/arch/vax/include: param.h Log Message: Removed MAXBSIZE. Cleared with Anders Magnusson and tested myself. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/vax/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/include/param.h diff -u src/sys/arch/vax/include/param.h:1.60 src/sys/arch/vax/include/param.h:1.61 --- src/sys/arch/vax/include/param.h:1.60 Tue Jan 24 20:03:38 2012 +++ src/sys/arch/vax/include/param.h Thu Jan 23 21:37:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.60 2012/01/24 20:03:38 christos Exp $*/ +/* $NetBSD: param.h,v 1.61 2014/01/23 21:37:09 jklos Exp $*/ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -62,7 +62,6 @@ #define BLKDEV_IOSIZE 2048 #define MAXPHYS (64 * 1024) /* max raw I/O transfer size */ -#define MAXBSIZE 0x4000 /* max FS block size - XXX */ #define UPAGES 2 /* pages of u-area */ #define USPACE (NBPG*UPAGES)
CVS commit: src/distrib/sets
Module Name:src
Committed By: apb
Date: Thu Jan 23 21:45:27 UTC 2014
Modified Files:
src/distrib/sets: Makefile
Log Message:
Remove time= keywords from METALOG.sanitised.
The times add unnecessary differences to the DESTDIR trees for MKREPRO
builds, and they are not needed by anything. (maketars, the chief
consumer of METALOG.sanitised, explicitly ignores the time fields.)
Also factor out some duplicated code and update comments.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/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/sets/Makefile
diff -u src/distrib/sets/Makefile:1.91 src/distrib/sets/Makefile:1.92
--- src/distrib/sets/Makefile:1.91 Thu Jan 16 01:15:33 2014
+++ src/distrib/sets/Makefile Thu Jan 23 21:45:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2014/01/16 01:15:33 christos Exp $
+# $NetBSD: Makefile,v 1.92 2014/01/23 21:45:27 apb Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -101,19 +101,25 @@ list_set_files_base list_set_files_x lis
# MKUNPRIVED flag.
#
# The sanitise_METALOG target creates METALOG.sanitised from METALOG,
-# without modifying METALOG itself. METALOG.sanitised is sorted, and
-# has duplicates merged. This is used near the end of a build, after
-# build products have been installed in DESTDIR and corresponding lines
-# have been added to METALOG, but before METALOG.sanitised is used in
-# the creation of sets in RELEASEDIR.
+# without modifying METALOG itself. This is used near the end of
+# a build, after build products have been installed in DESTDIR
+# and corresponding lines have been added to METALOG, but before
+# METALOG.sanitised is used in the creation of sets in RELEASEDIR.
+# For update builds, METALOG.sanitised has duplicates merged (keeping
+# only the last of multiple entries for the same item), but for clean
+# builds it's an error if a file or directory name appears twice.
+# METALOG.sanitised is always sorted and has timestamps removed.
#
-# The clean_METALOG either deletes METALOG or replaces METALOG with
+# The clean_METALOG target either deletes METALOG, or replaces METALOG with
# a sanitised version of itself, depending on the MKUPDATE flag, and
# deletes old METALOG.* files. This is intended to be used at the start
# of a build, to ensure that repeated MKUPDATE builds do not cause
# unbounded growth of METALOG.
#
+METALOG_REMOVE_DUPLICATES= \
+ ${TOOL_AWK} '{ a[$$1] = $$0; } END { for (f in a) print a[f]; }'
+
.if ${MKUNPRIVED} == no
METALOG.unpriv=
sanitise_METALOG: .PHONY
@@ -124,17 +130,10 @@ clean_METALOG: .PHONY
METALOG.unpriv= -M ${METALOG}.sanitised
sanitise_METALOG: .PHONY ${METALOG}.sanitised
${METALOG}.sanitised: ${METALOG}
-# We keep only the last entry for update builds, but for clean builds we
-# want to make sure we install files only once.
-.if ${MKUPDATE} != no
- ${TOOL_AWK} \
- '{ a[$$1] = $$0; } END { for (f in a) print a[f]; }' ${METALOG} | \
- sort | ${TOOL_MTREE} -CSM -k all -N ${NETBSDSRCDIR}/etc \
- ${METALOG}.new
-.else
- sort ${METALOG} | ${TOOL_MTREE} -CSM -k all -N ${NETBSDSRCDIR}/etc \
+ ${METALOG} \
+ ${${MKUPDATE} != no :? ${METALOG_REMOVE_DUPLICATES} | :} \
+ sort | ${TOOL_MTREE} -CSM -k all -R time -N ${NETBSDSRCDIR}/etc \
${METALOG}.new
-.endif
mv ${METALOG}.new ${METALOG}.sanitised
.if defined(RCSMETALOG)
. ./metalog.subr; \
CVS commit: src/distrib/notes/common
Module Name:src Committed By: szptvlfn Date: Thu Jan 23 22:52:15 UTC 2014 Modified Files: src/distrib/notes/common: main Log Message: + szptvlfn. To generate a diff of this commit: cvs rdiff -u -r1.501 -r1.502 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.501 src/distrib/notes/common/main:1.502 --- src/distrib/notes/common/main:1.501 Fri Jan 17 00:19:25 2014 +++ src/distrib/notes/common/main Thu Jan 23 22:52:15 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.501 2014/01/17 00:19:25 hkenken Exp $ +.\ $NetBSD: main,v 1.502 2014/01/23 22:52:15 szptvlfn Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1300,6 +1300,7 @@ If you're one of them, and would like to .It Ta Brook Milligan Ta Mt br...@netbsd.org .It Ta Minoura Makoto Ta Mt mino...@netbsd.org .It Ta Simas Mockevicius Ta Mt sy...@netbsd.org +.It Ta Ryosuke Moro Ta Mt szptv...@netbsd.org .It Ta der Mouse Ta Mt mo...@netbsd.org .It Ta Constantine A. Murenin Ta Mt c...@netbsd.org .It Ta Joseph Myers Ta Mt j...@netbsd.org
CVS commit: src/usr.bin/xlint/arch/mips64
Module Name:src Committed By: christos Date: Fri Jan 24 00:17:33 UTC 2014 Modified Files: src/usr.bin/xlint/arch/mips64: targparam.h Log Message: Checking _LP64 to determine the size of the built binary is just wrong. We build n32 by default on mips64 now, we don't handle the compat build which is n64. This is the same case for sparc64/sparc and amd64/i386 (lint does not run in compat) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/xlint/arch/mips64/targparam.h 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/xlint/arch/mips64/targparam.h diff -u src/usr.bin/xlint/arch/mips64/targparam.h:1.4 src/usr.bin/xlint/arch/mips64/targparam.h:1.5 --- src/usr.bin/xlint/arch/mips64/targparam.h:1.4 Thu Mar 29 04:52:31 2012 +++ src/usr.bin/xlint/arch/mips64/targparam.h Thu Jan 23 19:17:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: targparam.h,v 1.4 2012/03/29 08:52:31 macallan Exp $ */ +/* $NetBSD: targparam.h,v 1.5 2014/01/24 00:17:33 christos Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl @@ -35,11 +35,9 @@ * Machine-dependent target parameters for lint1. */ #include schar.h -#ifdef _LP64 -#include lp64.h -#else +// This is for __mips_n32 #include ilp32.h -#endif + /* * Should be set to 1 if the difference of two pointers is of type long * or the value of sizeof is of type unsigned long. Note this MUST be
CVS commit: src/lib/libc/compat/arch/alpha/gen
Module Name:src Committed By: christos Date: Fri Jan 24 00:20:54 UTC 2014 Modified Files: src/lib/libc/compat/arch/alpha/gen: compat__setjmp.S Log Message: remove bogus comment, we are not working around an assembler issue. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/alpha/gen/compat__setjmp.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/compat/arch/alpha/gen/compat__setjmp.S diff -u src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S:1.2 src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S:1.3 --- src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S:1.2 Wed Jan 22 22:08:50 2014 +++ src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S Thu Jan 23 19:20:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: compat__setjmp.S,v 1.2 2014/01/23 03:08:50 christos Exp $ */ +/* $NetBSD: compat__setjmp.S,v 1.3 2014/01/24 00:20:54 christos Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -54,7 +54,6 @@ LEAF(_setjmp, 1) stq s6, ((15 + 4) * 8)(a0) stq ra, ((26 + 4) * 8)(a0) stq sp, ((30 + 4) * 8)(a0) - /* work around assembler issue */ ldq t0, magic /* sigcontext magic number */ stq t0, ((31 + 4) * 8)(a0) /* magic in sc_regs[31] */ /* Too bad we can't check if we actually used FP */ @@ -91,7 +90,6 @@ END(_setjmp) LEAF(_longjmp, 2) LDGP(pv) ldq t0, ((31 + 4) * 8)(a0) /* magic in sc_regs[31] */ - /* work around assembler issue */ ldq t0, magic /* sigcontext magic number */ cmpeq t0, t1, t0 beq t0, botch /* If the magic was bad, punt */
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Fri Jan 24 01:09:40 UTC 2014 Modified Files: src/distrib/sets/lists/debug: ad.mips Log Message: fix typo To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/debug/ad.mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/ad.mips diff -u src/distrib/sets/lists/debug/ad.mips:1.18 src/distrib/sets/lists/debug/ad.mips:1.19 --- src/distrib/sets/lists/debug/ad.mips:1.18 Thu Jan 16 19:13:13 2014 +++ src/distrib/sets/lists/debug/ad.mips Thu Jan 23 20:09:40 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.18 2014/01/17 00:13:13 riz Exp $ +# $NetBSD: ad.mips,v 1.19 2014/01/24 01:09:40 christos Exp $ ./usr/lib/64/libcrypto_g.a comp-c-debuglib compat,crypto,debuglib,arch64 ./usr/lib/64/libcrypto_idea_g.a comp-obsolete obsolete ./usr/lib/64/libcrypto_mdc2_g.a comp-obsolete obsolete @@ -274,7 +274,7 @@ ./usr/libdata/debug/usr/lib/o32/libgmp.so.10.2.debug comp-sys-debug obsolete ./usr/libdata/debug/usr/lib/o32/libgnumalloc.so.1.0.debug comp-sys-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libgomp.so.1.0.debug comp-sys-debug debug,compat,gcc=45,arch64 -./usr/libdata/debug/usr/lib/o32/libgomp.so.1.0.debug comp-sys-debug debug,compat,gcc=48,arch64 +./usr/libdata/debug/usr/lib/o32/libgomp.so.1.1.debug comp-sys-debug debug,compat,gcc=48,arch64 ./usr/libdata/debug/usr/lib/o32/libgssapi.so.10.0.debug comp-compat-shlib compat,pic,kerberos,debug,arch64 ./usr/libdata/debug/usr/lib/o32/libgssapi.so.9.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete,arch64 ./usr/libdata/debug/usr/lib/o32/libhdb.so.13.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete,arch64
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Fri Jan 24 01:10:00 UTC 2014 Modified Files: src/distrib/sets/lists/debug: md.evbmips Log Message: add debuglibs To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug/md.evbmips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/md.evbmips diff -u src/distrib/sets/lists/debug/md.evbmips:1.2 src/distrib/sets/lists/debug/md.evbmips:1.3 --- src/distrib/sets/lists/debug/md.evbmips:1.2 Wed Jan 16 16:11:07 2013 +++ src/distrib/sets/lists/debug/md.evbmips Thu Jan 23 20:09:59 2014 @@ -1 +1,272 @@ -# $NetBSD: md.evbmips,v 1.2 2013/01/16 21:11:07 christos Exp $ +#$NetBSD: md.evbmips,v 1.3 2014/01/24 01:09:59 christos Exp $ +./usr/lib/64/i18n/libBIG5_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libDECHanyu_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libEUCTW_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libEUC_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libGBK2K_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libHZ_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libISO2022_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libJOHAB_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libMSKanji_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libUES_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libUTF1632_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libUTF7_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libUTF8_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libVIQR_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libZW_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libiconv_none_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libiconv_std_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libmapper_646_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libmapper_none_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libmapper_parallel_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libmapper_serial_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libmapper_std_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/i18n/libmapper_zone_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libamu_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libarchive_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libasn1_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libatf-c++_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libatf-c_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libbfd_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libbind9_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libbluetooth_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libbsdmalloc_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libbz2_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libc_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libcom_err_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libcompat_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libcrypt_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libcurses_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libdes_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libdns_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libdns_sd_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libdwarf_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libedit_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libelf_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libevent_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libevent_openssl_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libevent_pthreads_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libexecinfo_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libexpat_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libfetch_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libfl_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libform_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libgcc_eh_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libgcc_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libgcc_s_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libgcov_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libgnumalloc_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libgssapi_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libhdb_g.a comp-c-debuglib compat,debuglib,arch64 +./usr/lib/64/libheimntlm_g.a comp-c-debuglib compat,debuglib,arch64
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: christos Date: Fri Jan 24 01:10:22 UTC 2014 Modified Files: src/distrib/sets/lists/xdebug: md.evbmips Log Message: add missing library To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/md.evbmips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xdebug/md.evbmips diff -u src/distrib/sets/lists/xdebug/md.evbmips:1.3 src/distrib/sets/lists/xdebug/md.evbmips:1.4 --- src/distrib/sets/lists/xdebug/md.evbmips:1.3 Fri Feb 8 10:13:04 2013 +++ src/distrib/sets/lists/xdebug/md.evbmips Thu Jan 23 20:10:22 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbmips,v 1.3 2013/02/08 15:13:04 christos Exp $ +# $NetBSD: md.evbmips,v 1.4 2014/01/24 01:10:22 christos Exp $ ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg @@ -6,6 +6,7 @@ ./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/libexa_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: hkenken Date: Fri Jan 24 02:06:03 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: files.netwalker src/sys/arch/evbarm/netwalker: netwalker_machdep.c Log Message: use initarm_common() To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/files.netwalker cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/netwalker/netwalker_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/evbarm/conf/files.netwalker diff -u src/sys/arch/evbarm/conf/files.netwalker:1.3 src/sys/arch/evbarm/conf/files.netwalker:1.4 --- src/sys/arch/evbarm/conf/files.netwalker:1.3 Tue Apr 17 10:19:57 2012 +++ src/sys/arch/evbarm/conf/files.netwalker Fri Jan 24 02:06:03 2014 @@ -1,8 +1,12 @@ -# $NetBSD: files.netwalker,v 1.3 2012/04/17 10:19:57 bsh Exp $ +# $NetBSD: files.netwalker,v 1.4 2014/01/24 02:06:03 hkenken Exp $ # # Sharp Netwalker # +file arch/arm/arm32/arm32_boot.c +file arch/arm/arm32/arm32_kvminit.c +file arch/arm/arm32/arm32_reboot.c + file arch/evbarm/netwalker/netwalker_machdep.c # Kernel boot arguments Index: src/sys/arch/evbarm/netwalker/netwalker_machdep.c diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.12 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.13 --- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.12 Thu Jan 23 12:23:20 2014 +++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Fri Jan 24 02:06:03 2014 @@ -1,7 +1,7 @@ -/* $NetBSD: netwalker_machdep.c,v 1.12 2014/01/23 12:23:20 hkenken Exp $ */ +/* $NetBSD: netwalker_machdep.c,v 1.13 2014/01/24 02:06:03 hkenken Exp $ */ /* - * Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation. + * Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation. * All rights reserved. * Written by Hiroyuki Bessho for Genetec Corporation. * @@ -102,12 +102,10 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netwalker_machdep.c,v 1.12 2014/01/23 12:23:20 hkenken Exp $); +__KERNEL_RCSID(0, $NetBSD: netwalker_machdep.c,v 1.13 2014/01/24 02:06:03 hkenken Exp $); #include opt_ddb.h #include opt_kgdb.h -#include opt_ipkdb.h -#include opt_pmap_debug.h #include opt_md.h #include opt_com.h #include imxuart.h @@ -118,35 +116,16 @@ __KERNEL_RCSID(0, $NetBSD: netwalker_ma #include sys/param.h #include sys/device.h -#include sys/systm.h -#include sys/kernel.h -#include sys/exec.h -#include sys/proc.h -#include sys/msgbuf.h -#include sys/reboot.h #include sys/termios.h -#include sys/ksyms.h #include sys/bus.h -#include sys/cpu.h -#include sys/conf.h - -#include uvm/uvm_extern.h - -#include dev/cons.h -#include dev/md.h #include machine/db_machdep.h -#include ddb/db_sym.h -#include ddb/db_extern.h #ifdef KGDB #include sys/kgdb.h #endif #include machine/bootconfig.h -#include arm/locore.h -#include arm/undefined.h -#include arm/arm32/pte.h #include arm/arm32/machdep.h #include arm/imx/imx51reg.h @@ -174,38 +153,13 @@ __KERNEL_RCSID(0, $NetBSD: netwalker_ma #define KERNEL_VM_SIZE 0x0C00 BootConfig bootconfig; /* Boot config storage */ +static char bootargs[MAX_BOOT_STRING]; char *boot_args = NULL; -char *boot_file = NULL; - -vm_offset_t physical_start; -vm_offset_t physical_freestart; -vm_offset_t physical_freeend; -vm_offset_t physical_end; -u_int free_pages; -vm_offset_t pagetables_start; - -/*int debug_flags;*/ -#ifndef PMAP_STATIC_L1S -int max_processes = 64; /* Default number */ -#endif /* !PMAP_STATIC_L1S */ - -vm_offset_t msgbufphys; extern char KERNEL_BASE_phys[]; extern char KERNEL_BASE_virt[]; -extern char etext[], __data_start[], _edata[], __bss_start[], __bss_end__[]; -extern char _end[]; -extern int cpu_do_powersave; - -#define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ -#define KERNEL_PT_KERNEL 1 /* Page table for mapping kernel */ -#define KERNEL_PT_KERNEL_NUM 4 -#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL+KERNEL_PT_KERNEL_NUM) -/* Page tables for mapping kernel VM */ -#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */ -#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM) -pv_addr_t kernel_pt_table[NUM_KERNEL_PTS]; +extern int cpu_do_powersave; /* * Macros to translate between physical and virtual for a subset of the @@ -222,22 +176,13 @@ pv_addr_t kernel_pt_table[NUM_KERNEL_PTS /* Prototypes */ void consinit(void); -#if 0 -void process_kernel_args(char *); -#endif #ifdef KGDB void kgdb_port_init(void); #endif -void change_clock(uint32_t v); static void init_clocks(void); static void setup_ioports(void); -#ifdef DEBUG_IOPORTS -void dump_registers(void); -#endif - -bs_protos(bs_notimpl); #ifndef CONSPEED #define CONSPEED B115200 /* What RedBoot uses */ @@ -250,76 +195,6 @@ int comcnspeed = CONSPEED; int comcnmode = CONMODE; /* - * void cpu_reboot(int howto, char *bootstr) - * - * Reboots the system - * - *
CVS commit: src/sys/arch/evbarm/bcm53xx
Module Name:src
Committed By: matt
Date: Fri Jan 24 04:15:33 UTC 2014
Modified Files:
src/sys/arch/evbarm/bcm53xx: bcm53xx_start.S
Log Message:
After loading the pc-relative offset, clear the upper the 4 bits incase
.start starts at a different address than .text (bcm56340).
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.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/evbarm/bcm53xx/bcm53xx_start.S
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.9 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.10
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.9 Tue Dec 24 21:59:59 2013
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S Fri Jan 24 04:15:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_start.S,v 1.9 2013/12/24 21:59:59 matt Exp $ */
+/* $NetBSD: bcm53xx_start.S,v 1.10 2014/01/24 04:15:33 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -45,7 +45,7 @@
#define CONADDR 0x18000300
#endif
-RCSID($NetBSD: bcm53xx_start.S,v 1.9 2013/12/24 21:59:59 matt Exp $)
+RCSID($NetBSD: bcm53xx_start.S,v 1.10 2014/01/24 04:15:33 matt Exp $)
#undef VERBOSE_INIT_ARM
#define VERBOSE_INIT_ARM
@@ -76,6 +76,7 @@ _C_LABEL(bcm53xx_start):
*/
movw r4, #:lower16:(uboot_args-.LPIC0)
movt r4, #:upper16:(uboot_args-.LPIC0)
+ bic r4, r4, #0xf000
add r4, r4, pc
stmia r4, {r0-r3}
.LPIC0:
CVS commit: src/sys/arch/evbarm/cubie
Module Name:src Committed By: matt Date: Fri Jan 24 04:19:10 UTC 2014 Modified Files: src/sys/arch/evbarm/cubie: cubie_start.S Log Message: Replace copyright with TNF Clear upper 4 bits of pc-relative offset for uboot_args since .start is 1GB below .text so we can access using the load address, not the KERNEL_BASE address. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/cubie/cubie_start.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/evbarm/cubie/cubie_start.S diff -u src/sys/arch/evbarm/cubie/cubie_start.S:1.3 src/sys/arch/evbarm/cubie/cubie_start.S:1.4 --- src/sys/arch/evbarm/cubie/cubie_start.S:1.3 Thu Jan 23 19:26:55 2014 +++ src/sys/arch/evbarm/cubie/cubie_start.S Fri Jan 24 04:19:10 2014 @@ -1,9 +1,9 @@ -/* - * Machine dependent startup code for BEAGLEBOARD boards. - * Based on omap_start.S +/*- + * Copyright (c) 2014 The NetBSD Foundation, Inc. + * All rights reserved. * - * Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved. - * Written by Hiroyuki Bessho for Genetec Corporation. + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -13,14 +13,11 @@ * 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. - * 3. The name of Genetec Corporation may not be used to endorse or - *promote products derived from this software without specific prior - *written permission. * - * THIS SOFTWARE IS PROVIDED BY GENETEC CORPORATION ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * 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 GENETEC CORPORATION + * 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 @@ -28,58 +25,6 @@ * 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. - * - * Copyright (c) 2003 - * Ichiro FUKUHARA ich...@ichiro.org. - * 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 ICHIRO FUKUHARA ``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 ICHIRO FUKUHARA OR THE VOICES IN HIS HEAD 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. - * - * Copyright (c) 2007 Microsoft - * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Microsoft - * - *
CVS commit: src/sys/arch/evbarm/cubie
Module Name:src Committed By: matt Date: Fri Jan 24 05:13:06 UTC 2014 Modified Files: src/sys/arch/evbarm/cubie: cubie_start.S Log Message: Add a flag so the xputc will bswap registers. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/cubie/cubie_start.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/evbarm/cubie/cubie_start.S diff -u src/sys/arch/evbarm/cubie/cubie_start.S:1.4 src/sys/arch/evbarm/cubie/cubie_start.S:1.5 --- src/sys/arch/evbarm/cubie/cubie_start.S:1.4 Fri Jan 24 04:19:10 2014 +++ src/sys/arch/evbarm/cubie/cubie_start.S Fri Jan 24 05:13:06 2014 @@ -40,13 +40,12 @@ #include arm/allwinner/awin_reg.h #include evbarm/cubie/platform.h -RCSID($NetBSD: cubie_start.S,v 1.4 2014/01/24 04:19:10 matt Exp $) +RCSID($NetBSD: cubie_start.S,v 1.5 2014/01/24 05:13:06 matt Exp $) #if defined(VERBOSE_INIT_ARM) -#ifdef __ARMEB__ -#define XPUTC(n) mov r0, n 24; bl xputc -#else #define XPUTC(n) mov r0, n; bl xputc +#ifdef __ARMEB__ +#define COM_BSWAP #endif #define COM_MULT 4 #define XPUTC_COM 1
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: matt Date: Fri Jan 24 05:14:11 UTC 2014 Modified Files: src/sys/arch/arm/cortex: a9_mpsubr.S Log Message: Deal with writing bswapped com registers at COM_MULT register widths. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/cortex/a9_mpsubr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/cortex/a9_mpsubr.S diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.11 src/sys/arch/arm/cortex/a9_mpsubr.S:1.12 --- src/sys/arch/arm/cortex/a9_mpsubr.S:1.11 Thu Dec 26 00:19:07 2013 +++ src/sys/arch/arm/cortex/a9_mpsubr.S Fri Jan 24 05:14:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: a9_mpsubr.S,v 1.11 2013/12/26 00:19:07 joerg Exp $ */ +/* $NetBSD: a9_mpsubr.S,v 1.12 2014/01/24 05:14:11 matt Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -227,16 +227,51 @@ xputc: mov r2, #TIMO ldr r3, .Luart0 -1: ldrb r1, [r3, #(COM_LSR*COM_MULT)] +1: +#if COM_MULT == 1 + ldrb r1, [r3, #(COM_LSR*COM_MULT)] +#else +#if COM_MULT == 2 + ldrh r1, [r3, #(COM_LSR*COM_MULT)] +#elif COM_MULT == 4 + ldr r1, [r3, #(COM_LSR*COM_MULT)] +#endif +#ifdef COM_BSWAP + lsr r1, r1, #(COM_MULT-1)*8 +#endif +#endif tst r1, #LSR_TXRDY bne 2f subs r2, r2, #1 bne 1b 2: +#if COM_MULT == 1 strb r0, [r3, #COM_DATA] +#else +#ifdef COM_BSWAP + lsl r0, r0, #(COM_MULT-1)*8 +#endif +#if COM_MULT == 2 + strh r0, [r3, #COM_DATA] +#else + str r0, [r3, #COM_DATA] +#endif +#endif mov r2, #TIMO -3: ldrb r1, [r3, #(COM_LSR*COM_MULT)] +3: +#if COM_MULT == 1 + ldrb r1, [r3, #(COM_LSR*COM_MULT)] +#else +#if COM_MULT == 2 + ldrh r1, [r3, #(COM_LSR*COM_MULT)] +#elif COM_MULT == 4 + ldr r1, [r3, #(COM_LSR*COM_MULT)] +#endif +#ifdef COM_BSWAP + lsr r1, r1, #(COM_MULT-1)*8 +#endif +#endif tst r1, #LSR_TSRE bne 4f subs r2, r2, #1
