svn commit: r253911 - head/sys/modules/iwn
Author: uqs
Date: Sat Aug 3 08:21:35 2013
New Revision: 253911
URL: http://svnweb.freebsd.org/changeset/base/253911
Log:
Add missing depend.
Modified:
head/sys/modules/iwn/Makefile
Modified: head/sys/modules/iwn/Makefile
==
--- head/sys/modules/iwn/Makefile Sat Aug 3 04:25:25 2013
(r253910)
+++ head/sys/modules/iwn/Makefile Sat Aug 3 08:21:35 2013
(r253911)
@@ -3,6 +3,6 @@
.PATH: ${.CURDIR}/../../dev/iwn
KMOD= if_iwn
-SRCS= if_iwn.c device_if.h bus_if.h pci_if.h opt_wlan.h
+SRCS= if_iwn.c device_if.h bus_if.h pci_if.h opt_iwn.h opt_wlan.h
.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253912 - in releng/9.2: . release sys/conf sys/sys
Author: gjb
Date: Sat Aug 3 12:41:21 2013
New Revision: 253912
URL: http://svnweb.freebsd.org/changeset/base/253912
Log:
- Copy stable/9 to releng/9.2 as part of the 9.2-RELEASE cycle.
- Update branch name to -RC1.
- Bump __FreeBSD_version.
Approved by: kib (mentor, implicit)
Approved by: re (implicit)
Added:
releng/9.2/
- copied from r253911, stable/9/
Modified:
releng/9.2/release/Makefile.sysinstall
releng/9.2/sys/conf/newvers.sh
releng/9.2/sys/sys/param.h
Modified: releng/9.2/release/Makefile.sysinstall
==
--- stable/9/release/Makefile.sysinstallSat Aug 3 08:21:35 2013
(r253911)
+++ releng/9.2/release/Makefile.sysinstall Sat Aug 3 12:41:21 2013
(r253912)
@@ -24,7 +24,7 @@
# Set these, release builder!
#
# Fixed version:
-#BUILDNAME=9.2-BETA2
+#BUILDNAME=9.2-RC1
#
# Automatic SNAP versioning:
DATE != date +%Y%m%d
Modified: releng/9.2/sys/conf/newvers.sh
==
--- stable/9/sys/conf/newvers.shSat Aug 3 08:21:35 2013
(r253911)
+++ releng/9.2/sys/conf/newvers.sh Sat Aug 3 12:41:21 2013
(r253912)
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="9.2"
-BRANCH="BETA2"
+BRANCH="RC1"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/9.2/sys/sys/param.h
==
--- stable/9/sys/sys/param.hSat Aug 3 08:21:35 2013(r253911)
+++ releng/9.2/sys/sys/param.h Sat Aug 3 12:41:21 2013(r253912)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 901505 /* Master, propagated to newvers */
+#define __FreeBSD_version 902001 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253913 - stable/9/sys/sys
Author: gjb Date: Sat Aug 3 12:45:00 2013 New Revision: 253913 URL: http://svnweb.freebsd.org/changeset/base/253913 Log: Bump __FreeBSD_version to a value higher than releng/9.2. Approved by: re (implicit) Approved by: kib (mentor, implicit) Modified: stable/9/sys/sys/param.h Modified: stable/9/sys/sys/param.h == --- stable/9/sys/sys/param.hSat Aug 3 12:41:21 2013(r253912) +++ stable/9/sys/sys/param.hSat Aug 3 12:45:00 2013(r253913) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 901505 /* Master, propagated to newvers */ +#define __FreeBSD_version 902501 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253914 - head/sys/arm/freescale/imx
Author: ian
Date: Sat Aug 3 13:31:10 2013
New Revision: 253914
URL: http://svnweb.freebsd.org/changeset/base/253914
Log:
Tweak the imx debug console code so that it works with multiple SoCs.
Instead of hard-coding the uart register addresses for the imx51, use
a variable that defaults to the imx51 address. When debugging another
imx-family SoC, the variable can be set early in initarm() to provide
full console/printf support for debugging early boot.
Modified:
head/sys/arm/freescale/imx/console.c
Modified: head/sys/arm/freescale/imx/console.c
==
--- head/sys/arm/freescale/imx/console.cSat Aug 3 12:45:00 2013
(r253913)
+++ head/sys/arm/freescale/imx/console.cSat Aug 3 13:31:10 2013
(r253914)
@@ -41,46 +41,57 @@ __FBSDID("$FreeBSD$");
/* Allow it to be predefined, to be able to use another UART for console */
#ifndefIMX_UART_BASE
-#defineIMX_UART_BASE 0xe3fbc000 /* UART1 */
+#defineIMX_UART_BASE 0xe3fbc000 /* imx51 UART1 */
#endif
-#defineIMX_RXD (u_int32_t *)(IMX_UART_BASE + 0x00)
-#defineIMX_TXD (u_int32_t *)(IMX_UART_BASE + 0x40)
+#defineIMX_RXD 0x00
+#defineIMX_TXD 0x40
-#defineIMX_UFCR(u_int32_t *)(IMX_UART_BASE + 0x90)
-#defineIMX_USR1(u_int32_t *)(IMX_UART_BASE + 0x94)
+#defineIMX_UFCR0x90
+#defineIMX_USR10x94
#defineIMX_USR1_TRDY (1 << 13)
-#defineIMX_USR2(u_int32_t *)(IMX_UART_BASE + 0x98)
+#defineIMX_USR20x98
#defineIMX_USR2_RDR(1 << 0)
#defineIMX_USR2_TXFE (1 << 14)
#defineIMX_USR2_TXDC (1 << 3)
-#defineIMX_UTS (u_int32_t *)(IMX_UART_BASE + 0xb4)
+#defineIMX_UTS 0xb4
#defineIMX_UTS_TXFULL (1 << 4)
/*
+ * The base address of the uart registers.
+ *
+ * This is global so that it can be changed on the fly from the outside. For
+ * example, set imx_uart_base=physaddr and then call cninit() as the first two
+ * lines of initarm() and enjoy printf() availability through the tricky bits
of
+ * startup. After initarm() switches from physical to virtual addressing, just
+ * set imx_uart_base=virtaddr and printf keeps working.
+ */
+uint32_t imx_uart_base = IMX_UART_BASE;
+
+/*
* uart related funcs
*/
-static u_int32_t
-uart_getreg(u_int32_t *bas)
+static uint32_t
+ub_getreg(uint32_t off)
{
- return *((volatile u_int32_t *)(bas)) & 0xff;
+ return *((volatile uint32_t *)(imx_uart_base + off));
}
static void
-uart_setreg(u_int32_t *bas, u_int32_t val)
+ub_setreg(uint32_t off, uint32_t val)
{
- *((volatile u_int32_t *)(bas)) = (u_int32_t)val;
+ *((volatile uint32_t *)(imx_uart_base + off)) = val;
}
static int
ub_tstc(void)
{
- return ((uart_getreg(IMX_USR2) & IMX_USR2_RDR) ? 1 : 0);
+ return ((ub_getreg(IMX_USR2) & IMX_USR2_RDR) ? 1 : 0);
}
static int
@@ -90,7 +101,7 @@ ub_getc(void)
while (!ub_tstc());
__asm __volatile("nop");
- return (uart_getreg(IMX_RXD) & 0xff);
+ return (ub_getreg(IMX_RXD) & 0xff);
}
static void
@@ -100,10 +111,10 @@ ub_putc(unsigned char c)
if (c == '\n')
ub_putc('\r');
- while (uart_getreg(IMX_UTS) & IMX_UTS_TXFULL)
+ while (ub_getreg(IMX_UTS) & IMX_UTS_TXFULL)
__asm __volatile("nop");
- uart_setreg(IMX_TXD, c);
+ ub_setreg(IMX_TXD, c);
}
static cn_probe_t uart_cnprobe;
@@ -138,17 +149,19 @@ uart_cnprobe(struct consdev *cp)
static void
uart_cninit(struct consdev *cp)
{
- uart_setreg(IMX_UFCR, 0x4210);
+
+/* Init fifo trigger levels to 32 bytes, refclock div to 2. */
+ ub_setreg(IMX_UFCR, 0x4210);
}
-void
+static void
uart_cnputc(struct consdev *cp, int c)
{
ub_putc(c);
}
-int
+static int
uart_cngetc(struct consdev * cp)
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253915 - head/sys/sys
Author: trasz Date: Sat Aug 3 13:38:56 2013 New Revision: 253915 URL: http://svnweb.freebsd.org/changeset/base/253915 Log: Fix typo. Modified: head/sys/sys/priv.h Modified: head/sys/sys/priv.h == --- head/sys/sys/priv.h Sat Aug 3 13:31:10 2013(r253914) +++ head/sys/sys/priv.h Sat Aug 3 13:38:56 2013(r253915) @@ -158,7 +158,8 @@ #definePRIV_PROC_SETRLIMIT 162 /* Can raise resources limits. */ #definePRIV_PROC_SETLOGINCLASS 163 /* Can call setloginclass(2). */ -/* System V IPC privileges. +/* + * System V IPC privileges. */ #definePRIV_IPC_READ 170 /* Can override IPC read perm. */ #definePRIV_IPC_WRITE 171 /* Can override IPC write perm. */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253916 - svnadmin/conf
Author: gjb Date: Sat Aug 3 15:59:48 2013 New Revision: 253916 URL: http://svnweb.freebsd.org/changeset/base/253916 Log: Turn on re@ approval for releng/9.2 Approved by: re (implicit) Approved by: kib (mentor, implicit) Modified: svnadmin/conf/approvers Modified: svnadmin/conf/approvers == --- svnadmin/conf/approvers Sat Aug 3 13:38:56 2013(r253915) +++ svnadmin/conf/approvers Sat Aug 3 15:59:48 2013(r253916) @@ -20,6 +20,7 @@ ^stable/9/ re #^stable/8/re #^stable/7/re +^releng/9.2/ re ^releng/9.[0-1]/ (security-officer|so) ^releng/8.[0-4]/ (security-officer|so) ^releng/7.[0-4]/ (security-officer|so) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253917 - head/lib/libc++
Author: dim
Date: Sat Aug 3 16:23:43 2013
New Revision: 253917
URL: http://svnweb.freebsd.org/changeset/base/253917
Log:
After r253839, which modifies ld's behaviour to not automatically pull
in needed libraries, change libc++.so into a linker script, so it can
automatically pull in libcxxrt.so.
MFC after:1 week
Added:
head/lib/libc++/libc++.ldscript (contents, props changed)
Modified:
head/lib/libc++/Makefile
Modified: head/lib/libc++/Makefile
==
--- head/lib/libc++/MakefileSat Aug 3 15:59:48 2013(r253916)
+++ head/lib/libc++/MakefileSat Aug 3 16:23:43 2013(r253917)
@@ -9,6 +9,7 @@ CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLI
LIB= c++
SHLIB_MAJOR= 1
+SHLIB_LDSCRIPT=libc++.ldscript
SRCS+= algorithm.cpp\
bind.cpp\
Added: head/lib/libc++/libc++.ldscript
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc++/libc++.ldscript Sat Aug 3 16:23:43 2013
(r253917)
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+GROUP ( @@SHLIB@@ @@LIBDIR@@/libcxxrt.so )
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r252603 - head/usr.sbin/rwhod
Pawel Jakub Dawidek wrote
in <201307032104.r63l4kee015...@svn.freebsd.org>:
pj> Author: pjd
pj> Date: Wed Jul 3 21:04:20 2013
pj> New Revision: 252603
pj> URL: http://svnweb.freebsd.org/changeset/base/252603
pj>
pj> Log:
pj> The whole sending functionality was implemented within signal handler,
pj> which is very bad idea. Split sending and receiving in two processes,
pj> which fixes this problem and will help to sandbox rwhod.
pj>
pj> Submitted by: Mariusz Zaborski
pj> Sponsored by: Google Summer of Code 2013
pj> Reviewed by: pjd
pj> MFC after:1 month
(snip)
pj> if (!quiet_mode) {
pj> - signal(SIGALRM, onalrm);
pj> - onalrm(0);
pj> + pid_child_receiver = pdfork(&fdp, 0);
pj> + if (pid_child_receiver == 0) {
pj> + receiver_process();
pj> + } else if (pid_child_receiver > 0) {
pj> + sender_process();
pj> + } else if (pid_child_receiver == -1) {
pj> + syslog(LOG_ERR, "pdfork: %m");
pj> + exit(1);
pj> + }
pdfork() is available only when options PROCDESC is defined and
GENERIC does not have it.
-- Hiroki
pgpMj2KlYE9ew.pgp
Description: PGP signature
Re: svn commit: r252603 - head/usr.sbin/rwhod
On Sun, Aug 04, 2013 at 01:24:45AM +0900, Hiroki Sato wrote:
> Pawel Jakub Dawidek wrote
> in <201307032104.r63l4kee015...@svn.freebsd.org>:
>
> pj> Author: pjd
> pj> Date: Wed Jul 3 21:04:20 2013
> pj> New Revision: 252603
> pj> URL: http://svnweb.freebsd.org/changeset/base/252603
> pj>
> pj> Log:
> pj> The whole sending functionality was implemented within signal handler,
> pj> which is very bad idea. Split sending and receiving in two processes,
> pj> which fixes this problem and will help to sandbox rwhod.
> pj>
> pj> Submitted by: Mariusz Zaborski
> pj> Sponsored by: Google Summer of Code 2013
> pj> Reviewed by:pjd
> pj> MFC after: 1 month
>
> (snip)
>
> pj> if (!quiet_mode) {
> pj> - signal(SIGALRM, onalrm);
> pj> - onalrm(0);
> pj> + pid_child_receiver = pdfork(&fdp, 0);
> pj> + if (pid_child_receiver == 0) {
> pj> + receiver_process();
> pj> + } else if (pid_child_receiver > 0) {
> pj> + sender_process();
> pj> + } else if (pid_child_receiver == -1) {
> pj> + syslog(LOG_ERR, "pdfork: %m");
> pj> + exit(1);
> pj> + }
>
> pdfork() is available only when options PROCDESC is defined and
> GENERIC does not have it.
Ah, indeed. Thanks for letting me know. I think the proper fix here is
to just add PROCDESC to GENERIC as it will be used more and more
frequently.
--
Pawel Jakub Dawidek http://www.wheelsystems.com
FreeBSD committer http://www.FreeBSD.org
Am I Evil? Yes, I Am! http://mobter.com
pgpCy8c7X14eQ.pgp
Description: PGP signature
svn commit: r253918 - head/sys/powerpc/include
Author: jhibbits Date: Sat Aug 3 18:05:12 2013 New Revision: 253918 URL: http://svnweb.freebsd.org/changeset/base/253918 Log: Remove duplicate definition of SPR MMCR0. MFC after:3 days Modified: head/sys/powerpc/include/spr.h Modified: head/sys/powerpc/include/spr.h == --- head/sys/powerpc/include/spr.h Sat Aug 3 16:23:43 2013 (r253917) +++ head/sys/powerpc/include/spr.h Sat Aug 3 18:05:12 2013 (r253918) @@ -325,7 +325,6 @@ #defineSPR_970MMCR00x31b /* ... Monitor Mode Control Register 0 (PPC 970) */ #defineSPR_970MMCR10x31e /* ... Monitor Mode Control Register 1 (PPC 970) */ #defineSPR_970MMCRA0x312 /* ... Monitor Mode Control Register 2 (PPC 970) */ -#defineSPR_970MMCR00x31b /* ... Monitor Mode Control Register 0 (PPC 970) */ #defineSPR_970PMC1 0x313 /* ... PMC 1 */ #defineSPR_970PMC2 0x314 /* ... PMC 2 */ #defineSPR_970PMC3 0x315 /* ... PMC 3 */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r252603 - head/usr.sbin/rwhod
On Sat, Aug 3, 2013 at 11:01 AM, Pawel Jakub Dawidek wrote:
> On Sun, Aug 04, 2013 at 01:24:45AM +0900, Hiroki Sato wrote:
>> Pawel Jakub Dawidek wrote
>> in <201307032104.r63l4kee015...@svn.freebsd.org>:
>>
>> pj> Author: pjd
>> pj> Date: Wed Jul 3 21:04:20 2013
>> pj> New Revision: 252603
>> pj> URL: http://svnweb.freebsd.org/changeset/base/252603
>> pj>
>> pj> Log:
>> pj> The whole sending functionality was implemented within signal handler,
>> pj> which is very bad idea. Split sending and receiving in two processes,
>> pj> which fixes this problem and will help to sandbox rwhod.
>> pj>
>> pj> Submitted by: Mariusz Zaborski
>> pj> Sponsored by: Google Summer of Code 2013
>> pj> Reviewed by:pjd
>> pj> MFC after: 1 month
>>
>> (snip)
>>
>> pj> if (!quiet_mode) {
>> pj> - signal(SIGALRM, onalrm);
>> pj> - onalrm(0);
>> pj> + pid_child_receiver = pdfork(&fdp, 0);
>> pj> + if (pid_child_receiver == 0) {
>> pj> + receiver_process();
>> pj> + } else if (pid_child_receiver > 0) {
>> pj> + sender_process();
>> pj> + } else if (pid_child_receiver == -1) {
>> pj> + syslog(LOG_ERR, "pdfork: %m");
>> pj> + exit(1);
>> pj> + }
>>
>> pdfork() is available only when options PROCDESC is defined and
>> GENERIC does not have it.
>
> Ah, indeed. Thanks for letting me know. I think the proper fix here is
> to just add PROCDESC to GENERIC as it will be used more and more
> frequently.
When I hit this in the freebsd cluster a few weeks ago, something was
very wrong.
With a conventional kernel, rwhod wouldn't start up, or hung.
When adding PROCDESC things got worse. rwhod would operate, but none
of the 9.x machines could see its broadcasts and ruptime reported the
10.x+procdesc+rwhod machines as "down".
My vague recollection was that the 10.x+procdesc+rwhod machines could
see each other but I am not sure. I was in the process of ripping out
rwhod from the freebsd.org cluster by that point.
--
Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV
UTF-8: So you can \342\200\231 .. for when a ' just won't do
ZFS must be the bacon of file systems. "everything's better with ZFS"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r253911 - head/sys/modules/iwn
THanks!
-adrian
On 3 August 2013 01:21, Ulrich Spoerlein wrote:
> Author: uqs
> Date: Sat Aug 3 08:21:35 2013
> New Revision: 253911
> URL: http://svnweb.freebsd.org/changeset/base/253911
>
> Log:
> Add missing depend.
>
> Modified:
> head/sys/modules/iwn/Makefile
>
> Modified: head/sys/modules/iwn/Makefile
> ==
> --- head/sys/modules/iwn/Makefile Sat Aug 3 04:25:25 2013
> (r253910)
> +++ head/sys/modules/iwn/Makefile Sat Aug 3 08:21:35 2013
> (r253911)
> @@ -3,6 +3,6 @@
> .PATH: ${.CURDIR}/../../dev/iwn
>
> KMOD= if_iwn
> -SRCS= if_iwn.c device_if.h bus_if.h pci_if.h opt_wlan.h
> +SRCS= if_iwn.c device_if.h bus_if.h pci_if.h opt_iwn.h opt_wlan.h
>
> .include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r253899 - head/sys/dev/scc
On Fri, Aug 02, 2013 at 11:28:50PM +, Marius Strobl wrote:
> Author: marius
> Date: Fri Aug 2 23:28:49 2013
> New Revision: 253899
> URL: http://svnweb.freebsd.org/changeset/base/253899
> [...]
> Modified:
> head/sys/dev/scc/scc_dev_quicc.c
> head/sys/dev/scc/scc_dev_sab82532.c
> head/sys/dev/scc/scc_dev_z8530.c
>
> Modified: head/sys/dev/scc/scc_dev_quicc.c
> ==
> --- head/sys/dev/scc/scc_dev_quicc.c Fri Aug 2 21:28:36 2013
> (r253898)
> +++ head/sys/dev/scc/scc_dev_quicc.c Fri Aug 2 23:28:49 2013
> (r253899)
> @@ -27,13 +27,10 @@
> #include
> __FBSDID("$FreeBSD$");
>
> -#define __RMAN_RESOURCE_VISIBLE
> -
> #include
> #include
> #include
> #include
> -#include
> #include
> #include
> #include
> @@ -63,7 +60,7 @@ static kobj_method_t quicc_methods[] = {
> KOBJMETHOD(scc_iclear, quicc_bfe_iclear),
> KOBJMETHOD(scc_ipend, quicc_bfe_ipend),
> KOBJMETHOD(scc_probe, quicc_bfe_probe),
> - { 0, 0 }
> + KOBJMETHOD_END
> };
>
> struct scc_class scc_quicc_class = {
> @@ -77,11 +74,9 @@ struct scc_class scc_quicc_class = {
> };
>
> static int
> -quicc_bfe_attach(struct scc_softc *sc, int reset)
> +quicc_bfe_attach(struct scc_softc *sc __unused, int reset __unused)
> {
> - struct scc_bas *bas;
>
> - bas = &sc->sc_bas;
> return (0);
> }
>
> @@ -104,7 +99,18 @@ quicc_bfe_enabled(struct scc_softc *sc,
> static int
> quicc_bfe_iclear(struct scc_softc *sc, struct scc_chan *ch)
> {
> + struct scc_bas *bas;
> + uint16_t rb, st;
>
> + bas = &sc->sc_bas;
> + mtx_lock_spin(&sc->sc_hwmtx);
> + if (ch->ch_ipend & SER_INT_RXREADY) {
> + rb = quicc_read2(bas, QUICC_PRAM_SCC_RBASE(ch->ch_nr - 1));
> + st = quicc_read2(bas, rb);
> + (void)quicc_read4(bas, rb + 4);
This seems to break LINT for powerpc and powerpc64.
cc1: warnings being treated as errors
/src/sys/modules/scc/../../dev/scc/scc_dev_quicc.c: In function
'quicc_bfe_iclear':
/src/sys/modules/scc/../../dev/scc/scc_dev_quicc.c:110: warning: implicit
declaration of
function 'quicc_read4'
/src/sys/modules/scc/../../dev/scc/scc_dev_quicc.c:110: warning: nested extern
declaration of
'quicc_read4' [-Wnested-externs]
*** Error code 1
Stop.
bmake[3]: stopped in /src/sys/modules/scc
*** Error code 1
http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-powerpc64-powerpc.full
Glen
pgp98BheDsMyH.pgp
Description: PGP signature
svn commit: r253919 - head/release/ia64
Author: marcel Date: Sat Aug 3 20:14:29 2013 New Revision: 253919 URL: http://svnweb.freebsd.org/changeset/base/253919 Log: Fix the bootable CD: o We need wait a bit before attempting the root mount. The CD drives on HP machines (typical) go through the management controller so that it can be virtualized. In practice what this means is that it is slow to detect and attach. o Tell the kernel what to use as the root file system. The /etc/fstab trick doesn't work, because we're on the EFI-compatble file system. Modified: head/release/ia64/mkisoimages.sh Modified: head/release/ia64/mkisoimages.sh == --- head/release/ia64/mkisoimages.shSat Aug 3 18:05:12 2013 (r253918) +++ head/release/ia64/mkisoimages.shSat Aug 3 20:14:29 2013 (r253919) @@ -68,6 +68,8 @@ if [ $bootable = yes ]; then cp $BASE/boot/check-password.4th $MNT/boot cp $BASE/boot/screen.4th $MNT/boot mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi +echo kern.cam.boot_delay=\"3000\" >> $MNT/boot/loader.conf +echo vfs.root.mountfrom=\"cd9660:iso9660/$LABEL\" >> $MNT/boot/loader.conf umount $MNT mdconfig -d -u $md BOOTOPTS="-o bootimage=i386;$EFIPART -o no-emul-boot" ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253920 - head/sys/dev/scc
Author: marius
Date: Sat Aug 3 21:24:52 2013
New Revision: 253920
URL: http://svnweb.freebsd.org/changeset/base/253920
Log:
Make r253899 compile.
Modified:
head/sys/dev/scc/scc_dev_quicc.c
Modified: head/sys/dev/scc/scc_dev_quicc.c
==
--- head/sys/dev/scc/scc_dev_quicc.cSat Aug 3 20:14:29 2013
(r253919)
+++ head/sys/dev/scc/scc_dev_quicc.cSat Aug 3 21:24:52 2013
(r253920)
@@ -44,9 +44,13 @@ __FBSDID("$FreeBSD$");
#definequicc_read2(bas, reg) \
bus_space_read_2((bas)->bst, (bas)->bsh, reg)
+#definequicc_read4(bas, reg) \
+ bus_space_read_4((bas)->bst, (bas)->bsh, reg)
#definequicc_write2(bas, reg, val) \
bus_space_write_2((bas)->bst, (bas)->bsh, reg, val)
+#definequicc_write4(bas, reg, val) \
+ bus_space_write_4((bas)->bst, (bas)->bsh, reg, val)
static int quicc_bfe_attach(struct scc_softc *, int);
static int quicc_bfe_enabled(struct scc_softc *, struct scc_chan *);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r253887 - head/sys/dev/filemon
Jilles Tjoelker wrote
in <20130802152204.ga1...@stack.nl>:
ji> You can simplify the code using the fairly new pget(). This will also
ji> fix the incorrect errno when the process does not exist (should be
ji> [ESRCH]).
ji>
ji> This change is a step in the right direction but is incomplete. Although
ji> the check protects currently running processes, I do not see how it
ji> prevents tracing a process that gets the same PID again after the
ji> original target process has exited. This not only leaks sensitive
ji> information but may also prevent tracing by the legitimate owner of the
ji> process (because only one filemon will write events for a process). This
ji> could be fixed by setting filemon->pid = -1 in
ji> filemon_wrapper_sys_exit() and not allowing P_WEXIT and zombies in
ji> FILEMON_SET_PID (PGET_NOTWEXIT disallows both). An [EBUSY] when there is
ji> already a filemon monitoring the process may also be useful (or writing
ji> copies of the events to all attached filemons).
Thank you for your comments. Can you review the attached patch? If
there is no problem, I will commit this and MFC to stable branches.
-- Hiroki
Index: sys/dev/filemon/filemon.c
===
--- sys/dev/filemon/filemon.c (revision 253911)
+++ sys/dev/filemon/filemon.c (working copy)
@@ -164,13 +164,12 @@
/* Set the monitored process ID. */
case FILEMON_SET_PID:
- p = pfind(*((pid_t *)data));
- if (p == NULL)
- return (EINVAL);
- error = p_candebug(curthread, p);
- if (error == 0)
+ error = pget(*((pid_t *)data), PGET_CANDEBUG | PGET_NOTWEXIT,
+ &p);
+ if (error == 0) {
filemon->pid = p->p_pid;
- PROC_UNLOCK(p);
+ PROC_UNLOCK(p);
+ }
break;
default:
Index: sys/dev/filemon/filemon_wrapper.c
===
--- sys/dev/filemon/filemon_wrapper.c (revision 253911)
+++ sys/dev/filemon/filemon_wrapper.c (working copy)
@@ -574,6 +574,7 @@
(uintmax_t)now.tv_sec, (uintmax_t)now.tv_usec);
filemon_output(filemon, filemon->msgbufr, len);
+ filemon->pid = -1;
}
/* Unlock the found filemon structure. */
pgpygaoosXB5M.pgp
Description: PGP signature
Re: svn commit: r253883 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests
On 2 Aug 2013, at 23:01, Simon J. Gerraty wrote: > > On Fri, 2 Aug 2013 22:46:36 -0700, Rui Paulo writes: >> Cool! Can we set this in /etc/make.conf ? > > I would expect so. Doesn't seem to make any effect... -- Rui Paulo ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r253924 - in head: etc etc/rc.d share/man/man5
Author: hrs
Date: Sun Aug 4 06:36:17 2013
New Revision: 253924
URL: http://svnweb.freebsd.org/changeset/base/253924
Log:
- Reimplement $gif_interfaces as a variant of $cloned_interfaces.
Newly-configured systems should use $cloned_interfaces.
- Call clone_{up,down}() and ifnet_rename() in rc.d/netif {start,stop}.
ifnet_rename() now accepts an interface name list as its argument.
- Add rc.d/netif clear. The "clear" subcommand is basically equivalent to
"stop" but it does not call clone_down().
- Add "ifname:sticky" keyword into $cloned_interfaces. If :sticky is
specified, the interface will not be destroyed in rc.d/netif stop.
- Add cloned_interfaces_sticky={YES,NO}. This variable globally sets
:sticky keyword above for all interfaces. The default value is NO.
When cloned_interfaces_sticky=YES, :nosticky keyword can be used to
override it on per interface basis.
Modified:
head/etc/network.subr
head/etc/rc.d/netif
head/share/man/man5/rc.conf.5
Modified: head/etc/network.subr
==
--- head/etc/network.subr Sun Aug 4 02:37:05 2013(r253923)
+++ head/etc/network.subr Sun Aug 4 06:36:17 2013(r253924)
@@ -660,6 +660,11 @@ ipv4_down()
IFS="$_ifs"
for _inet in $inetList ; do
# get rid of extraneous line
+ case $_inet in
+ "") break ;;
+ inet\ *);;
+ *) continue ;;
+ esac
[ -z "$_inet" ] && break
_inet=`expr "$_inet" : '.*\(inet
\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\).*'`
@@ -1192,18 +1197,62 @@ ifscript_down()
#
clone_up()
{
- local _prefix _list ifn
+ local _prefix _list ifn ifopt _iflist _n tmpargs
_prefix=
_list=
+ _iflist=$*
# create_args_IF
for ifn in ${cloned_interfaces}; do
+ # Parse ifn:ifopt.
+ OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS
+ case $_iflist in
+ ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;;
+ *) continue ;;
+ esac
+ # Skip if ifn already exists.
+ if ${IFCONFIG_CMD} $ifn > /dev/null 2>&1; then
+ continue
+ fi
${IFCONFIG_CMD} ${ifn} create `get_if_var ${ifn} create_args_IF`
if [ $? -eq 0 ]; then
_list="${_list}${_prefix}${ifn}"
[ -z "$_prefix" ] && _prefix=' '
fi
done
+ if [ -n "$gif_interfaces" ]; then
+ warn "\$gif_interfaces is obsolete. Use \$cloned_interfaces
instead."
+ fi
+ for ifn in ${gif_interfaces}; do
+ # Parse ifn:ifopt.
+ OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS
+ case $_iflist in
+ ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;;
+ *) continue ;;
+ esac
+ # Skip if ifn already exists.
+ if ${IFCONFIG_CMD} $ifn > /dev/null 2>&1; then
+ continue
+ fi
+ case $ifn in
+ gif[0-9]*)
+ ${IFCONFIG_CMD} $ifn create
+ ;;
+ *)
+ _n=$(${IFCONFIG_CMD} gif create)
+ ${IFCONFIG_CMD} $_n name $ifn
+ ;;
+ esac
+ if [ $? -eq 0 ]; then
+ _list="${_list}${_prefix}${ifn}"
+ [ -z "$_prefix" ] && _prefix=' '
+ fi
+ tmpargs=$(get_if_var $ifn gifconfig_IF)
+ eval ifconfig_${ifn}=\"tunnel \$tmpargs\"
+ done
+ if [ -n "${_list}" ]; then
+ echo "Created clone interfaces: ${_list}."
+ fi
debug "Cloned: ${_list}"
}
@@ -1213,17 +1262,42 @@ clone_up()
#
clone_down()
{
- local _prefix _list ifn
+ local _prefix _list ifn ifopt _iflist _sticky
_prefix=
_list=
+ _iflist=$*
- for ifn in ${cloned_interfaces}; do
+ : ${cloned_interfaces_sticky:=NO}
+ if checkyesno cloned_interfaces_sticky; then
+ _sticky=1
+ else
+ _sticky=0
+ fi
+ for ifn in ${cloned_interfaces} ${gif_interfaces}; do
+ # Parse ifn:ifopt.
+ OIFS=$IFS; IFS=:; set -- $ifn; ifn=$1; ifopt=$2; IFS=$OIFS
+ case $ifopt:$_sticky in
+ sticky:*) continue ;; # :sticky => not destroy
+ nosticky:*) ;; # :nosticky => destroy
+ *:1)continue ;; # global sticky knob == 1
+ esac
+ case $_iflist in
+ ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;;
+ *) continue
Re: svn commit: r253883 - in head: contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests
On Sat, 3 Aug 2013 22:11:46 -0700, Rui Paulo writes: >On 2 Aug 2013, at 23:01, Simon J. Gerraty wrote: > >> >> On Fri, 2 Aug 2013 22:46:36 -0700, Rui Paulo writes: >>> Cool! Can we set this in /etc/make.conf ? >> >> I would expect so. > >Doesn't seem to make any effect... Ah, looks like Job_SetPrefix() is called too early, will fix. You can set it on the command line for sure. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
