CVS commit: src/external/bsd/ntp/dist/libntp
Module Name:src Committed By: christos Date: Fri Jul 17 15:17:07 UTC 2015 Modified Files: src/external/bsd/ntp/dist/libntp: work_fork.c Log Message: PR/50048: Martin Husemann: Avoid reaping the child twice by setting c-pid = 0 after the wait. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libntp/work_fork.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/ntp/dist/libntp/work_fork.c diff -u src/external/bsd/ntp/dist/libntp/work_fork.c:1.5 src/external/bsd/ntp/dist/libntp/work_fork.c:1.6 --- src/external/bsd/ntp/dist/libntp/work_fork.c:1.5 Fri Jul 10 10:20:32 2015 +++ src/external/bsd/ntp/dist/libntp/work_fork.c Fri Jul 17 11:17:07 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: work_fork.c,v 1.5 2015/07/10 14:20:32 christos Exp $ */ +/* $NetBSD: work_fork.c,v 1.6 2015/07/17 15:17:07 christos Exp $ */ /* * work_fork.c - fork implementation for blocking worker child. @@ -128,6 +128,7 @@ harvest_child_status( if (waitpid(c-pid, NULL, 0) == c-pid) TRACE(4, (harvested child %d\n, c-pid)); else msyslog(LOG_ERR, error waiting on child %d: %m, c-pid); + c-pid = 0; } } @@ -164,7 +165,6 @@ cleanup_after_child( close(c-resp_read_pipe); c-resp_read_pipe = -1; } - c-pid = 0; c-resp_read_ctx = NULL; DEBUG_INSIST(-1 == c-req_read_pipe); DEBUG_INSIST(-1 == c-resp_write_pipe);
CVS commit: src/external/bsd/ntp/dist/libntp
Module Name:src Committed By: christos Date: Fri Jul 17 15:17:07 UTC 2015 Modified Files: src/external/bsd/ntp/dist/libntp: work_fork.c Log Message: PR/50048: Martin Husemann: Avoid reaping the child twice by setting c-pid = 0 after the wait. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libntp/work_fork.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Jul 17 15:24:27 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: gcc-5.2 out. To generate a diff of this commit: cvs rdiff -u -r1.1236 -r1.1237 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1236 src/doc/3RDPARTY:1.1237 --- src/doc/3RDPARTY:1.1236 Fri Jul 10 15:28:01 2015 +++ src/doc/3RDPARTY Fri Jul 17 15:24:27 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1236 2015/07/10 15:28:01 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1237 2015/07/17 15:24:27 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -421,7 +421,7 @@ There is a flex2netbsd script to help ne Package: gcc Version: 4.8.5 -Current Vers: 4.8.5/5.1 +Current Vers: 4.8.5/5.2 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/gcc/ Home Page: http://www.gnu.org/software/gcc/
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Jul 17 15:24:27 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: gcc-5.2 out. To generate a diff of this commit: cvs rdiff -u -r1.1236 -r1.1237 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src
Committed By: mrg
Date: Fri Jul 17 06:40:49 UTC 2015
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
mkfontscale.c demands a PACKAGE_STRING now. set it to NetBSD tools version
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/mkfontscale/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/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.4 src/external/mit/xorg/tools/mkfontscale/Makefile:1.5
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.4 Wed Aug 10 10:34:48 2011
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Fri Jul 17 06:40:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/10 10:34:48 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/17 06:40:49 mrg Exp $
NOMAN= 1
@@ -83,7 +83,8 @@ LDADD= -lz
HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
- -DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\
+ -DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\ \
+ -DPACKAGE_STRING=\NetBSD\ tools\ version\
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Fri Jul 17 06:45:55 UTC 2015 Modified Files: src/share/man/man9: vnode.9 Log Message: Trailing whitespace, begone! To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/share/man/man9/vnode.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Fri Jul 17 06:45:55 UTC 2015 Modified Files: src/share/man/man9: vnode.9 Log Message: Trailing whitespace, begone! To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/share/man/man9/vnode.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/vnode.9 diff -u src/share/man/man9/vnode.9:1.69 src/share/man/man9/vnode.9:1.70 --- src/share/man/man9/vnode.9:1.69 Sun Jul 12 08:11:27 2015 +++ src/share/man/man9/vnode.9 Fri Jul 17 06:45:55 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: vnode.9,v 1.69 2015/07/12 08:11:27 hannken Exp $ +.\ $NetBSD: vnode.9,v 1.70 2015/07/17 06:45:55 wiz Exp $ .\ .\ Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -692,8 +692,8 @@ is the mount point for the file system t resides in. .Pp The arguments -.Fa old_key -and +.Fa old_key +and .Fa old_key_len identify the cached vnode. .Pp @@ -718,8 +718,8 @@ The argument is the mount point for the file system this file resides in. .Pp The arguments -.Fa key -and +.Fa key +and .Fa key_len uniquely identify the file in the file system. .It Fn vrecycle vp
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: msaitoh
Date: Fri Jul 17 06:41:18 UTC 2015
Modified Files:
src/sys/arch/x86/x86: ioapic.c lapic.c mpacpi.c mpbios.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/x86/ioapic.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/x86/x86/lapic.c
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/x86/x86/mpacpi.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x86/x86/mpbios.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/x86/ioapic.c
diff -u src/sys/arch/x86/x86/ioapic.c:1.50 src/sys/arch/x86/x86/ioapic.c:1.51
--- src/sys/arch/x86/x86/ioapic.c:1.50 Mon Apr 27 07:03:58 2015
+++ src/sys/arch/x86/x86/ioapic.c Fri Jul 17 06:41:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ioapic.c,v 1.50 2015/04/27 07:03:58 knakahara Exp $ */
+/* $NetBSD: ioapic.c,v 1.51 2015/07/17 06:41:18 msaitoh Exp $ */
/*-
* Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ioapic.c,v 1.50 2015/04/27 07:03:58 knakahara Exp $);
+__KERNEL_RCSID(0, $NetBSD: ioapic.c,v 1.51 2015/07/17 06:41:18 msaitoh Exp $);
#include opt_ddb.h
@@ -305,7 +305,8 @@ ioapic_attach(device_t parent, device_t
sc-sc_pic.pic_edge_stubs = ioapic_edge_stubs;
sc-sc_pic.pic_level_stubs = ioapic_level_stubs;
- apic_id = (ioapic_read(sc,IOAPIC_ID)IOAPIC_ID_MASK)IOAPIC_ID_SHIFT;
+ apic_id = (ioapic_read(sc, IOAPIC_ID) IOAPIC_ID_MASK)
+ IOAPIC_ID_SHIFT;
ver_sz = ioapic_read(sc, IOAPIC_VER);
if (ver_sz == 0x) {
@@ -376,19 +377,19 @@ ioapic_attach(device_t parent, device_t
aprint_debug_dev(sc-sc_dev, misconfigured as apic %d\n,
apic_id);
- ioapic_write(sc,IOAPIC_ID,
- (ioapic_read(sc,IOAPIC_ID)~IOAPIC_ID_MASK)
- |(sc-sc_pic.pic_apicidIOAPIC_ID_SHIFT));
+ ioapic_write(sc, IOAPIC_ID,
+ (ioapic_read(sc, IOAPIC_ID) ~IOAPIC_ID_MASK)
+ | (sc-sc_pic.pic_apicid IOAPIC_ID_SHIFT));
- apic_id = (ioapic_read(sc,IOAPIC_ID)IOAPIC_ID_MASK)IOAPIC_ID_SHIFT;
+ apic_id = (ioapic_read(sc, IOAPIC_ID) IOAPIC_ID_MASK)
+ IOAPIC_ID_SHIFT;
- if (apic_id != sc-sc_pic.pic_apicid) {
- aprint_error_dev(sc-sc_dev, can't remap to apid %d\n,
- sc-sc_pic.pic_apicid);
- } else {
+ if (apic_id != sc-sc_pic.pic_apicid)
+ aprint_error_dev(sc-sc_dev,
+ can't remap to apid %d\n, sc-sc_pic.pic_apicid);
+ else
aprint_debug_dev(sc-sc_dev, remapped to apic %d\n,
sc-sc_pic.pic_apicid);
- }
}
out:
@@ -426,7 +427,8 @@ apic_set_redir(struct ioapic_softc *sc,
} else {
redhi = (ci-ci_cpuid IOAPIC_REDHI_DEST_SHIFT);
redlo |= (idt_vec 0xff);
- redlo |= (IOAPIC_REDLO_DEL_FIXEDIOAPIC_REDLO_DEL_SHIFT);
+ redlo |= IOAPIC_REDLO_DEL_FIXED
+ IOAPIC_REDLO_DEL_SHIFT;
redlo = ~IOAPIC_REDLO_DSTMOD;
/* XXX derive this bit from BIOS info */
@@ -434,7 +436,8 @@ apic_set_redir(struct ioapic_softc *sc,
redlo |= IOAPIC_REDLO_LEVEL;
else
redlo = ~IOAPIC_REDLO_LEVEL;
- if (map != NULL ((map-flags 3) == MPS_INTPO_DEF)) {
+ if ((map != NULL)
+ ((map-flags 3) == MPS_INTPO_DEF)) {
if (pp-ip_type == IST_LEVEL)
redlo |= IOAPIC_REDLO_ACTLO;
else
@@ -480,17 +483,17 @@ ioapic_reenable(void)
aprint_normal(%s reenabling\n, device_xname(ioapics-sc_dev));
for (sc = ioapics; sc != NULL; sc = sc-sc_next) {
- apic_id = (ioapic_read(sc,IOAPIC_ID)IOAPIC_ID_MASK)IOAPIC_ID_SHIFT;
+ apic_id = (ioapic_read(sc, IOAPIC_ID) IOAPIC_ID_MASK)
+ IOAPIC_ID_SHIFT;
if (apic_id != sc-sc_pic.pic_apicid) {
- ioapic_write(sc,IOAPIC_ID,
- (ioapic_read(sc,IOAPIC_ID)~IOAPIC_ID_MASK)
- |(sc-sc_pic.pic_apicidIOAPIC_ID_SHIFT));
+ ioapic_write(sc, IOAPIC_ID,
+ (ioapic_read(sc, IOAPIC_ID) ~IOAPIC_ID_MASK)
+ | (sc-sc_pic.pic_apicid IOAPIC_ID_SHIFT));
}
- for (p = 0; p sc-sc_apic_sz; p++) {
+ for (p = 0; p sc-sc_apic_sz; p++)
apic_set_redir(sc, p, sc-sc_pins[p].ip_vector,
sc-sc_pins[p].ip_cpu);
- }
}
ioapic_enable();
@@ -554,7 +557,6 @@ ioapic_hwunmask(struct pic *pic, int pin
static void
ioapic_addroute(struct pic *pic, struct cpu_info *ci, int pin,
int idtvec, int type)
-
{
struct ioapic_softc *sc = pic-pic_ioapic;
struct ioapic_pin *pp;
@@ -570,6 +572,7 @@ static void
ioapic_delroute(struct pic *pic, struct cpu_info *ci, int pin,
int idtvec, int type)
{
+
ioapic_hwmask(pic, pin);
}
Index: src/sys/arch/x86/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.49 src/sys/arch/x86/x86/lapic.c:1.50
--- src/sys/arch/x86/x86/lapic.c:1.49 Wed Jul 15 04:49:02 2015
+++ src/sys/arch/x86/x86/lapic.c Fri Jul 17 06:41:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.49 2015/07/15 04:49:02 msaitoh Exp $ */
+/* $NetBSD: lapic.c,v 1.50 2015/07/17 06:41:18 msaitoh Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation,
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Fri Jul 17 06:41:18 UTC 2015 Modified Files: src/sys/arch/x86/x86: ioapic.c lapic.c mpacpi.c mpbios.c Log Message: KNF. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/x86/ioapic.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/x86/x86/lapic.c cvs rdiff -u -r1.100 -r1.101 src/sys/arch/x86/x86/mpacpi.c cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x86/x86/mpbios.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src Committed By: mrg Date: Fri Jul 17 06:40:49 UTC 2015 Modified Files: src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: mkfontscale.c demands a PACKAGE_STRING now. set it to NetBSD tools version To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/iceauth/include
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 06:53:04 UTC 2015 Added Files: xsrc/external/mit/iceauth/include: config.h Log Message: iceauth wants a config.h these days. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/iceauth/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/iceauth/include
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 06:53:04 UTC 2015 Added Files: xsrc/external/mit/iceauth/include: config.h Log Message: iceauth wants a config.h these days. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/iceauth/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/iceauth/include/config.h diff -u /dev/null xsrc/external/mit/iceauth/include/config.h:1.1 --- /dev/null Fri Jul 17 06:53:04 2015 +++ xsrc/external/mit/iceauth/include/config.h Fri Jul 17 06:53:04 2015 @@ -0,0 +1,65 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the stdint.h header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the stdlib.h header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the strings.h header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the string.h header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the sys/stat.h header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the sys/types.h header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the unistd.h header file. */ +#define HAVE_UNISTD_H 1 + +/* Name of package */ +#define PACKAGE iceauth + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=xorg; + +/* Define to the full name of this package. */ +#define PACKAGE_NAME iceauth + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING iceauth 1.0.7 + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME iceauth + +/* Define to the home page for this package. */ +#define PACKAGE_URL + +/* Define to the version of this package. */ +#define PACKAGE_VERSION 1.0.7 + +/* Major version of this package */ +#define PACKAGE_VERSION_MAJOR 1 + +/* Minor version of this package */ +#define PACKAGE_VERSION_MINOR 0 + +/* Patch version of this package */ +#define PACKAGE_VERSION_PATCHLEVEL 7 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION 1.0.7
CVS commit: src/external/mit/xorg/bin/iceauth
Module Name:src
Committed By: mrg
Date: Fri Jul 17 08:29:31 UTC 2015
Modified Files:
src/external/mit/xorg/bin/iceauth: Makefile
Log Message:
look for config.h now it is needed.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/iceauth/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/bin/iceauth/Makefile
diff -u src/external/mit/xorg/bin/iceauth/Makefile:1.2 src/external/mit/xorg/bin/iceauth/Makefile:1.3
--- src/external/mit/xorg/bin/iceauth/Makefile:1.2 Sat Jul 23 06:41:08 2011
+++ src/external/mit/xorg/bin/iceauth/Makefile Fri Jul 17 08:29:31 2015
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2011/07/23 06:41:08 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/17 08:29:31 mrg Exp $
.include bsd.own.mk
PROG= iceauth
SRCS= iceauth.c process.c
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
+
LDADD+= -lICE
DPADD+= ${LIBICE}
CVS commit: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 06:57:38 UTC 2015 Modified Files: xsrc/external/mit/xproto/dist: Xpoll.h.in Log Message: move the define of FD_SETSIZE before the include of select.h, so that is actually does something useful. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xproto/dist/Xpoll.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 07:02:40 UTC 2015 Modified Files: xsrc/external/mit/xproto/dist: Xpoll.h.in Log Message: actually move ahead of all the necessary headers. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xproto/dist/Xpoll.h.in 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/xproto/dist/Xpoll.h.in diff -u xsrc/external/mit/xproto/dist/Xpoll.h.in:1.2 xsrc/external/mit/xproto/dist/Xpoll.h.in:1.3 --- xsrc/external/mit/xproto/dist/Xpoll.h.in:1.2 Fri Jul 17 06:57:38 2015 +++ xsrc/external/mit/xproto/dist/Xpoll.h.in Fri Jul 17 07:02:40 2015 @@ -54,14 +54,14 @@ from The Open Group. #ifndef USE_POLL -#include X11/Xos.h - #define XFD_SETSIZE 512 #ifndef FD_SETSIZE #define FD_SETSIZE XFD_SETSIZE #endif +#include X11/Xos.h + #include sys/select.h /* Get the FD_* macros. */ #include X11/Xmd.h
CVS commit: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 07:02:40 UTC 2015 Modified Files: xsrc/external/mit/xproto/dist: Xpoll.h.in Log Message: actually move ahead of all the necessary headers. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xproto/dist/Xpoll.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Fri Jul 17 08:30:33 UTC 2015 Modified Files: src/external/mit/xorg/bin/xfs: Makefile src/external/mit/xorg/server/xorg-server: Makefile.serverlib Log Message: define FD_SETSIZE=512, to match the new XFD_SETSIZE. something ends up including sys/select.h before Xpoll.h, and the wrong FD_SETSIZE is used in our fd_set macros, leading to fail. XXX: ugh. fix me properly. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xfs/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Fri Jul 17 08:30:33 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Log Message:
define FD_SETSIZE=512, to match the new XFD_SETSIZE. something ends up
including sys/select.h before Xpoll.h, and the wrong FD_SETSIZE is
used in our fd_set macros, leading to fail.
XXX: ugh. fix me properly.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
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/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.10 src/external/mit/xorg/bin/xfs/Makefile:1.11
--- src/external/mit/xorg/bin/xfs/Makefile:1.10 Sun Aug 24 18:27:16 2014
+++ src/external/mit/xorg/bin/xfs/Makefile Fri Jul 17 08:30:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/08/24 18:27:16 apb Exp $
+# $NetBSD: Makefile,v 1.11 2015/07/17 08:30:33 mrg Exp $
.include bsd.own.mk
@@ -24,6 +24,9 @@ CPPFLAGS+= -I${XFSDIR}/include \
-I${XFSDIR}/../include \
-DHAVE_DAEMON
+# XXX
+CPPFLAGS+= -DFD_SETSIZE=512
+
CONN_DEFINES= ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
-DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.5 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.6
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.5 Mon Dec 8 06:33:26 2014
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Fri Jul 17 08:30:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.5 2014/12/08 06:33:26 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.6 2015/07/17 08:30:33 mrg Exp $
NOLINT= 1
NOPROFILE= 1
@@ -17,6 +17,9 @@ X_BYTE_ORDER=0
CPPFLAGS+= ${X11FLAGS.SERVER}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
+# XXX
+CPPFLAGS+= -DFD_SETSIZE=512
+
.if (${MACHINE_ARCH} == sparc) || (${MACHINE_ARCH} == sparc64)
CPPFLAGS+= -D__GLX_ALIGN64
.endif
CVS commit: src/external/mit/xorg/bin/iceauth
Module Name:src Committed By: mrg Date: Fri Jul 17 08:29:31 UTC 2015 Modified Files: src/external/mit/xorg/bin/iceauth: Makefile Log Message: look for config.h now it is needed. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/iceauth/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: skrll
Date: Fri Jul 17 06:42:48 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_time.c
Log Message:
Unwrap lines.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/compat/netbsd32/netbsd32_time.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_time.c
diff -u src/sys/compat/netbsd32/netbsd32_time.c:1.43 src/sys/compat/netbsd32/netbsd32_time.c:1.44
--- src/sys/compat/netbsd32/netbsd32_time.c:1.43 Sun Jul 12 14:06:52 2015
+++ src/sys/compat/netbsd32/netbsd32_time.c Fri Jul 17 06:42:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_time.c,v 1.43 2015/07/12 14:06:52 martin Exp $ */
+/* $NetBSD: netbsd32_time.c,v 1.44 2015/07/17 06:42:48 skrll Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_time.c,v 1.43 2015/07/12 14:06:52 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_time.c,v 1.44 2015/07/17 06:42:48 skrll Exp $);
#if defined(_KERNEL_OPT)
#include opt_ntp.h
@@ -323,16 +323,13 @@ netbsd32___adjtime50(struct lwp *l, cons
atv.tv_usec += 100;
atv.tv_sec--;
}
- (void) copyout(atv,
- SCARG_P32(uap, olddelta),
- sizeof(atv));
+ (void) copyout(atv, SCARG_P32(uap, olddelta), sizeof(atv));
if (error)
return (error);
}
if (SCARG_P32(uap, delta)) {
- error = copyin(SCARG_P32(uap, delta), atv,
- sizeof(atv));
+ error = copyin(SCARG_P32(uap, delta), atv, sizeof(atv));
if (error)
return (error);
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: skrll Date: Fri Jul 17 06:42:48 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_time.c Log Message: Unwrap lines. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/compat/netbsd32/netbsd32_time.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 06:57:38 UTC 2015 Modified Files: xsrc/external/mit/xproto/dist: Xpoll.h.in Log Message: move the define of FD_SETSIZE before the include of select.h, so that is actually does something useful. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xproto/dist/Xpoll.h.in 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/xproto/dist/Xpoll.h.in diff -u xsrc/external/mit/xproto/dist/Xpoll.h.in:1.1.1.4 xsrc/external/mit/xproto/dist/Xpoll.h.in:1.2 --- xsrc/external/mit/xproto/dist/Xpoll.h.in:1.1.1.4 Fri Jul 17 01:48:13 2015 +++ xsrc/external/mit/xproto/dist/Xpoll.h.in Fri Jul 17 06:57:38 2015 @@ -56,6 +56,12 @@ from The Open Group. #include X11/Xos.h +#define XFD_SETSIZE 512 + +#ifndef FD_SETSIZE +#define FD_SETSIZE XFD_SETSIZE +#endif + #include sys/select.h /* Get the FD_* macros. */ #include X11/Xmd.h @@ -67,12 +73,6 @@ typedef long fd_mask; # endif #endif -#define XFD_SETSIZE 512 - -#ifndef FD_SETSIZE -#define FD_SETSIZE XFD_SETSIZE -#endif - #ifndef NBBY #define NBBY 8 /* number of bits in a byte */ #endif
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 17:38:55 UTC 2015 Modified Files: xsrc/external/mit/xfs/dist/os: connection.c xsrc/external/mit/xorg-server/dist/os: WaitFor.c connection.c io.c Log Message: move X11/Xpoll.h include earlier than sys/select.h to avoid missing out on setting FD_SETSIZE early enough. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xfs/dist/os/connection.c cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-server/dist/os/WaitFor.c \ xsrc/external/mit/xorg-server/dist/os/connection.c \ xsrc/external/mit/xorg-server/dist/os/io.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/xfs/dist/os/connection.c diff -u xsrc/external/mit/xfs/dist/os/connection.c:1.1.1.5 xsrc/external/mit/xfs/dist/os/connection.c:1.2 --- xsrc/external/mit/xfs/dist/os/connection.c:1.1.1.5 Wed Feb 25 20:02:39 2015 +++ xsrc/external/mit/xfs/dist/os/connection.c Fri Jul 17 17:38:55 2015 @@ -69,6 +69,7 @@ in this Software without prior written a #include config.h +#include X11/Xpoll.h #include stdlib.h #include X11/Xtrans/Xtrans.h #include stdlib.h @@ -84,7 +85,6 @@ in this Software without prior written a #include X11/fonts/FS.h #include X11/fonts/FSproto.h #include clientstr.h -#include X11/Xpoll.h #include osdep.h #include globals.h #include osstruct.h Index: xsrc/external/mit/xorg-server/dist/os/WaitFor.c diff -u xsrc/external/mit/xorg-server/dist/os/WaitFor.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/os/WaitFor.c:1.2 --- xsrc/external/mit/xorg-server/dist/os/WaitFor.c:1.1.1.4 Tue Aug 2 06:57:04 2011 +++ xsrc/external/mit/xorg-server/dist/os/WaitFor.c Fri Jul 17 17:38:55 2015 @@ -54,6 +54,8 @@ SOFTWARE. * */ +#include X11/Xpoll.h + #ifdef HAVE_DIX_CONFIG_H #include dix-config.h #endif @@ -68,7 +70,6 @@ SOFTWARE. #include misc.h #include osdep.h -#include X11/Xpoll.h #include dixstruct.h #include opaque.h #ifdef DPMSExtension Index: xsrc/external/mit/xorg-server/dist/os/connection.c diff -u xsrc/external/mit/xorg-server/dist/os/connection.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/os/connection.c:1.2 --- xsrc/external/mit/xorg-server/dist/os/connection.c:1.1.1.4 Tue Aug 2 06:57:04 2011 +++ xsrc/external/mit/xorg-server/dist/os/connection.c Fri Jul 17 17:38:55 2015 @@ -61,6 +61,8 @@ SOFTWARE. * */ +#include X11/Xpoll.h + #ifdef HAVE_DIX_CONFIG_H #include dix-config.h #endif @@ -106,7 +108,6 @@ SOFTWARE. #endif /* WIN32 */ #include misc.h /* for typedef of pointer */ #include osdep.h -#include X11/Xpoll.h #include opaque.h #include dixstruct.h #include xace.h Index: xsrc/external/mit/xorg-server/dist/os/io.c diff -u xsrc/external/mit/xorg-server/dist/os/io.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/os/io.c:1.2 --- xsrc/external/mit/xorg-server/dist/os/io.c:1.1.1.4 Sun Jul 24 01:29:16 2011 +++ xsrc/external/mit/xorg-server/dist/os/io.c Fri Jul 17 17:38:55 2015 @@ -53,6 +53,8 @@ SOFTWARE. * */ +#include X11/Xpoll.h + #ifdef HAVE_DIX_CONFIG_H #include dix-config.h #endif @@ -76,7 +78,6 @@ SOFTWARE. #include X11/Xproto.h #include os.h #include osdep.h -#include X11/Xpoll.h #include opaque.h #include dixstruct.h #include misc.h
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Fri Jul 17 17:38:55 UTC 2015 Modified Files: xsrc/external/mit/xfs/dist/os: connection.c xsrc/external/mit/xorg-server/dist/os: WaitFor.c connection.c io.c Log Message: move X11/Xpoll.h include earlier than sys/select.h to avoid missing out on setting FD_SETSIZE early enough. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xfs/dist/os/connection.c cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-server/dist/os/WaitFor.c \ xsrc/external/mit/xorg-server/dist/os/connection.c \ xsrc/external/mit/xorg-server/dist/os/io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/ypserv/ypserv
Module Name:src Committed By: christos Date: Fri Jul 17 15:58:01 UTC 2015 Modified Files: src/usr.sbin/ypserv/ypserv: ypserv_proc.c Log Message: PR/50057: Wolfgang Stukenbrock: yp-map transfer removes SECURE-flag To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/ypserv/ypserv/ypserv_proc.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.sbin/ypserv/ypserv/ypserv_proc.c diff -u src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.16 src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.17 --- src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.16 Tue Aug 30 13:06:22 2011 +++ src/usr.sbin/ypserv/ypserv/ypserv_proc.c Fri Jul 17 11:58:01 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ypserv_proc.c,v 1.16 2011/08/30 17:06:22 plunky Exp $ */ +/* $NetBSD: ypserv_proc.c,v 1.17 2015/07/17 15:58:01 christos Exp $ */ /* * Copyright (c) 1994 Mats O Jansson m...@stacken.kth.se @@ -28,7 +28,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: ypserv_proc.c,v 1.16 2011/08/30 17:06:22 plunky Exp $); +__RCSID($NetBSD: ypserv_proc.c,v 1.17 2015/07/17 15:58:01 christos Exp $); #endif #include sys/stat.h @@ -166,7 +166,7 @@ ypproc_match_2_svc(void *argp, struct sv if (secure securecheck(caller)) res.status = YP_YPERR; else - res = ypdb_get_record(k-domain, k-map, k-keydat, FALSE); + res = ypdb_get_record(k-domain, k-map, k-keydat, secure); return ((void *)res); }
CVS commit: src/usr.sbin/ypserv/ypserv
Module Name:src Committed By: christos Date: Fri Jul 17 15:58:01 UTC 2015 Modified Files: src/usr.sbin/ypserv/ypserv: ypserv_proc.c Log Message: PR/50057: Wolfgang Stukenbrock: yp-map transfer removes SECURE-flag To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/ypserv/ypserv/ypserv_proc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Fri Jul 17 17:57:11 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Log Message:
don't hard code FD_SETSIZE now that the code is fine.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
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/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.11 src/external/mit/xorg/bin/xfs/Makefile:1.12
--- src/external/mit/xorg/bin/xfs/Makefile:1.11 Fri Jul 17 08:30:33 2015
+++ src/external/mit/xorg/bin/xfs/Makefile Fri Jul 17 17:57:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/07/17 08:30:33 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2015/07/17 17:57:11 mrg Exp $
.include bsd.own.mk
@@ -24,9 +24,6 @@ CPPFLAGS+= -I${XFSDIR}/include \
-I${XFSDIR}/../include \
-DHAVE_DAEMON
-# XXX
-CPPFLAGS+= -DFD_SETSIZE=512
-
CONN_DEFINES= ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \
-DTRANS_REOPEN -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.6 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.7
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.6 Fri Jul 17 08:30:33 2015
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Fri Jul 17 17:57:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.6 2015/07/17 08:30:33 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.7 2015/07/17 17:57:11 mrg Exp $
NOLINT= 1
NOPROFILE= 1
@@ -17,9 +17,6 @@ X_BYTE_ORDER=0
CPPFLAGS+= ${X11FLAGS.SERVER}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
-# XXX
-CPPFLAGS+= -DFD_SETSIZE=512
-
.if (${MACHINE_ARCH} == sparc) || (${MACHINE_ARCH} == sparc64)
CPPFLAGS+= -D__GLX_ALIGN64
.endif
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Fri Jul 17 17:57:11 UTC 2015 Modified Files: src/external/mit/xorg/bin/xfs: Makefile src/external/mit/xorg/server/xorg-server: Makefile.serverlib Log Message: don't hard code FD_SETSIZE now that the code is fine. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xfs/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/zaurus/ramdisk
Module Name:src
Committed By: martin
Date: Fri Jul 17 19:32:48 UTC 2015
Modified Files:
src/distrib/zaurus/ramdisk: Makefile
Log Message:
Bump ram disk image size slightly
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/zaurus/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/zaurus/ramdisk/Makefile
diff -u src/distrib/zaurus/ramdisk/Makefile:1.17 src/distrib/zaurus/ramdisk/Makefile:1.18
--- src/distrib/zaurus/ramdisk/Makefile:1.17 Mon Aug 4 20:20:39 2014
+++ src/distrib/zaurus/ramdisk/Makefile Fri Jul 17 19:32:48 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2014/08/04 20:20:39 martin Exp $
+# $NetBSD: Makefile,v 1.18 2015/07/17 19:32:48 martin Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2256k
+IMAGESIZE= 2350k
MAKEFS_FLAGS= -f 14
WARNS= 1
CVS commit: src/distrib/zaurus/ramdisk
Module Name:src Committed By: martin Date: Fri Jul 17 19:32:48 UTC 2015 Modified Files: src/distrib/zaurus/ramdisk: Makefile Log Message: Bump ram disk image size slightly To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/zaurus/ramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: martin Date: Fri Jul 17 19:32:24 UTC 2015 Modified Files: src/sys/arch/zaurus/conf: INSTALL Log Message: Provide a bit more space for the ram disk image To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/zaurus/conf/INSTALL 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/zaurus/conf/INSTALL diff -u src/sys/arch/zaurus/conf/INSTALL:1.24 src/sys/arch/zaurus/conf/INSTALL:1.25 --- src/sys/arch/zaurus/conf/INSTALL:1.24 Sun Aug 17 21:17:44 2014 +++ src/sys/arch/zaurus/conf/INSTALL Fri Jul 17 19:32:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.24 2014/08/17 21:17:44 joerg Exp $ +# $NetBSD: INSTALL,v 1.25 2015/07/17 19:32:24 martin Exp $ # # INSTALL config file (GENERIC with memory disk root) # @@ -9,7 +9,7 @@ include arch/zaurus/conf/GENERIC options MEMORY_DISK_HOOKS # enable root ramdisk options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=4516 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=4710 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode # for reduce kernel size.
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: martin Date: Fri Jul 17 19:32:24 UTC 2015 Modified Files: src/sys/arch/zaurus/conf: INSTALL Log Message: Provide a bit more space for the ram disk image To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/zaurus/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/zaurus/conf
martin@ wrote: Module Name: src Committed By: martin Date: Fri Jul 17 19:32:24 UTC 2015 Modified Files: src/sys/arch/zaurus/conf: INSTALL Log Message: Provide a bit more space for the ram disk image Did you check the following comment in INSTALL? # for reduce kernel size. # kernel size must be less than 5MB. # - see src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:bsdimage[] --- Izumi Tsutsui
CVS commit: [matt-nb5-mips64] src/sys/arch/evbarm/bcm53xx
Module Name:src
Committed By: matt
Date: Fri Jul 17 20:32:27 UTC 2015
Modified Files:
src/sys/arch/evbarm/bcm53xx [matt-nb5-mips64]: bcm53xx_machdep.c
Log Message:
Deal with 1GB of memory.
To generate a diff of this commit:
cvs rdiff -u -r1.7.4.3 -r1.7.4.4 \
src/sys/arch/evbarm/bcm53xx/bcm53xx_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/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.7.4.3 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.7.4.4
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.7.4.3 Wed Mar 26 02:15:02 2014
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Fri Jul 17 20:32:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.7.4.3 2014/03/26 02:15:02 matt Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.7.4.4 2015/07/17 20:32:27 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define IDM_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm53xx_machdep.c,v 1.7.4.3 2014/03/26 02:15:02 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm53xx_machdep.c,v 1.7.4.4 2015/07/17 20:32:27 matt Exp $);
#include opt_evbarm_boardtype.h
#include opt_broadcom.h
@@ -258,6 +258,20 @@ initarm(void *arg)
#endif
const bool bigmem_p = (memsize PGSHIFT) bp_first256.bp_pages;
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+ const bool mapallmem_p = true;
+#ifndef PMAP_NEED_ALLOC_POOLPAGE
+ if (memsize KERNEL_VM_BASE - KERNEL_BASE) {
+ printf(%s: dropping RAM size from %luMB to %uMB\n,
+ __func__, (unsigned long) (ram_size 20),
+ (KERNEL_VM_BASE - KERNEL_BASE) 20);
+ memsize = KERNEL_VM_BASE - KERNEL_BASE;
+ }
+#endif
+#else
+ const bool mapallmem_p = false;
+#endif
+ KASSERT((armreg_pfr1_read() ARM_PFR1_SEC_MASK) != 0);
arm32_bootmem_init(KERN_VTOPHYS(KERNEL_BASE), memsize,
(paddr_t)KERNEL_BASE_phys);
@@ -273,7 +287,8 @@ initarm(void *arg)
* abtstack, undstack, kernelstack, msgbufphys will be set to point to
* the memory that was allocated for them.
*/
- arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap, true);
+ arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap,
+ mapallmem_p);
cpu_reset_address = bcm53xx_system_reset;
/* we've a specific device_register routine */
CVS commit: [matt-nb5-mips64] src/sys/arch/evbarm/bcm53xx
Module Name:src Committed By: matt Date: Fri Jul 17 20:32:27 UTC 2015 Modified Files: src/sys/arch/evbarm/bcm53xx [matt-nb5-mips64]: bcm53xx_machdep.c Log Message: Deal with 1GB of memory. To generate a diff of this commit: cvs rdiff -u -r1.7.4.3 -r1.7.4.4 \ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Jul 18 00:57:10 UTC 2015 Added Files: src/sys/arch/evbarm/conf: CUBOX-I_INSTALL Log Message: Add install kernel for cubox-i To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/CUBOX-I_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Jul 18 00:57:10 UTC 2015 Added Files: src/sys/arch/evbarm/conf: CUBOX-I_INSTALL Log Message: Add install kernel for cubox-i To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/CUBOX-I_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/conf/CUBOX-I_INSTALL diff -u /dev/null src/sys/arch/evbarm/conf/CUBOX-I_INSTALL:1.1 --- /dev/null Sat Jul 18 00:57:10 2015 +++ src/sys/arch/evbarm/conf/CUBOX-I_INSTALL Sat Jul 18 00:57:10 2015 @@ -0,0 +1,10 @@ +# $NetBSD: CUBOX-I_INSTALL,v 1.1 2015/07/18 00:57:10 matt Exp $ +# +# CUBOX-I_INSTALL -- CUBOX-I kernel with installation-sized +# ramdisk +# + +include arch/evbarm/conf/CUBOX-I +include arch/evbarm/conf/INSTALL + +options BOOTHOWTO=RB_SINGLE
CVS commit: src/sbin/disklabel
Module Name:src Committed By: tsutsui Date: Fri Jul 17 20:30:21 UTC 2015 Modified Files: src/sbin/disklabel: bswap.c Log Message: Fix botch in make disklabel a MI tool changes in rev 1.2. After that chanage, MAXPARTITIONS constant is not for the target port. If host's MAXPARTITIONS is larger than a value of the target label and target endianness is different from the build host, bswaplabel() could overwrite data beyond the disklabel and primary boot stored after LABELSECTOR in images might be corrupted. This fixes boot failure of sun2 liveimage built by build.sh -U -m sun2 release live-image on TME. Should be pulled up to netbsd-7. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sbin/disklabel/bswap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: tsutsui
Date: Fri Jul 17 20:30:21 UTC 2015
Modified Files:
src/sbin/disklabel: bswap.c
Log Message:
Fix botch in make disklabel a MI tool changes in rev 1.2.
After that chanage, MAXPARTITIONS constant is not for the target port.
If host's MAXPARTITIONS is larger than a value of the target label and
target endianness is different from the build host, bswaplabel() could
overwrite data beyond the disklabel and primary boot stored after
LABELSECTOR in images might be corrupted.
This fixes boot failure of sun2 liveimage built by
build.sh -U -m sun2 release live-image
on TME.
Should be pulled up to netbsd-7.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/disklabel/bswap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/disklabel/bswap.c
diff -u src/sbin/disklabel/bswap.c:1.2 src/sbin/disklabel/bswap.c:1.3
--- src/sbin/disklabel/bswap.c:1.2 Fri May 3 16:05:12 2013
+++ src/sbin/disklabel/bswap.c Fri Jul 17 20:30:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap.c,v 1.2 2013/05/03 16:05:12 matt Exp $ */
+/* $NetBSD: bswap.c,v 1.3 2015/07/17 20:30:21 tsutsui Exp $ */
/*-
* Copyright (c) 2009 Izumi Tsutsui. All rights reserved.
@@ -120,7 +120,7 @@ bswaplabel(struct disklabel *nlp, const
nlp-d_bbsize = bswap32(olp-d_bbsize);
nlp-d_sbsize = bswap32(olp-d_sbsize);
- for (i = 0; i MAXPARTITIONS; i++) {
+ for (i = 0; i maxpartitions; i++) {
nlp-d_partitions[i].p_size =
bswap32(olp-d_partitions[i].p_size);
nlp-d_partitions[i].p_offset =
CVS commit: src/sys/arch/evbarm/bcm53xx
Module Name:src
Committed By: matt
Date: Fri Jul 17 20:29:29 UTC 2015
Modified Files:
src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c
Log Message:
Deal with more than 1GB of RAM.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/bcm53xx/bcm53xx_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/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.8 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.9
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.8 Sat Mar 29 14:02:46 2014
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Fri Jul 17 20:29:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.8 2014/03/29 14:02:46 matt Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.9 2015/07/17 20:29:29 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define IDM_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm53xx_machdep.c,v 1.8 2014/03/29 14:02:46 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm53xx_machdep.c,v 1.9 2015/07/17 20:29:29 matt Exp $);
#include opt_evbarm_boardtype.h
#include opt_broadcom.h
@@ -250,6 +250,20 @@ initarm(void *arg)
#endif
const bool bigmem_p = (memsize 20) 256;
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+ const bool mapallmem_p = true;
+#ifndef PMAP_NEED_ALLOC_POOLPAGE
+ if (memsize KERNEL_VM_BASE - KERNEL_BASE) {
+ printf(%s: dropping RAM size from %luMB to %uMB\n,
+ __func__, (unsigned long) (ram_size 20),
+ (KERNEL_VM_BASE - KERNEL_BASE) 20);
+ memsize = KERNEL_VM_BASE - KERNEL_BASE;
+ }
+#endif
+#else
+ const bool mapallmem_p = false;
+#endif
+ KASSERT((armreg_pfr1_read() ARM_PFR1_SEC_MASK) != 0);
arm32_bootmem_init(KERN_VTOPHYS(KERNEL_BASE), memsize,
(paddr_t)KERNEL_BASE_phys);
@@ -265,7 +279,8 @@ initarm(void *arg)
* abtstack, undstack, kernelstack, msgbufphys will be set to point to
* the memory that was allocated for them.
*/
- arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap, true);
+ arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap,
+ mapallmem_p);
cpu_reset_address = bcm53xx_system_reset;
/* we've a specific device_register routine */
Re: CVS commit: src/distrib/zaurus/ramdisk
On Jul 17, 2015, at 12:32 PM, Martin Husemann mar...@netbsd.org wrote: Module Name: src Committed By: martin Date: Fri Jul 17 19:32:48 UTC 2015 Modified Files: src/distrib/zaurus/ramdisk: Makefile Log Message: Bump ram disk image size slightly That was not needed. I successfully built the ramdisk with the current settings.
CVS commit: src/sys/arch/evbarm/bcm53xx
Module Name:src Committed By: matt Date: Fri Jul 17 20:29:29 UTC 2015 Modified Files: src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c Log Message: Deal with more than 1GB of RAM. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: matt Date: Sat Jul 18 00:57:35 UTC 2015 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: Build CUBOX-I kernels To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/etc/etc.evbarm/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/etc/etc.evbarm/Makefile.inc diff -u src/etc/etc.evbarm/Makefile.inc:1.77 src/etc/etc.evbarm/Makefile.inc:1.78 --- src/etc/etc.evbarm/Makefile.inc:1.77 Wed Jul 15 11:27:13 2015 +++ src/etc/etc.evbarm/Makefile.inc Sat Jul 18 00:57:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.77 2015/07/15 11:27:13 martin Exp $ +# $NetBSD: Makefile.inc,v 1.78 2015/07/18 00:57:35 matt Exp $ # # etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets # @@ -98,6 +98,8 @@ EVBARM_BOARDS.armv7+= CUBIEBOARD EVBARM_BOARDS.armv7hf+= CUBIEBOARD EVBARM_BOARDS.armv7+= CUBIETRUCK EVBARM_BOARDS.armv7hf+= CUBIETRUCK +EVBARM_BOARDS.armv7+= CUBOX-I +EVBARM_BOARDS.armv7hf+= CUBOX-I EVBARM_BOARDS.armv7+= HUMMINGBIRD_A31 EVBARM_BOARDS.armv7hf+= HUMMINGBIRD_A31 #EVBARM_BOARDS.armv7+= IGEPV2
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: matt Date: Sat Jul 18 00:57:35 UTC 2015 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: Build CUBOX-I kernels To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/etc/etc.evbarm/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
