CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: mrg Date: Sun Sep 23 06:05:32 UTC 2012 Modified Files: src/sys/arch/powerpc/powerpc: lock_stubs.S Log Message: correct some comments on #endif to match their #if. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/powerpc/lock_stubs.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/powerpc/powerpc/lock_stubs.S diff -u src/sys/arch/powerpc/powerpc/lock_stubs.S:1.8 src/sys/arch/powerpc/powerpc/lock_stubs.S:1.9 --- src/sys/arch/powerpc/powerpc/lock_stubs.S:1.8 Sun Jun 5 16:52:26 2011 +++ src/sys/arch/powerpc/powerpc/lock_stubs.S Sun Sep 23 06:05:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.8 2011/06/05 16:52:26 matt Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.9 2012/09/23 06:05:32 mrg Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ ENTRY(mutex_exit) 2: b _C_LABEL(mutex_vector_exit) -#endif /* __HAVE_MUTEX_STUBS */ +#endif /* !LOCKDEBUG */ /* * void rw_enter(krwlock_t *krw, krw_t op); @@ -190,4 +190,4 @@ ENTRY(rw_exit) #endif /* __HAVE_RW_STUBS */ -#endif /* !LOCKDEBUG */ +#endif /* __HAVE_MUTEX_STUBS */
CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: jdc
Date: Sun Sep 23 09:54:04 UTC 2012
Modified Files:
src/sys/arch/sparc/dev: sbus.c
Log Message:
Wrap sbuserr_handler and sbus_error with:
#if (defined(SUN4M) !defined(MSIIEP)) || defined(SUN4D)
to give them the same scope as the definitions in ../sparc/intr.c.
Allows SUN4C-only kernels to compile.
OK mrg
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc/dev/sbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/dev/sbus.c
diff -u src/sys/arch/sparc/dev/sbus.c:1.77 src/sys/arch/sparc/dev/sbus.c:1.78
--- src/sys/arch/sparc/dev/sbus.c:1.77 Sun Jul 29 00:04:05 2012
+++ src/sys/arch/sparc/dev/sbus.c Sun Sep 23 09:54:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.77 2012/07/29 00:04:05 matt Exp $ */
+/* $NetBSD: sbus.c,v 1.78 2012/09/23 09:54:04 jdc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sbus.c,v 1.77 2012/07/29 00:04:05 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sbus.c,v 1.78 2012/09/23 09:54:04 jdc Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -113,8 +113,10 @@ void sbus_attach_mainbus(device_t, devic
void sbus_attach_iommu(device_t, device_t, void *);
void sbus_attach_xbox(device_t, device_t, void *);
+#if (defined(SUN4M) !defined(MSIIEP)) || defined(SUN4D)
static int sbus_error(void);
extern int (*sbuserr_handler)(void);
+#endif
CFATTACH_DECL_NEW(sbus_mainbus, sizeof(struct sbus_softc),
sbus_match_mainbus, sbus_attach_mainbus, NULL, NULL);
@@ -311,7 +313,9 @@ sbus_attach_iommu(device_t parent, devic
printf(: clock = %s MHz\n, clockfreq(sc-sc_clockfreq));
sbus_sc = sc;
+#if (defined(SUN4M) !defined(MSIIEP)) || defined(SUN4D)
sbuserr_handler = sbus_error;
+#endif
sbus_attach_common(sc, sbus, node, NULL);
}
@@ -594,6 +598,7 @@ sbus_intr_establish(bus_space_tag_t t, i
return (ih);
}
+#if (defined(SUN4M) !defined(MSIIEP)) || defined(SUN4D)
static int
sbus_error(void)
{
@@ -625,3 +630,4 @@ static int straytime, nstray;
return (0);
}
+#endif
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: joerg
Date: Sun Sep 23 14:40:29 UTC 2012
Modified Files:
src/sys/dev/usb: if_zyd.c
Log Message:
Don't use a usbd_status as an int, split error into two variables.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/usb/if_zyd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.31 src/sys/dev/usb/if_zyd.c:1.32
--- src/sys/dev/usb/if_zyd.c:1.31 Sun Sep 23 01:08:17 2012
+++ src/sys/dev/usb/if_zyd.c Sun Sep 23 14:40:29 2012
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.31 2012/09/23 01:08:17 chs Exp $ */
+/* $NetBSD: if_zyd.c,v 1.32 2012/09/23 14:40:29 joerg Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini damien.bergam...@free.fr
@@ -22,7 +22,7 @@
* ZyDAS ZD1211/ZD1211B USB WLAN driver.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_zyd.c,v 1.31 2012/09/23 01:08:17 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_zyd.c,v 1.32 2012/09/23 14:40:29 joerg Exp $);
#include sys/param.h
@@ -802,7 +802,8 @@ zyd_cmd(struct zyd_softc *sc, uint16_t c
struct zyd_cmd cmd;
struct rq rq;
uint16_t xferflags;
- usbd_status error;
+ int error;
+ usbd_status uerror;
int s = 0;
if ((xfer = usbd_alloc_xfer(sc-sc_udev)) == NULL)
@@ -824,12 +825,12 @@ zyd_cmd(struct zyd_softc *sc, uint16_t c
usbd_setup_xfer(xfer, sc-zyd_ep[ZYD_ENDPT_IOUT], 0, cmd,
sizeof (uint16_t) + ilen, xferflags, ZYD_INTR_TIMEOUT, NULL);
- error = usbd_transfer(xfer);
- if (error != USBD_IN_PROGRESS error != 0) {
+ uerror = usbd_transfer(xfer);
+ if (uerror != USBD_IN_PROGRESS uerror != 0) {
if (flags ZYD_CMD_FLAG_READ)
splx(s);
printf(%s: could not send command (error=%s)\n,
- device_xname(sc-sc_dev), usbd_errstr(error));
+ device_xname(sc-sc_dev), usbd_errstr(uerror));
(void)usbd_free_xfer(xfer);
return EIO;
}
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Sun Sep 23 15:56:32 UTC 2012 Modified Files: src/sys/arch/evbarm/rpi: rpi_start.S Log Message: Map 1M beyond _end to make sure we bootstrap. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/rpi/rpi_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/rpi/rpi_start.S diff -u src/sys/arch/evbarm/rpi/rpi_start.S:1.6 src/sys/arch/evbarm/rpi/rpi_start.S:1.7 --- src/sys/arch/evbarm/rpi/rpi_start.S:1.6 Sun Sep 16 14:14:56 2012 +++ src/sys/arch/evbarm/rpi/rpi_start.S Sun Sep 23 15:56:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_start.S,v 1.6 2012/09/16 14:14:56 skrll Exp $ */ +/* $NetBSD: rpi_start.S,v 1.7 2012/09/23 15:56:32 skrll Exp $ */ /* * Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved. @@ -87,7 +87,7 @@ #include arm/armreg.h #include assym.h -RCSID($NetBSD: rpi_start.S,v 1.6 2012/09/16 14:14:56 skrll Exp $) +RCSID($NetBSD: rpi_start.S,v 1.7 2012/09/23 15:56:32 skrll Exp $) /* * Workaround Erratum 411920 @@ -308,11 +308,11 @@ Lctl_ID_dis: mmu_init_table: /* Add 1MB of VA==PA at 0x so we can keep the kernel going */ MMU_INIT(0x0, 0x0, - (_end - KERNEL_BASE + L1_S_SIZE - 1), + (_end - KERNEL_BASE + 2 * L1_S_SIZE - 1), L1_S_PROTO | L1_S_AP_KRW) MMU_INIT(KERNEL_BASE, 0x0, - (_end - KERNEL_BASE + L1_S_SIZE - 1), + (_end - KERNEL_BASE + 2 * L1_S_SIZE - 1), L1_S_PROTO | L1_S_AP_KRW | L1_S_B | L1_S_C) /* Map the 16MB of peripherals */
CVS commit: src
Module Name:src Committed By: joerg Date: Sun Sep 23 17:22:26 UTC 2012 Modified Files: src/external/bsd/bind/bin/named: Makefile src/external/bsd/bind/lib/libdns: Makefile src/external/bsd/llvm: Makefile.inc src/external/bsd/llvm/bin/clang: Makefile src/external/bsd/llvm/bin/clang-tblgen: Makefile src/external/bsd/llvm/bin/lli: Makefile src/external/bsd/llvm/bin/llvm-extract: Makefile src/external/bsd/llvm/bin/llvm-mc: Makefile src/external/bsd/llvm/config/llvm/Config: AsmParsers.def AsmPrinters.def Disassemblers.def config.h.in llvm-config.h.in src/external/bsd/llvm/config/llvm/Support: DataTypes.h src/external/bsd/llvm/include: Makefile src/external/bsd/llvm/lib: Makefile src/external/bsd/llvm/lib/libLLVMAnalysis: Makefile src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile src/external/bsd/llvm/lib/libLLVMDebugInfo: Makefile src/external/bsd/llvm/lib/libLLVMInstrumentation: Makefile src/external/bsd/llvm/lib/libLLVMMipsCodeGen: Makefile src/external/bsd/llvm/lib/libLLVMScalarOpts: Makefile src/external/bsd/llvm/lib/libLLVMTransformsUtils: Makefile src/external/bsd/llvm/lib/libclangAST: Makefile src/external/bsd/llvm/lib/libclangAnalysis: Makefile src/external/bsd/llvm/lib/libclangSema: Makefile src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers: Makefile src/external/bsd/llvm/lib/libclangStaticAnalyzerCore: Makefile src/external/bsd/llvm/lib/libclangTooling: Makefile src/external/gpl2/xcvs: Makefile.inc src/share/mk: bsd.sys.mk src/tests/lib/libc/ssp: Makefile Added Files: src/external/bsd/llvm/lib/libclangRewriteCore: Makefile src/external/bsd/llvm/lib/libclangRewriteFrontend: Makefile src/tools/llvm-lib/libLLVMMipsDisassembler: Makefile src/tools/llvm-lib/libclangRewriteCore: Makefile src/tools/llvm-lib/libclangRewriteFrontend: Makefile Removed Files: src/external/bsd/llvm/lib/libclangRewrite: Makefile src/tools/llvm-lib/libclangRewrite: Makefile Log Message: Update LLVM/Clang snapshot to r164464. This adopts the GCC options for the SSP parameters and a not-yet-default rewrite of SROA. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/bind/bin/named/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/lib/libdns/Makefile cvs rdiff -u -r1.40 -r1.41 src/external/bsd/llvm/Makefile.inc cvs rdiff -u -r1.20 -r1.21 src/external/bsd/llvm/bin/clang/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/bin/clang-tblgen/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/bin/lli/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/bin/llvm-extract/Makefile cvs rdiff -u -r1.11 -r1.12 src/external/bsd/llvm/bin/llvm-mc/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/llvm/config/llvm/Config/AsmParsers.def cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/llvm/config/llvm/Config/AsmPrinters.def cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/llvm/config/llvm/Config/Disassemblers.def cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/config/llvm/Config/config.h.in \ src/external/bsd/llvm/config/llvm/Config/llvm-config.h.in cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/llvm/config/llvm/Support/DataTypes.h cvs rdiff -u -r1.12 -r1.13 src/external/bsd/llvm/include/Makefile cvs rdiff -u -r1.24 -r1.25 src/external/bsd/llvm/lib/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile cvs rdiff -u -r1.19 -r1.20 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/libLLVMDebugInfo/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/lib/libclangAST/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/bsd/llvm/lib/libclangAnalysis/Makefile cvs rdiff -u -r1.3 -r0 src/external/bsd/llvm/lib/libclangRewrite/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libclangRewriteCore/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libclangRewriteFrontend/Makefile cvs rdiff -u -r1.9 -r1.10 src/external/bsd/llvm/lib/libclangSema/Makefile cvs rdiff -u -r1.15 -r1.16 \ src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/lib/libclangTooling/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/Makefile.inc cvs rdiff -u -r1.218 -r1.219 src/share/mk/bsd.sys.mk cvs rdiff -u -r1.5 -r1.6
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jdf
Date: Sun Sep 23 17:37:51 UTC 2012
Modified Files:
src/distrib/utils/sysinst: net.c
Log Message:
Prevent sysinst from setting an fqdn in rc.conf when the user entered no domain
(i.e., sets only the hostname). Fix for PR install/46946.
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/distrib/utils/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/net.c
diff -u src/distrib/utils/sysinst/net.c:1.132 src/distrib/utils/sysinst/net.c:1.133
--- src/distrib/utils/sysinst/net.c:1.132 Tue May 1 18:28:47 2012
+++ src/distrib/utils/sysinst/net.c Sun Sep 23 17:37:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.132 2012/05/01 18:28:47 riz Exp $ */
+/* $NetBSD: net.c,v 1.133 2012/09/23 17:37:51 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -435,9 +435,9 @@ recombine_host_domain(void)
strlcpy(recombined, net_host, sizeof(recombined));
- if (l = 0 ||
+ if (strlen(net_domain) != 0 (l = 0 ||
net_host[l - 1] != '.' ||
- strcasecmp(net_domain, net_host + l) != 0) {
+ strcasecmp(net_domain, net_host + l) != 0)) {
/* net_host isn't an FQDN. */
strlcat(recombined, ., sizeof(recombined));
strlcat(recombined, net_domain, sizeof(recombined));
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Sun Sep 23 19:20:45 UTC 2012
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Revert two unintentional changes from the PPC tests
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.219 src/share/mk/bsd.sys.mk:1.220
--- src/share/mk/bsd.sys.mk:1.219 Sun Sep 23 17:22:25 2012
+++ src/share/mk/bsd.sys.mk Sun Sep 23 19:20:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.219 2012/09/23 17:22:25 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.220 2012/09/23 19:20:44 joerg Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -33,7 +33,7 @@ CFLAGS+= -Wno-sign-compare
CFLAGS+= ${${ACTIVE_CC} != clang:? -Wno-traditional :}
.if !defined(NOGCCERROR)
# Set assembler warnings to be fatal
-#CFLAGS+= -Wa,--fatal-warnings
+CFLAGS+= -Wa,--fatal-warnings
.endif
# Set linker warnings to be fatal
# XXX no proper way to avoid FOO is a patented algorithm warnings
@@ -132,7 +132,7 @@ CFLAGS+= -Wa,-Av8plus
.if !defined(NOGCCERROR)
.if (${MACHINE_ARCH} == mips64el) || (${MACHINE_ARCH} == mips64eb)
-#CPUFLAGS+= -Wa,--fatal-warnings
+CPUFLAGS+= -Wa,--fatal-warnings
.endif
.endif
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc
Committed By: veego
Date: Sun Sep 23 20:10:25 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: atombios_crtc.c
atombios_output.c radeon_crtc.c
Log Message:
Disable a lot of debug output which would show up if you change from the
xserver to another console and back
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c
cvs rdiff -u -r1.1.1.10 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c
cvs rdiff -u -r1.1.1.9 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c:1.1.1.8 xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c:1.1.1.8 Sun Sep 23 19:49:10 2012
+++ xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c Sun Sep 23 20:10:25 2012
@@ -87,7 +87,7 @@ atombios_lock_crtc(atomBiosHandlePtr ato
data.exec.pspace = crtc_data;
if (RHDAtomBiosFunc(atomBIOS-pScrn, atomBIOS, ATOMBIOS_EXEC, data) == ATOM_SUCCESS) {
- ErrorF(%s CRTC %d success\n, lock? Lock:Unlock, crtc);
+/* ErrorF(%s CRTC %d success\n, lock? Lock:Unlock, crtc); */
return ATOM_SUCCESS ;
}
@@ -110,7 +110,7 @@ atombios_enable_crtc(atomBiosHandlePtr a
data.exec.pspace = crtc_data;
if (RHDAtomBiosFunc(atomBIOS-pScrn, atomBIOS, ATOMBIOS_EXEC, data) == ATOM_SUCCESS) {
- ErrorF(%s CRTC %d success\n, state? Enable:Disable, crtc);
+/* ErrorF(%s CRTC %d success\n, state? Enable:Disable, crtc); */
return ATOM_SUCCESS ;
}
@@ -133,7 +133,7 @@ atombios_enable_crtc_memreq(atomBiosHand
data.exec.pspace = crtc_data;
if (RHDAtomBiosFunc(atomBIOS-pScrn, atomBIOS, ATOMBIOS_EXEC, data) == ATOM_SUCCESS) {
- ErrorF(%s CRTC memreq %d success\n, state? Enable:Disable, crtc);
+/* ErrorF(%s CRTC memreq %d success\n, state? Enable:Disable, crtc); */
return ATOM_SUCCESS ;
}
@@ -157,7 +157,7 @@ atombios_blank_crtc(atomBiosHandlePtr at
data.exec.pspace = crtc_data;
if (RHDAtomBiosFunc(atomBIOS-pScrn, atomBIOS, ATOMBIOS_EXEC, data) == ATOM_SUCCESS) {
- ErrorF(%s CRTC %d success\n, state? Blank:Unblank, crtc);
+/* ErrorF(%s CRTC %d success\n, state? Blank:Unblank, crtc); */
return ATOM_SUCCESS ;
}
@@ -231,7 +231,7 @@ atombios_set_crtc_timing(xf86CrtcPtr crt
data.exec.pspace = param;
if (RHDAtomBiosFunc(info-atomBIOS-pScrn, info-atomBIOS, ATOMBIOS_EXEC, data) == ATOM_SUCCESS) {
- ErrorF(Set CRTC Timing success\n);
+/* ErrorF(Set CRTC Timing success\n); */
return ATOM_SUCCESS ;
}
@@ -282,7 +282,7 @@ atombios_set_crtc_dtd_timing(xf86CrtcPtr
data.exec.pspace = param;
if (RHDAtomBiosFunc(info-atomBIOS-pScrn, info-atomBIOS, ATOMBIOS_EXEC, data) == ATOM_SUCCESS) {
- ErrorF(Set DTD CRTC Timing success\n);
+/* ErrorF(Set DTD CRTC Timing success\n); */
return ATOM_SUCCESS ;
}
@@ -336,7 +336,7 @@ atombios_pick_pll(xf86CrtcPtr crtc)
} else
radeon_crtc-pll_id = radeon_crtc-crtc_id;
-ErrorF(Picked PLL %d\n, radeon_crtc-pll_id);
+/*ErrorF(Picked PLL %d\n, radeon_crtc-pll_id); */
for (o = 0; o xf86_config-num_output; o++) {
output = xf86_config-output[o];
@@ -449,11 +449,11 @@ static uint32_t atombios_adjust_pll(xf86
args.v1.ucTransmitterID = radeon_encoder-encoder_id;
args.v1.ucEncodeMode = atombios_get_encoder_mode(output);
- ErrorF(before %d\n, args.v1.usPixelClock);
+/* ErrorF(before %d\n, args.v1.usPixelClock); */
if (RHDAtomBiosFunc(info-atomBIOS-pScrn, info-atomBIOS, ATOMBIOS_EXEC, data) == ATOM_SUCCESS) {
adjusted_clock = le16_to_cpu(args.v1.usPixelClock) * 10;
}
- ErrorF(after %d\n, args.v1.usPixelClock);
+/* ErrorF(after %d\n, args.v1.usPixelClock); */
break;
case 3:
args.v3.sInput.usPixelClock = cpu_to_le16(adjusted_clock / 10);
@@ -467,7 +467,7 @@ static uint32_t atombios_adjust_pll(xf86
// if SS
//args.v3.sInput.ucDispPllConfig |= DISPPLL_CONFIG_SS_ENABLE;
- ErrorF(before %d 0x%x\n, args.v3.sInput.usPixelClock, args.v3.sInput.ucDispPllConfig);
+/* ErrorF(before %d 0x%x\n, args.v3.sInput.usPixelClock, args.v3.sInput.ucDispPllConfig); */
if (RHDAtomBiosFunc(info-atomBIOS-pScrn, info-atomBIOS, ATOMBIOS_EXEC, data) == ATOM_SUCCESS) {
adjusted_clock = args.v3.sOutput.ulDispPllFreq * 10;
if (args.v3.sOutput.ucRefDiv) {
@@ -478,8 +478,8 @@ static uint32_t atombios_adjust_pll(xf86
pll_flags |= RADEON_PLL_USE_POST_DIV;
info-pll.post_div = args.v3.sOutput.ucPostDiv;
}
- ErrorF(after %d %d %d\n, args.v3.sOutput.ulDispPllFreq,
- args.v3.sOutput.ucRefDiv, args.v3.sOutput.ucPostDiv);
+/* ErrorF(after %d %d %d\n,
CVS commit: src/sys/arch
Module Name:src Committed By: mrg Date: Sun Sep 23 22:31:39 UTC 2012 Modified Files: src/sys/arch/macppc/include: param.h src/sys/arch/powerpc/include: param.h Log Message: increase powerpc NKMEMPAGES_MAX_DEFAULT to 256MB. remove the macppc overrides that are now the same as the powerpc default. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/macppc/include/param.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/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/macppc/include/param.h diff -u src/sys/arch/macppc/include/param.h:1.19 src/sys/arch/macppc/include/param.h:1.20 --- src/sys/arch/macppc/include/param.h:1.19 Fri Feb 10 17:35:48 2012 +++ src/sys/arch/macppc/include/param.h Sun Sep 23 22:31:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.19 2012/02/10 17:35:48 para Exp $ */ +/* $NetBSD: param.h,v 1.20 2012/09/23 22:31:38 mrg Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -46,13 +46,6 @@ #define MSGBUFSIZE (3*NBPG) #endif -/* - * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized - * logical pages. - */ -#define NKMEMPAGES_MIN_DEFAULT ((16 * 1024 * 1024) PAGE_SHIFT) -#define NKMEMPAGES_MAX_DEFAULT ((256 * 1024 * 1024) PAGE_SHIFT) - #endif /* _KERNEL !_MODULE */ /* at this offset we mmap() the PCI IO range in display drivers */ Index: src/sys/arch/powerpc/include/param.h diff -u src/sys/arch/powerpc/include/param.h:1.27 src/sys/arch/powerpc/include/param.h:1.28 --- src/sys/arch/powerpc/include/param.h:1.27 Mon Jan 30 06:04:32 2012 +++ src/sys/arch/powerpc/include/param.h Sun Sep 23 22:31:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.27 2012/01/30 06:04:32 matt Exp $ */ +/* $NetBSD: param.h,v 1.28 2012/09/23 22:31:39 mrg Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -110,7 +110,7 @@ #define NKMEMPAGES_MIN_DEFAULT ((16 * 1024 * 1024) PAGE_SHIFT) #endif #ifndef NKMEMPAGES_MAX_DEFAULT -#define NKMEMPAGES_MAX_DEFAULT ((128 * 1024 * 1024) PAGE_SHIFT) +#define NKMEMPAGES_MAX_DEFAULT ((256 * 1024 * 1024) PAGE_SHIFT) #endif #if defined(_KERNEL) !defined(_LOCORE)
CVS commit: src/sys
Module Name:src
Committed By: msaitoh
Date: Mon Sep 24 03:05:53 UTC 2012
Modified Files:
src/sys/net: if_arcsubr.c
src/sys/netinet: if_atm.c ip_mroute.c
Log Message:
Add missing \n in log(9)
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/net/if_arcsubr.c
cvs rdiff -u -r1.32 -r1.33 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.125 -r1.126 src/sys/netinet/ip_mroute.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/net/if_arcsubr.c
diff -u src/sys/net/if_arcsubr.c:1.63 src/sys/net/if_arcsubr.c:1.64
--- src/sys/net/if_arcsubr.c:1.63 Mon Apr 5 07:22:22 2010
+++ src/sys/net/if_arcsubr.c Mon Sep 24 03:05:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arcsubr.c,v 1.63 2010/04/05 07:22:22 joerg Exp $ */
+/* $NetBSD: if_arcsubr.c,v 1.64 2012/09/24 03:05:53 msaitoh Exp $ */
/*
* Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_arcsubr.c,v 1.63 2010/04/05 07:22:22 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_arcsubr.c,v 1.64 2012/09/24 03:05:53 msaitoh Exp $);
#include opt_inet.h
@@ -633,7 +633,7 @@ arc_ifattach(struct ifnet *ifp, uint8_t
ifp-if_flags |= IFF_MULTICAST|IFF_ALLMULTI;
if (ifp-if_flags IFF_LINK0 arc_ipmtu ARC_PHDS_MAXMTU)
log(LOG_ERR,
- %s: arc_ipmtu is %d, but must not exceed %d,
+ %s: arc_ipmtu is %d, but must not exceed %d\n,
ifp-if_xname, arc_ipmtu, ARC_PHDS_MAXMTU);
ifp-if_output = arc_output;
Index: src/sys/netinet/if_atm.c
diff -u src/sys/netinet/if_atm.c:1.32 src/sys/netinet/if_atm.c:1.33
--- src/sys/netinet/if_atm.c:1.32 Tue Feb 1 19:43:12 2011
+++ src/sys/netinet/if_atm.c Mon Sep 24 03:05:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.c,v 1.32 2011/02/01 19:43:12 chuck Exp $ */
+/* $NetBSD: if_atm.c,v 1.33 2012/09/24 03:05:53 msaitoh Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_atm.c,v 1.32 2011/02/01 19:43:12 chuck Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_atm.c,v 1.33 2012/09/24 03:05:53 msaitoh Exp $);
#include opt_inet.h
#include opt_natm.h
@@ -125,7 +125,7 @@ atm_rtrequest(int req, struct rtentry *r
}
if (gate-sa_family != AF_LINK ||
gate-sa_len sockaddr_dl_measure(namelen, addrlen)) {
- log(LOG_DEBUG, atm_rtrequest: bad gateway value);
+ log(LOG_DEBUG, atm_rtrequest: bad gateway value\n);
break;
}
@@ -228,7 +228,7 @@ atmresolve(struct rtentry *rt, struct mb
const struct sockaddr_dl *sdl;
if (m-m_flags (M_BCAST|M_MCAST)) {
- log(LOG_INFO, atmresolve: BCAST/MCAST packet detected/dumped);
+ log(LOG_INFO, atmresolve: BCAST/MCAST packet detected/dumped\n);
goto bad;
}
Index: src/sys/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.125 src/sys/netinet/ip_mroute.c:1.126
--- src/sys/netinet/ip_mroute.c:1.125 Tue May 1 15:09:36 2012
+++ src/sys/netinet/ip_mroute.c Mon Sep 24 03:05:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.c,v 1.125 2012/05/01 15:09:36 martin Exp $ */
+/* $NetBSD: ip_mroute.c,v 1.126 2012/09/24 03:05:53 msaitoh Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_mroute.c,v 1.125 2012/05/01 15:09:36 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_mroute.c,v 1.126 2012/09/24 03:05:53 msaitoh Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -3023,7 +3023,7 @@ pim_register_send(struct ip *ip, struct
struct mbuf *mb_copy, *mm;
if (mrtdebug DEBUG_PIM)
-log(LOG_DEBUG, pim_register_send: );
+log(LOG_DEBUG, pim_register_send: \n);
mb_copy = pim_register_prepare(ip, m);
if (mb_copy == NULL)
@@ -3143,7 +3143,7 @@ pim_register_send_upcall(struct ip *ip,
if (socket_send(ip_mrouter, mb_first, k_igmpsrc) 0) {
if (mrtdebug DEBUG_PIM)
log(LOG_WARNING,
- mcast: pim_register_send_upcall: ip_mrouter socket queue full);
+ mcast: pim_register_send_upcall: ip_mrouter socket queue full\n);
++mrtstat.mrts_upq_sockfull;
return ENOBUFS;
}
@@ -3311,7 +3311,7 @@ pim_input(struct mbuf *m, ...)
} else if (in_cksum(m, datalen)) {
pimstat.pims_rcv_badsum++;
if (mrtdebug DEBUG_PIM)
- log(LOG_DEBUG, pim_input: invalid checksum);
+ log(LOG_DEBUG, pim_input: invalid checksum\n);
m_freem(m);
return;
}
