svn commit: r215110 - head/sys/netinet

2010-11-10 Thread Randall Stewart
Author: rrs
Date: Thu Nov 11 05:40:39 2010
New Revision: 215110
URL: http://svn.freebsd.org/changeset/base/215110

Log:
  Fix so that a multicast packet can be sent
  even if there is no route out to that mcast address. The code in
  in_pcb inadvertantly would error (no route) even though
  the user may have specified the address with the
  proper socket option (to specify the egress interface).
  Thanks bz for reminding me I forgot to commit this ;-)
  
  Reviewed by:  bz
  MFC after:1 week

Modified:
  head/sys/netinet/in_pcb.c

Modified: head/sys/netinet/in_pcb.c
==
--- head/sys/netinet/in_pcb.c   Thu Nov 11 05:38:32 2010(r215109)
+++ head/sys/netinet/in_pcb.c   Thu Nov 11 05:40:39 2010(r215110)
@@ -874,10 +874,6 @@ in_pcbconnect_setup(struct inpcb *inp, s
}
}
if (laddr.s_addr == INADDR_ANY) {
-   error = in_pcbladdr(inp, &faddr, &laddr, cred);
-   if (error)
-   return (error);
-
/*
 * If the destination address is multicast and an outgoing
 * interface has been set as a multicast option, use the
@@ -902,9 +898,12 @@ in_pcbconnect_setup(struct inpcb *inp, s
laddr = ia->ia_addr.sin_addr;
IN_IFADDR_RUNLOCK();
}
+   } else {
+   error = in_pcbladdr(inp, &faddr, &laddr, cred);
+   if (error) 
+   return (error);
}
}
-
oinp = in_pcblookup_hash(inp->inp_pcbinfo, faddr, fport, laddr, lport,
0, NULL);
if (oinp != NULL) {
___
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: r215107 - head/sys/powerpc/aim

2010-11-10 Thread Nathan Whitehorn
Author: nwhitehorn
Date: Thu Nov 11 02:40:00 2010
New Revision: 215107
URL: http://svn.freebsd.org/changeset/base/215107

Log:
  Add support for the IMISS, DLMISS, and DSMISS traps required to run
  FreeBSD on a G2 core.
  
  PR:   powerpc/111296
  Submitted by: Andrew Turner

Modified:
  head/sys/powerpc/aim/machdep.c
  head/sys/powerpc/aim/trap_subr32.S

Modified: head/sys/powerpc/aim/machdep.c
==
--- head/sys/powerpc/aim/machdep.c  Thu Nov 11 02:37:50 2010
(r215106)
+++ head/sys/powerpc/aim/machdep.c  Thu Nov 11 02:40:00 2010
(r215107)
@@ -245,6 +245,9 @@ extern void *dsitrap, *dsisize;
 extern void*decrint, *decrsize;
 extern void *extint, *extsize;
 extern void*dblow, *dbsize;
+extern void*imisstrap, *imisssize;
+extern void*dlmisstrap, *dlmisssize;
+extern void*dsmisstrap, *dsmisssize;
 
 uintptr_t
 powerpc_init(vm_offset_t startkernel, vm_offset_t endkernel,
@@ -491,6 +494,12 @@ powerpc_init(vm_offset_t startkernel, vm
bcopy(generictrap, (void *)EXC_VEC,  (size_t)&trapsize);
bcopy(generictrap, (void *)EXC_VECAST_G4, (size_t)&trapsize);
bcopy(generictrap, (void *)EXC_VECAST_G5, (size_t)&trapsize);
+   #ifndef __powerpc64__
+   /* G2-specific TLB miss helper handlers */
+   bcopy(&imisstrap, (void *)EXC_IMISS,  (size_t)&imisssize);
+   bcopy(&dlmisstrap, (void *)EXC_DLMISS,  (size_t)&dlmisssize);
+   bcopy(&dsmisstrap, (void *)EXC_DSMISS,  (size_t)&dsmisssize);
+   #endif
__syncicache(EXC_RSVD, EXC_LAST - EXC_RSVD);
 
/*

Modified: head/sys/powerpc/aim/trap_subr32.S
==
--- head/sys/powerpc/aim/trap_subr32.S  Thu Nov 11 02:37:50 2010
(r215106)
+++ head/sys/powerpc/aim/trap_subr32.S  Thu Nov 11 02:40:00 2010
(r215107)
@@ -362,6 +362,207 @@ CNAME(alitrap):
 CNAME(alisize) = .-CNAME(alitrap)
 
 /*
+ * G2 specific: instuction TLB miss.
+ */
+   .globl  CNAME(imisstrap),CNAME(imisssize)
+CNAME(imisstrap):
+   mfspr %r2, SPR_HASH1/* get first pointer */
+   addi %r1, 0, 8  /* load 8 for counter */
+   mfctr %r0   /* save counter */
+   mfspr %r3, SPR_ICMP /* get first compare value */
+   addi %r2, %r2, -8   /* pre dec the pointer */
+im0:
+   mtctr %r1   /* load counter */
+im1:
+   lwzu %r1, 8(%r2)/* get next pte */
+   cmp 0, %r1, %r3 /* see if found pte */
+   bdnzf 2, im1/* dec count br if cmp ne and if
+* count not zero */
+   bne instr_sec_hash  /* if not found set up second hash
+* or exit */
+   lwz %r1, +4(%r2)/* load tlb entry lower-word */
+   andi. %r3, %r1, 8   /* check G bit */
+   bne do_isi_prot /* if guarded, take an ISI */
+   mtctr %r0   /* restore counter */
+   mfspr %r0, SPR_IMISS/* get the miss address for the tlbli */
+   mfspr %r3, SPR_SRR1 /* get the saved cr0 bits */
+   mtcrf 0x80, %r3 /* restore CR0 */
+   mtspr SPR_RPA, %r1  /* set the pte */
+   ori %r1, %r1, 0x100 /* set reference bit */
+   srwi %r1, %r1, 8/* get byte 7 of pte */
+   tlbli %r0   /* load the itlb */
+   stb %r1, +6(%r2)/* update page table */
+   rfi /* return to executing program */
+
+instr_sec_hash:
+   andi. %r1, %r3, 0x0040  /* see if we have done second hash */
+   bne do_isi  /* if so, go to ISI interrupt */
+   mfspr %r2, SPR_HASH2/* get the second pointer */
+   ori %r3, %r3, 0x0040/* change the compare value */
+   addi %r1, %r0, 8/* load 8 for counter */
+   addi %r2, %r2, -8   /* pre dec for update on load */
+   b im0   /* try second hash */
+
+/* Create a faked ISI interrupt as the address was not found */ 
+do_isi_prot:
+   mfspr %r3, SPR_SRR1 /* get srr1 */
+   andi. %r2, %r3, 0x  /* clean upper srr1 */
+   addis %r2, %r2, 0x0800  /* or in srr<4> = 1 to flag prot
+* violation */
+   b isi1
+do_isi:
+   mfspr %r3, SPR_SRR1 /* get srr1 */
+   andi. %r2, %r3, 0x  /* clean srr1 */
+   addis %r2, %r2, 0x4000  /* or in srr1<1> = 1 to flag pte
+* not found */
+isi1: 
+   mtctr %r0   /* restore counter */
+   mtspr SPR_SRR1, %r2 /* set srr1 */
+   

svn commit: r215106 - stable/8/sys/arm/include

2010-11-10 Thread Kevin Lo
Author: kevlo
Date: Thu Nov 11 02:37:50 2010
New Revision: 215106
URL: http://svn.freebsd.org/changeset/base/215106

Log:
  MFC r214972,r215031:
  - Intel IXP425 SoC is based on the ARMv5TE architecture
  - Minor cosmetic changes

Modified:
  stable/8/sys/arm/include/cpuconf.h

Modified: stable/8/sys/arm/include/cpuconf.h
==
--- stable/8/sys/arm/include/cpuconf.h  Thu Nov 11 00:29:19 2010
(r215105)
+++ stable/8/sys/arm/include/cpuconf.h  Thu Nov 11 02:37:50 2010
(r215106)
@@ -68,7 +68,7 @@
  */
 #if (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) ||
\
  defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \
-defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425))
+defined(CPU_IXP12X0))
 #defineARM_ARCH_4  1
 #else
 #defineARM_ARCH_4  0
@@ -77,7 +77,7 @@
 #if (defined(CPU_ARM9E) || defined(CPU_ARM10) ||   \
  defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
  defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \
- defined(CPU_XSCALE_PXA2X0))
+ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425))
 #defineARM_ARCH_5  1
 #else
 #defineARM_ARCH_5  0
@@ -138,9 +138,9 @@
 #defineARM_MMU_SA1 0
 #endif
 
-#if(defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) ||  \
-defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) ||
\
-defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342)
+#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
+ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) ||   \
+ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342))
 #defineARM_MMU_XSCALE  1
 #else
 #defineARM_MMU_XSCALE  0
@@ -159,7 +159,7 @@
  */
 
 #if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
- defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342)
+ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342))
 #define ARM_XSCALE_PMU 1
 #else
 #define ARM_XSCALE_PMU 0
___
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: r215105 - head/contrib/binutils/bfd

2010-11-10 Thread Colin Percival
Author: cperciva
Date: Thu Nov 11 00:29:19 2010
New Revision: 215105
URL: http://svn.freebsd.org/changeset/base/215105

Log:
  Zero the buffer containing the .gnu_debuglink section before writing
  into it.  Prior to this commit the .gnu_debuglink section can have up
  to 3 bytes of uninitialized garbage; as a result, .ko files could
  change vary between builds.
  
  Approved by:  dim
  MFC after:7 days

Modified:
  head/contrib/binutils/bfd/opncls.c

Modified: head/contrib/binutils/bfd/opncls.c
==
--- head/contrib/binutils/bfd/opncls.c  Wed Nov 10 23:45:44 2010
(r215104)
+++ head/contrib/binutils/bfd/opncls.c  Thu Nov 11 00:29:19 2010
(r215105)
@@ -1151,7 +1151,7 @@ bfd_fill_in_gnu_debuglink_section (bfd *
   debuglink_size &= ~3;
   debuglink_size += 4;
 
-  contents = malloc (debuglink_size);
+  contents = bfd_zmalloc (debuglink_size);
   if (contents == NULL)
 {
   /* XXX Should we delete the section from the bfd ?  */
___
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: r215104 - in head: share/man/man4 sys/dev/usb/quirk usr.sbin/usbconfig

2010-11-10 Thread Nick Hibma
Author: n_hibma
Date: Wed Nov 10 23:45:44 2010
New Revision: 215104
URL: http://svn.freebsd.org/changeset/base/215104

Log:
  Add a man page for usb_quirk module, plus references in other man pages,
  and updated comments in the usb_quirk.h header file.
  
  The main purpose of this is to expose the quirks for ejecting 3G
  modules. usb_modeswitch in Linux does a great job of collecting
  information on these, and with the quirks module people can try out the
  modeswitch config file entries on FreeBSD, hence the SCSI strings in the
  man page.
  
  MFC after:2 weeks

Added:
  head/share/man/man4/usb_quirk.4
 - copied, changed from r214753, head/share/man/man4/u3g.4
Modified:
  head/share/man/man4/Makefile
  head/share/man/man4/u3g.4
  head/sys/dev/usb/quirk/usb_quirk.h
  head/usr.sbin/usbconfig/usbconfig.8

Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileWed Nov 10 23:36:13 2010
(r215103)
+++ head/share/man/man4/MakefileWed Nov 10 23:45:44 2010
(r215104)
@@ -469,6 +469,7 @@ MAN=aac.4 \
urio.4 \
${_urtw.4} \
usb.4 \
+   usb_quirk.4 \
uslcom.4 \
utopia.4 \
uvisor.4 \

Modified: head/share/man/man4/u3g.4
==
--- head/share/man/man4/u3g.4   Wed Nov 10 23:36:13 2010(r215103)
+++ head/share/man/man4/u3g.4   Wed Nov 10 23:45:44 2010(r215104)
@@ -85,26 +85,19 @@ In some of these devices a mass storage 
 .Xr umass 4
 driver is present which contains Windows and Mac OS X drivers.
 The device starts up in disk mode (TruInstall, ZeroCD, etc.) and requires
-additional commands to switch it to modem mode.
+additional commands to switch it to modem mode. If your device is not
+switching automatically, please try to add quirks. See
+.Xr usbconfig 5
+and
+.Xr usb_quirk 4 .
 .Pp
-The
-.Xr u3gstub 4
-device will attach temporarily to a 3G device with a mass storage device and
-force it to switch to modem mode.
-The attach and detach of
-.Xr u3gstub
-and any driver disk device present on the 3G device is hidden, unless the
-machine was booted in verbose mode (see
-.Xr boot 8 ) .
-To temporarily unhide the device, set
-.Va debug.bootverbose
-to 1 using
-.Xr sysctl 8
-and replug the device.
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr ucom 4 ,
-.Xr usb 4
+.XR u3g 4 ,
+.Xr usb 4 ,
+.Xr usb_quirk 4 ,
+.Xr usbconfig 5
 .Sh HISTORY
 The
 .Nm

Copied and modified: head/share/man/man4/usb_quirk.4 (from r214753, 
head/share/man/man4/u3g.4)
==
--- head/share/man/man4/u3g.4   Wed Nov  3 20:50:41 2010(r214753, copy 
source)
+++ head/share/man/man4/usb_quirk.4 Wed Nov 10 23:45:44 2010
(r215104)
@@ -1,9 +1,7 @@
 .\"
-.\" Copyright (c) 2008 AnyWi Technologies
+.\" Copyright (c) 2010 AnyWi Technologies
 .\" All rights reserved.
 .\"
-.\" This code is derived from uark.c
-.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
@@ -18,108 +16,181 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 7, 2008
-.Dt U3G 4
+.Dd November 9, 2010
+.Dt USB_QUIRK 4
 .Os
 .Sh NAME
-.Nm u3g
-.Nd USB support for 3G datacards
+.Nm usb_quirk
+.Nd USB quirks module
 .Sh SYNOPSIS
-To compile this driver into the kernel,
-place the following lines in your
+To compile this module into the kernel,
+place the following line in your
 kernel configuration file:
 .Bd -ragged -offset indent
-.Cd "device u3g"
 .Cd "device ucom"
 .Ed
 .Pp
-Alternatively, to load the driver as a
-module at boot time, place the following line in
+Alternatively, to load the module at boot
+time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
-u3g_load="YES"
+usb_quirk_load="YES"
 .Ed
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the multiple USB-to-serial interfaces exposed by
-many 3G USB/PCCard modems.
-.Pp
-The device is accessed through the
-.Xr ucom 4
-driver which makes it behave like a
-.Xr tty 4 .
-.Sh HARDWARE
-The
-.Nm
-driver supports the following adapters:
-.Pp
-.Bl -bullet -compact
-.It
-Option GT 3G Fusion, GT Fusion Quad, etc. (only 3G part, not WLAN)
-.It
-Option GT 3G, GT 3G Quad, etc.
-.It
-Vodafone Mobile Connect Card 3G
-.It
-Qualcomm Inc. CDMA MSM
-.It
-Huawei B190, E180v, E220 ('')
-.It
-Novatel U740, MC950D, X950D, etc.
-.It
-Sierra MC875U, MC8775U, etc.
+module provides support for dynamically adding and removing quirks for
+USB devices with
+.Xr usbconfig 5 .
+.Sh General quirks:
+.Bl -tag -width Ds
+.It UQ_AUDIO_SWAP_LR
+swap left and right channels
+.It UQ_AU_INP_ASYNC
+input is async despite claim of adaptive
+.It UQ_AU_NO_FRAC
+don't adjust for fractional samples
+.It UQ_AU_NO_XU
+audio device h

svn commit: r215103 - in releng/7.1: . sys/conf sys/fs/pseudofs

2010-11-10 Thread Colin Percival
Author: cperciva
Date: Wed Nov 10 23:36:13 2010
New Revision: 215103
URL: http://svn.freebsd.org/changeset/base/215103

Log:
  Don't unlock a mutex which wasn't locked.
  
  PR:   kern/137310
  Approved by:  so (cperciva)
  Security: FreeBSD-SA-10:09.pseudofs

Modified:
  releng/7.1/UPDATING
  releng/7.1/sys/conf/newvers.sh
  releng/7.1/sys/fs/pseudofs/pseudofs_vnops.c

Modified: releng/7.1/UPDATING
==
--- releng/7.1/UPDATING Wed Nov 10 21:06:49 2010(r215102)
+++ releng/7.1/UPDATING Wed Nov 10 23:36:13 2010(r215103)
@@ -8,6 +8,9 @@ Items affecting the ports and packages s
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
 
+20101110:  p15 FreeBSD-SA-10:09.pseudofs
+   Don't unlock a mutex which wasn't locked.
+
 20100920:  p14 FreeBSD-SA-10:08.bzip2
Fix an integer overflow in RLE length parsing when decompressing
corrupt bzip2 data.

Modified: releng/7.1/sys/conf/newvers.sh
==
--- releng/7.1/sys/conf/newvers.sh  Wed Nov 10 21:06:49 2010
(r215102)
+++ releng/7.1/sys/conf/newvers.sh  Wed Nov 10 23:36:13 2010
(r215103)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="7.1"
-BRANCH="RELEASE-p14"
+BRANCH="RELEASE-p15"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/7.1/sys/fs/pseudofs/pseudofs_vnops.c
==
--- releng/7.1/sys/fs/pseudofs/pseudofs_vnops.c Wed Nov 10 21:06:49 2010
(r215102)
+++ releng/7.1/sys/fs/pseudofs/pseudofs_vnops.c Wed Nov 10 23:36:13 2010
(r215103)
@@ -305,7 +305,6 @@ pfs_getextattr(struct vop_getextattr_arg
if (proc != NULL)
PROC_UNLOCK(proc);
 
-   pfs_unlock(pn);
PFS_RETURN (error);
 }
 
___
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: r215101 - head/sys/powerpc/powerpc

2010-11-10 Thread Nathan Whitehorn
On Wed, 10 Nov 2010 20:28:10 + (UTC)
Nathan Whitehorn  wrote:

> Author: nwhitehorn
> Date: Wed Nov 10 20:28:10 2010
> New Revision: 215101
> URL: http://svn.freebsd.org/changeset/base/215101
> 
> Log:
>   Entering deep nap mode on the 970MP requires that both MSR[NAP] and
>   MSR[DEEPNAP] be set, not just MSR[DEEPNAP]. Fixing this reduces the
> idle temperature of my CPUs from 57 to 38 degrees and makes one-shot
> timer mode work properly.

All instances of MSR in this commit message should be HID0.
-Nathan
___
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: r215102 - head/sys/kern

2010-11-10 Thread Attilio Rao
Author: attilio
Date: Wed Nov 10 21:06:49 2010
New Revision: 215102
URL: http://svn.freebsd.org/changeset/base/215102

Log:
  Fix typos.
  
  Submitted by: gianni
  MFC after:3 days

Modified:
  head/sys/kern/sched_ule.c

Modified: head/sys/kern/sched_ule.c
==
--- head/sys/kern/sched_ule.c   Wed Nov 10 20:28:10 2010(r215101)
+++ head/sys/kern/sched_ule.c   Wed Nov 10 21:06:49 2010(r215102)
@@ -165,7 +165,7 @@ static struct td_sched td_sched0;
  * before throttling back.
  * SLP_RUN_FORK:   Maximum slp+run time to inherit at fork time.
  * INTERACT_MAX:   Maximum interactivity value.  Smaller is better.
- * INTERACT_THRESH:Threshhold for placement on the current runq.
+ * INTERACT_THRESH:Threshold for placement on the current runq.
  */
 #defineSCHED_SLP_RUN_MAX   ((hz * 5) << SCHED_TICK_SHIFT)
 #defineSCHED_SLP_RUN_FORK  ((hz / 2) << SCHED_TICK_SHIFT)
@@ -2179,7 +2179,7 @@ sched_tick(int cnt)
ts->ts_ltick = ticks;
ts->ts_incrtick = ticks;
/*
-* Update if we've exceeded our desired tick threshhold by over one
+* Update if we've exceeded our desired tick threshold by over one
 * second.
 */
if (ts->ts_ftick + SCHED_TICK_MAX < ts->ts_ltick)
___
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: r215101 - head/sys/powerpc/powerpc

2010-11-10 Thread Nathan Whitehorn
Author: nwhitehorn
Date: Wed Nov 10 20:28:10 2010
New Revision: 215101
URL: http://svn.freebsd.org/changeset/base/215101

Log:
  Entering deep nap mode on the 970MP requires that both MSR[NAP] and
  MSR[DEEPNAP] be set, not just MSR[DEEPNAP]. Fixing this reduces the idle
  temperature of my CPUs from 57 to 38 degrees and makes one-shot timer
  mode work properly.
  
  Hint from:mav
  MFC after:4 days

Modified:
  head/sys/powerpc/powerpc/cpu.c

Modified: head/sys/powerpc/powerpc/cpu.c
==
--- head/sys/powerpc/powerpc/cpu.c  Wed Nov 10 20:09:05 2010
(r215100)
+++ head/sys/powerpc/powerpc/cpu.c  Wed Nov 10 20:28:10 2010
(r215101)
@@ -455,8 +455,8 @@ cpu_970_setup(int cpuid, uint16_t vers)
/* Configure power-saving mode */
switch (vers) {
case IBM970MP:
-   hid0_hi |= (HID0_DEEPNAP | HID0_DPM);
-   hid0_hi &= ~(HID0_DOZE | HID0_NAP);
+   hid0_hi |= (HID0_DEEPNAP | HID0_NAP | HID0_DPM);
+   hid0_hi &= ~HID0_DOZE;
break;
default:
hid0_hi |= (HID0_NAP | HID0_DPM);
___
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: r215100 - head/sys/powerpc/powermac

2010-11-10 Thread Nathan Whitehorn
Author: nwhitehorn
Date: Wed Nov 10 20:09:05 2010
New Revision: 215100
URL: http://svn.freebsd.org/changeset/base/215100

Log:
  Disabling CPU NAP modes during SMU commands is a hack needed only on U3
  systems. Don't use it on non-U3 systems to allow cpu_idle() to work
  correctly.

Modified:
  head/sys/powerpc/powermac/smu.c

Modified: head/sys/powerpc/powermac/smu.c
==
--- head/sys/powerpc/powermac/smu.c Wed Nov 10 19:33:13 2010
(r215099)
+++ head/sys/powerpc/powermac/smu.c Wed Nov 10 20:09:05 2010
(r215100)
@@ -96,6 +96,7 @@ struct smu_softc {
 
struct resource *sc_memr;
int sc_memrid;
+   int sc_u3;
 
bus_dma_tag_t   sc_dmatag;
bus_space_tag_t sc_bt;
@@ -275,6 +276,10 @@ smu_attach(device_t dev)
sc->sc_cur_cmd = NULL;
sc->sc_doorbellirqid = -1;
 
+   sc->sc_u3 = 0;
+   if (OF_finddevice("/u3") != -1)
+   sc->sc_u3 = 1;
+
/*
 * Map the mailbox area. This should be determined from firmware,
 * but I have not found a simple way to do that.
@@ -417,7 +422,9 @@ smu_send_cmd(device_t dev, struct smu_cm
 
mtx_assert(&sc->sc_mtx, MA_OWNED);
 
-   powerpc_pow_enabled = 0;/* SMU cannot work if we go to NAP */
+   if (sc->sc_u3)
+   powerpc_pow_enabled = 0; /* SMU cannot work if we go to NAP */
+
sc->sc_cur_cmd = cmd;
 
/* Copy the command to the mailbox */
@@ -464,7 +471,8 @@ smu_doorbell_intr(void *xdev)
sizeof(sc->sc_cmd->data));
wakeup(sc->sc_cur_cmd);
sc->sc_cur_cmd = NULL;
-   powerpc_pow_enabled = 1;
+   if (sc->sc_u3)
+   powerpc_pow_enabled = 1;
 
 done:
/* Queue next command if one is pending */
___
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: r215088 - head/sys/geom/part

2010-11-10 Thread Gary Jennejohn
On Wed, 10 Nov 2010 09:40:03 -0800
Marcel Moolenaar  wrote:

> 
> On Nov 10, 2010, at 6:38 AM, Andrey V. Elsukov wrote:
> 
> > Author: ae
> > Date: Wed Nov 10 14:38:51 2010
> > New Revision: 215088
> > URL: http://svn.freebsd.org/changeset/base/215088
> > 
> > Log:
> >  In r212554 name of G_PART_PARM_GEOM and G_PART_PARM_PROVIDER
> >  ctlreq parameters was changed to "arg0". Fix the last place where
> >  it is used.
> 
> A regression for sure. Nothing worse than having a good
> and clear interface messed up by a lousy implementation
> of geom(8)...
> 
> *sigh*
> 

I wondered about this change myself.  Juat because it's called arg0 in the
declaration doesn't mean that the callers have to use it.

Maybe ther was a good reason for it which I don't understand.  Consistency,
I suppose.

-- 
Gary Jennejohn
___
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: r215099 - in stable/8/sys/powerpc: aim booke include mpc85xx powermac powerpc psim

2010-11-10 Thread Alexander Motin
Author: mav
Date: Wed Nov 10 19:33:13 2010
New Revision: 215099
URL: http://svn.freebsd.org/changeset/base/215099

Log:
  MFC r209639 by marcel:
  Remove the unneeded header .
  
  Reviewed by:  marcel

Deleted:
  stable/8/sys/powerpc/include/intr.h
Modified:
  stable/8/sys/powerpc/aim/clock.c
  stable/8/sys/powerpc/booke/clock.c
  stable/8/sys/powerpc/mpc85xx/atpic.c
  stable/8/sys/powerpc/mpc85xx/opic.c
  stable/8/sys/powerpc/powermac/cuda.c
  stable/8/sys/powerpc/powermac/hrowpic.c
  stable/8/sys/powerpc/powermac/openpic_macio.c
  stable/8/sys/powerpc/powermac/pmu.c
  stable/8/sys/powerpc/powerpc/openpic.c
  stable/8/sys/powerpc/psim/openpic_iobus.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/powerpc/aim/clock.c
==
--- stable/8/sys/powerpc/aim/clock.cWed Nov 10 19:03:30 2010
(r215098)
+++ stable/8/sys/powerpc/aim/clock.cWed Nov 10 19:33:13 2010
(r215099)
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
 #include 
 

Modified: stable/8/sys/powerpc/booke/clock.c
==
--- stable/8/sys/powerpc/booke/clock.c  Wed Nov 10 19:03:30 2010
(r215098)
+++ stable/8/sys/powerpc/booke/clock.c  Wed Nov 10 19:33:13 2010
(r215099)
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 
 /*

Modified: stable/8/sys/powerpc/mpc85xx/atpic.c
==
--- stable/8/sys/powerpc/mpc85xx/atpic.cWed Nov 10 19:03:30 2010
(r215098)
+++ stable/8/sys/powerpc/mpc85xx/atpic.cWed Nov 10 19:33:13 2010
(r215099)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 #include 
 #include 
 

Modified: stable/8/sys/powerpc/mpc85xx/opic.c
==
--- stable/8/sys/powerpc/mpc85xx/opic.c Wed Nov 10 19:03:30 2010
(r215098)
+++ stable/8/sys/powerpc/mpc85xx/opic.c Wed Nov 10 19:33:13 2010
(r215099)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: stable/8/sys/powerpc/powermac/cuda.c
==
--- stable/8/sys/powerpc/powermac/cuda.cWed Nov 10 19:03:30 2010
(r215098)
+++ stable/8/sys/powerpc/powermac/cuda.cWed Nov 10 19:33:13 2010
(r215099)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: stable/8/sys/powerpc/powermac/hrowpic.c
==
--- stable/8/sys/powerpc/powermac/hrowpic.c Wed Nov 10 19:03:30 2010
(r215098)
+++ stable/8/sys/powerpc/powermac/hrowpic.c Wed Nov 10 19:33:13 2010
(r215099)
@@ -45,7 +45,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: stable/8/sys/powerpc/powermac/openpic_macio.c
==
--- stable/8/sys/powerpc/powermac/openpic_macio.c   Wed Nov 10 19:03:30 
2010(r215098)
+++ stable/8/sys/powerpc/powermac/openpic_macio.c   Wed Nov 10 19:33:13 
2010(r215099)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: stable/8/sys/powerpc/powermac/pmu.c
==
--- stable/8/sys/powerpc/powermac/pmu.c Wed Nov 10 19:03:30 2010
(r215098)
+++ stable/8/sys/powerpc/powermac/pmu.c Wed Nov 10 19:33:13 2010
(r215099)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: stable/8/sys/powerpc/powerpc/openpic.c
==
--- stable/8/sys/powerpc/powerpc/openpic.c  Wed Nov 10 19:03:30 2010
(r215098)
+++ stable/8/sys/powerpc/powerpc/openpic.c  Wed Nov 10 19:33:13 2010
(r215099)
@@ -33,7 +33,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: stable/8/sys/powerpc/psim/openpic_iobus.c
==
--- stable/8/sys/powerpc/psim/openpic_iobus.c   Wed Nov 10 19:03:30 2010
(r215098)
+++ stable/8/sys/powerpc/psim/openpic_iobus.c   Wed Nov 10 19:33:13 2010
(r215099)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #inclu

Re: svn commit: r215092 - in stable/8/sys: amd64/amd64 i386/i386

2010-11-10 Thread John Baldwin
On Wednesday, November 10, 2010 12:33:47 pm John Baldwin wrote:
> Author: jhb
> Date: Wed Nov 10 17:33:47 2010
> New Revision: 215092
> URL: http://svn.freebsd.org/changeset/base/215092
> 
> Log:
>   MFC 27:
>   Simplify the logic for handling ipi_selected() and ipi_cpu() in the
>   amd64/i386 case.

I probably should have included this change when MFC'ing ipi_cpu() yesterday.

-- 
John Baldwin
___
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: r215097 - in head/sys: amd64/acpica dev/acpica i386/acpica x86/acpica

2010-11-10 Thread Jung-uk Kim
Author: jkim
Date: Wed Nov 10 18:50:12 2010
New Revision: 215097
URL: http://svn.freebsd.org/changeset/base/215097

Log:
  Make APM emulation look more closer to its origin.  Use device_get_softc(9)
  instead of hardcoding acpi(4) unit number as we have device_t for it.

Modified:
  head/sys/amd64/acpica/acpi_machdep.c
  head/sys/dev/acpica/acpivar.h
  head/sys/i386/acpica/acpi_machdep.c
  head/sys/x86/acpica/acpi_apm.c

Modified: head/sys/amd64/acpica/acpi_machdep.c
==
--- head/sys/amd64/acpica/acpi_machdep.cWed Nov 10 18:45:32 2010
(r215096)
+++ head/sys/amd64/acpica/acpi_machdep.cWed Nov 10 18:50:12 2010
(r215097)
@@ -61,10 +61,9 @@ acpi_machdep_init(device_t dev)
 {
struct acpi_softc *sc;
 
-   sc = devclass_get_softc(devclass_find("acpi"), 0);
+   sc = device_get_softc(dev);
 
-   /* Create a clone for /dev/acpi also. */
-   sc->acpi_clone = acpi_apm_create_clone(sc->acpi_dev_t, sc);
+   acpi_apm_init(sc);
 
if (intr_model != ACPI_INTR_PIC)
acpi_SetIntrModel(intr_model);

Modified: head/sys/dev/acpica/acpivar.h
==
--- head/sys/dev/acpica/acpivar.h   Wed Nov 10 18:45:32 2010
(r215096)
+++ head/sys/dev/acpica/acpivar.h   Wed Nov 10 18:50:12 2010
(r215097)
@@ -397,7 +397,7 @@ int acpi_device_pwr_for_sleep(device_t 
int *dstate);
 
 /* APM emulation */
-struct apm_clone_data *acpi_apm_create_clone(struct cdev *, struct acpi_softc 
*);
+void   acpi_apm_init(struct acpi_softc *);
 
 /* Misc. */
 static __inline struct acpi_softc *

Modified: head/sys/i386/acpica/acpi_machdep.c
==
--- head/sys/i386/acpica/acpi_machdep.c Wed Nov 10 18:45:32 2010
(r215096)
+++ head/sys/i386/acpica/acpi_machdep.c Wed Nov 10 18:50:12 2010
(r215097)
@@ -61,10 +61,9 @@ acpi_machdep_init(device_t dev)
 {
struct acpi_softc *sc;
 
-   sc = devclass_get_softc(devclass_find("acpi"), 0);
+   sc = device_get_softc(dev);
 
-   /* Create a clone for /dev/acpi also. */
-   sc->acpi_clone = acpi_apm_create_clone(sc->acpi_dev_t, sc);
+   acpi_apm_init(sc);
acpi_install_wakeup_handler(sc);
 
if (intr_model == ACPI_INTR_PIC)

Modified: head/sys/x86/acpica/acpi_apm.c
==
--- head/sys/x86/acpica/acpi_apm.c  Wed Nov 10 18:45:32 2010
(r215096)
+++ head/sys/x86/acpica/acpi_apm.c  Wed Nov 10 18:50:12 2010
(r215097)
@@ -29,10 +29,10 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -477,14 +477,13 @@ apmreadfilt(struct knote *kn, long hint)
return (sleeping);
 }
 
-struct apm_clone_data *
-acpi_apm_create_clone(struct cdev *dev, struct acpi_softc *acpi_sc)
+void
+acpi_apm_init(struct acpi_softc *sc)
 {
-   struct apm_clone_data *clone;
 
-   STAILQ_INIT(&acpi_sc->apm_cdevs);
-   clone = apm_create_clone(dev, acpi_sc);
+   /* Create a clone for /dev/acpi also. */
+   STAILQ_INIT(&sc->apm_cdevs);
+   sc->acpi_clone = apm_create_clone(sc->acpi_dev_t, sc);
clone_setup(&apm_clones);
EVENTHANDLER_REGISTER(dev_clone, apm_clone, 0, 1000);
-   return (clone);
 }
___
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: r215096 - head/usr.bin/calendar/calendars

2010-11-10 Thread Zack Kirsch
Author: zack
Date: Wed Nov 10 18:45:32 2010
New Revision: 215096
URL: http://svn.freebsd.org/changeset/base/215096

Log:
  Add my birthday to the calendar so everyone can send me presents.
  
  Approved by: zml (mentor)

Modified:
  head/usr.bin/calendar/calendars/calendar.freebsd

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdWed Nov 10 18:41:38 
2010(r215095)
+++ head/usr.bin/calendar/calendars/calendar.freebsdWed Nov 10 18:45:32 
2010(r215096)
@@ -171,6 +171,7 @@
 06/04  Justin Gibbs  born in San Pedro, California, United 
States, 1973
 06/04  Jason Evans  born in Greeley, Colorado, United 
States, 1973
 06/04  Thomas Moestl  born in Braunschweig, Niedersachsen, 
Germany, 1980
+06/04  Zack Kirsch  born in Memphis, Tennessee, United 
States, 1982
 06/06  Sergei Kolobov  born in Karpinsk, Russian 
Federation, 1972
 06/06  Alan Eldridge  died in Denver, Colorado, 2003
 06/07  Jimmy Olgeni  born in Milano, Italy, 1976
___
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: r215095 - in head/sys/dev/usb: quirk serial

2010-11-10 Thread Nick Hibma
Author: n_hibma
Date: Wed Nov 10 18:41:38 2010
New Revision: 215095
URL: http://svn.freebsd.org/changeset/base/215095

Log:
  Allow specification of eject method through quirks, so people can test
  drive eject methods before supplying patches.

Modified:
  head/sys/dev/usb/quirk/usb_quirk.c
  head/sys/dev/usb/quirk/usb_quirk.h
  head/sys/dev/usb/serial/u3g.c

Modified: head/sys/dev/usb/quirk/usb_quirk.c
==
--- head/sys/dev/usb/quirk/usb_quirk.c  Wed Nov 10 18:37:03 2010
(r215094)
+++ head/sys/dev/usb/quirk/usb_quirk.c  Wed Nov 10 18:41:38 2010
(r215095)
@@ -512,6 +512,16 @@ static const char *usb_quirk_str[USB_QUI
[UQ_MSC_FORCE_PROTO_ATAPI]  = "UQ_MSC_FORCE_PROTO_ATAPI",
[UQ_MSC_FORCE_PROTO_UFI]= "UQ_MSC_FORCE_PROTO_UFI",
[UQ_MSC_FORCE_PROTO_RBC]= "UQ_MSC_FORCE_PROTO_RBC",
+   [UQ_MSC_EJECT_HUAWEI]   = "UQ_MSC_EJECT_HUAWEI",
+   [UQ_MSC_EJECT_SIERRA]   = "UQ_MSC_EJECT_SIERRA",
+   [UQ_MSC_EJECT_SCSIEJECT]= "UQ_MSC_EJECT_SCSIEJECT",
+   [UQ_MSC_EJECT_REZERO]   = "UQ_MSC_EJECT_REZERO",
+   [UQ_MSC_EJECT_ZTESTOR]  = "UQ_MSC_EJECT_ZTESTOR",
+   [UQ_MSC_EJECT_CMOTECH]  = "UQ_MSC_EJECT_CMOTECH",
+   [UQ_MSC_EJECT_WAIT] = "UQ_MSC_EJECT_WAIT",
+   [UQ_MSC_EJECT_SAEL_M460]= "UQ_MSC_EJECT_SAEL_M460",
+   [UQ_MSC_EJECT_HUAWEISCSI]   = "UQ_MSC_EJECT_HUAWEISCSI",
+   [UQ_MSC_EJECT_TCT]  = "UQ_MSC_EJECT_TCT",
 };
 
 /**

Modified: head/sys/dev/usb/quirk/usb_quirk.h
==
--- head/sys/dev/usb/quirk/usb_quirk.h  Wed Nov 10 18:37:03 2010
(r215094)
+++ head/sys/dev/usb/quirk/usb_quirk.h  Wed Nov 10 18:41:38 2010
(r215095)
@@ -59,31 +59,43 @@ enum {  /* keep in sync with usb_quirk_st
UQ_CFG_INDEX_3, /* select configuration index 3 by default */
UQ_CFG_INDEX_4, /* select configuration index 4 by default */
UQ_CFG_INDEX_0, /* select configuration index 0 by default */
-   UQ_ASSUME_CM_OVER_DATA, /* modem device breaks on cm over data */
+   UQ_ASSUME_CM_OVER_DATA, /* assume cm over data feature */
 
/* USB Mass Storage Quirks. See "storage/umass.c" for a detailed 
description. */
-   UQ_MSC_NO_TEST_UNIT_READY,
-   UQ_MSC_NO_RS_CLEAR_UA,
-   UQ_MSC_NO_START_STOP,
-   UQ_MSC_NO_GETMAXLUN,
-   UQ_MSC_NO_INQUIRY,
-   UQ_MSC_NO_INQUIRY_EVPD,
-   UQ_MSC_NO_SYNC_CACHE,
-   UQ_MSC_SHUTTLE_INIT,
-   UQ_MSC_ALT_IFACE_1,
-   UQ_MSC_FLOPPY_SPEED,
-   UQ_MSC_IGNORE_RESIDUE,
-   UQ_MSC_WRONG_CSWSIG,
-   UQ_MSC_RBC_PAD_TO_12,
-   UQ_MSC_READ_CAP_OFFBY1,
-   UQ_MSC_FORCE_SHORT_INQ,
-   UQ_MSC_FORCE_WIRE_BBB,
-   UQ_MSC_FORCE_WIRE_CBI,
-   UQ_MSC_FORCE_WIRE_CBI_I,
-   UQ_MSC_FORCE_PROTO_SCSI,
-   UQ_MSC_FORCE_PROTO_ATAPI,
-   UQ_MSC_FORCE_PROTO_UFI,
-   UQ_MSC_FORCE_PROTO_RBC,
+   UQ_MSC_NO_TEST_UNIT_READY,  /* send start/stop instead of TUR */
+   UQ_MSC_NO_RS_CLEAR_UA,  /* does not reset Unit Att. */
+   UQ_MSC_NO_START_STOP,   /* does not support start/stop */
+   UQ_MSC_NO_GETMAXLUN,/* does not support get max LUN */
+   UQ_MSC_NO_INQUIRY,  /* fake generic inq response */
+   UQ_MSC_NO_INQUIRY_EVPD, /* does not support inq EVPD */
+   UQ_MSC_NO_SYNC_CACHE,   /* does not support sync cache */ 
+   UQ_MSC_SHUTTLE_INIT,/* requires Shuttle init sequence */
+   UQ_MSC_ALT_IFACE_1, /* switch to alternate interface 1 */
+   UQ_MSC_FLOPPY_SPEED,/* does floppy speeds (20kb/s) */
+   UQ_MSC_IGNORE_RESIDUE,  /* gets residue wrong */
+   UQ_MSC_WRONG_CSWSIG,/* uses wrong CSW signature */
+   UQ_MSC_RBC_PAD_TO_12,   /* pad RBC requests to 12 bytes */
+   UQ_MSC_READ_CAP_OFFBY1, /* reports sector count, not max sec. */
+   UQ_MSC_FORCE_SHORT_INQ, /* does not support full inq. */
+   UQ_MSC_FORCE_WIRE_BBB,  /* force BBB wire protocol */
+   UQ_MSC_FORCE_WIRE_CBI,  /* force CBI wire protocol */
+   UQ_MSC_FORCE_WIRE_CBI_I,/* force CBI with int. wire protocol */
+   UQ_MSC_FORCE_PROTO_SCSI,/* force SCSI command protocol */
+   UQ_MSC_FORCE_PROTO_ATAPI,   /* force ATAPI command protocol */
+   UQ_MSC_FORCE_PROTO_UFI, /* force UFI command protocol */
+   UQ_MSC_FORCE_PROTO_RBC, /* force RBC command protocol */
+
+   /* Ejection of mass storage (driver disk) */
+   UQ_MSC_EJECT_HUAWEI,/* ejects after Huawei USB command */
+   UQ_MSC_EJECT_SIERRA,/* ejects after Sierra USB command */

Re: svn commit: r215088 - head/sys/geom/part

2010-11-10 Thread Marcel Moolenaar

On Nov 10, 2010, at 6:38 AM, Andrey V. Elsukov wrote:

> Author: ae
> Date: Wed Nov 10 14:38:51 2010
> New Revision: 215088
> URL: http://svn.freebsd.org/changeset/base/215088
> 
> Log:
>  In r212554 name of G_PART_PARM_GEOM and G_PART_PARM_PROVIDER
>  ctlreq parameters was changed to "arg0". Fix the last place where
>  it is used.

A regression for sure. Nothing worse than having a good
and clear interface messed up by a lousy implementation
of geom(8)...

*sigh*

-- 
Marcel Moolenaar
xcl...@mac.com



___
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: r215094 - head/share/misc

2010-11-10 Thread Zack Kirsch
Author: zack
Date: Wed Nov 10 18:37:03 2010
New Revision: 215094
URL: http://svn.freebsd.org/changeset/base/215094

Log:
  Add myself as a new committer and add zml as my mentor.
  
  Approved by: zml (mentor)

Modified:
  head/share/misc/committers-src.dot

Modified: head/share/misc/committers-src.dot
==
--- head/share/misc/committers-src.dot  Wed Nov 10 17:57:34 2010
(r215093)
+++ head/share/misc/committers-src.dot  Wed Nov 10 18:37:03 2010
(r215094)
@@ -211,6 +211,7 @@ wilko [label="Wilko bulte\nwi...@freebsd
 wsalamon [label="Wayne salamon\nwsala...@freebsd.org\n2005/06/25"]
 yar [label="Yar tikhiy\n...@freebsd.org\n2001/03/25"]
 yongari [label="Pyun yonghyeon\nyong...@freebsd.org\n2004/08/01"]
+zack [label="Zack kirsch\nz...@freebsd.org\n2010/11/05"]
 zec [label="Marko zec\n...@freebsd.org\n2008/06/22"]
 
 # Pseudo target representing rev 1.1 of commit.allow
@@ -503,5 +504,6 @@ wes -> scf
 wollman -> gad
 
 zml -> mdf
+zml -> zack
 
 }
___
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: r215093 - in head/sys: sparc64/include vm

2010-11-10 Thread Alan Cox
Author: alc
Date: Wed Nov 10 17:57:34 2010
New Revision: 215093
URL: http://svn.freebsd.org/changeset/base/215093

Log:
  Enable reservation-based physical memory allocation.  Even without the
  creation of large page mappings in the pmap, it can provide modest
  performance benefits.  In particular, for a "buildworld" on a 2x 1GHz
  Ultrasparc IIIi it reduced the wall clock time by 2.2% and the system
  time by 12.6%.
  
  Tested by:marius@

Modified:
  head/sys/sparc64/include/vmparam.h
  head/sys/vm/vm_reserv.c

Modified: head/sys/sparc64/include/vmparam.h
==
--- head/sys/sparc64/include/vmparam.h  Wed Nov 10 17:33:47 2010
(r215092)
+++ head/sys/sparc64/include/vmparam.h  Wed Nov 10 17:57:34 2010
(r215093)
@@ -128,10 +128,17 @@
 #endif
 
 /*
- * Disable superpage reservations.
+ * Enable superpage reservations: 1 level.
  */
 #ifndefVM_NRESERVLEVEL
-#defineVM_NRESERVLEVEL 0
+#defineVM_NRESERVLEVEL 1
+#endif
+
+/*
+ * Level 0 reservations consist of 512 pages.
+ */
+#ifndefVM_LEVEL_0_ORDER
+#defineVM_LEVEL_0_ORDER9
 #endif
 
 /*

Modified: head/sys/vm/vm_reserv.c
==
--- head/sys/vm/vm_reserv.c Wed Nov 10 17:33:47 2010(r215092)
+++ head/sys/vm/vm_reserv.c Wed Nov 10 17:57:34 2010(r215093)
@@ -194,7 +194,7 @@ sysctl_vm_reserv_partpopq(SYSCTL_HANDLER
}
mtx_unlock(&vm_page_queue_free_mtx);
sbuf_printf(&sbuf, "%5d: %6dK, %6d\n", level,
-   unused_pages * (PAGE_SIZE / 1024), counter);
+   unused_pages * ((int)PAGE_SIZE / 1024), counter);
}
error = sbuf_finish(&sbuf);
sbuf_delete(&sbuf);
___
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: r215092 - in stable/8/sys: amd64/amd64 i386/i386

2010-11-10 Thread John Baldwin
Author: jhb
Date: Wed Nov 10 17:33:47 2010
New Revision: 215092
URL: http://svn.freebsd.org/changeset/base/215092

Log:
  MFC 27:
  Simplify the logic for handling ipi_selected() and ipi_cpu() in the
  amd64/i386 case.

Modified:
  stable/8/sys/amd64/amd64/mp_machdep.c
  stable/8/sys/i386/i386/mp_machdep.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/amd64/amd64/mp_machdep.c
==
--- stable/8/sys/amd64/amd64/mp_machdep.c   Wed Nov 10 17:17:38 2010
(r215091)
+++ stable/8/sys/amd64/amd64/mp_machdep.c   Wed Nov 10 17:33:47 2010
(r215092)
@@ -1081,6 +1081,30 @@ smp_targeted_tlb_shootdown(cpumask_t mas
mtx_unlock_spin(&smp_ipi_mtx);
 }
 
+/*
+ * Send an IPI to specified CPU handling the bitmap logic.
+ */
+static void
+ipi_send_cpu(int cpu, u_int ipi)
+{
+   u_int bitmap, old_pending, new_pending;
+
+   KASSERT(cpu_apic_ids[cpu] != -1, ("IPI to non-existent CPU %d", cpu));
+
+   if (IPI_IS_BITMAPED(ipi)) {
+   bitmap = 1 << ipi;
+   ipi = IPI_BITMAP_VECTOR;
+   do {
+   old_pending = cpu_ipi_pending[cpu];
+   new_pending = old_pending | bitmap;
+   } while  (!atomic_cmpset_int(&cpu_ipi_pending[cpu],
+   old_pending, new_pending)); 
+   if (old_pending)
+   return;
+   }
+   lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]);
+}
+
 void
 smp_cache_flush(void)
 {
@@ -1172,14 +1196,6 @@ void
 ipi_selected(cpumask_t cpus, u_int ipi)
 {
int cpu;
-   u_int bitmap = 0;
-   u_int old_pending;
-   u_int new_pending;
-
-   if (IPI_IS_BITMAPED(ipi)) { 
-   bitmap = 1 << ipi;
-   ipi = IPI_BITMAP_VECTOR;
-   }
 
/*
 * IPI_STOP_HARD maps to a NMI and the trap handler needs a bit
@@ -1193,20 +1209,7 @@ ipi_selected(cpumask_t cpus, u_int ipi)
while ((cpu = ffs(cpus)) != 0) {
cpu--;
cpus &= ~(1 << cpu);
-
-   KASSERT(cpu_apic_ids[cpu] != -1,
-   ("IPI to non-existent CPU %d", cpu));
-
-   if (bitmap) {
-   do {
-   old_pending = cpu_ipi_pending[cpu];
-   new_pending = old_pending | bitmap;
-   } while  (!atomic_cmpset_int(&cpu_ipi_pending[cpu],
-   old_pending, new_pending)); 
-   if (old_pending)
-   continue;
-   }
-   lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]);
+   ipi_send_cpu(cpu, ipi);
}
 }
 
@@ -1216,14 +1219,6 @@ ipi_selected(cpumask_t cpus, u_int ipi)
 void
 ipi_cpu(int cpu, u_int ipi)
 {
-   u_int bitmap = 0;
-   u_int old_pending;
-   u_int new_pending;
-
-   if (IPI_IS_BITMAPED(ipi)) { 
-   bitmap = 1 << ipi;
-   ipi = IPI_BITMAP_VECTOR;
-   }
 
/*
 * IPI_STOP_HARD maps to a NMI and the trap handler needs a bit
@@ -1234,18 +1229,7 @@ ipi_cpu(int cpu, u_int ipi)
atomic_set_int(&ipi_nmi_pending, 1 << cpu);
 
CTR3(KTR_SMP, "%s: cpu: %d ipi: %x", __func__, cpu, ipi);
-   KASSERT(cpu_apic_ids[cpu] != -1, ("IPI to non-existent CPU %d", cpu));
-
-   if (bitmap) {
-   do {
-   old_pending = cpu_ipi_pending[cpu];
-   new_pending = old_pending | bitmap;
-   } while  (!atomic_cmpset_int(&cpu_ipi_pending[cpu],
-   old_pending, new_pending)); 
-   if (old_pending)
-   return;
-   }
-   lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]);
+   ipi_send_cpu(cpu, ipi);
 }
 
 /*

Modified: stable/8/sys/i386/i386/mp_machdep.c
==
--- stable/8/sys/i386/i386/mp_machdep.c Wed Nov 10 17:17:38 2010
(r215091)
+++ stable/8/sys/i386/i386/mp_machdep.c Wed Nov 10 17:33:47 2010
(r215092)
@@ -1212,6 +1212,30 @@ smp_targeted_tlb_shootdown(cpumask_t mas
mtx_unlock_spin(&smp_ipi_mtx);
 }
 
+/*
+ * Send an IPI to specified CPU handling the bitmap logic.
+ */
+static void
+ipi_send_cpu(int cpu, u_int ipi)
+{
+   u_int bitmap, old_pending, new_pending;
+
+   KASSERT(cpu_apic_ids[cpu] != -1, ("IPI to non-existent CPU %d", cpu));
+
+   if (IPI_IS_BITMAPED(ipi)) {
+   bitmap = 1 << ipi;
+   ipi = IPI_BITMAP_VECTOR;
+   do {
+   old_pending = cpu_ipi_pending[cpu];
+   new_pen

Re: svn commit: r215077 - in stable/8: . contrib/top etc/periodic/daily gnu/usr.bin lib/libusb release/picobsd/floppy.tree/sbin sbin/geom/class/sched sys/modules tools/regression/lib/msun tools/regres

2010-11-10 Thread Norikatsu Shigemura
On Wed, 10 Nov 2010 12:00:07 -0500
John Baldwin  wrote:
> > So I'll contact to mentor, and remove svn:mergeinfo (r211201,
> > r211204, r211270-r211271, r212861, r211249) from src/ exclude
> > src/sys.
> If you want to fix the mergeinfo, the easiest way I've found to do so, is to 
> do 'svn merge --record-only -c-' for each of the changes.  Then go 
> back 
> and redo the svn merges to the proper locations using '--record-only'.  This 
> should only affect mergeinfo and nothing else.

Thank you!
I'll confirm operations you said, and test on my local environment.

-- 
Norikatsu Shigemura 
___
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: r215091 - stable/8/sys/nfsclient

2010-11-10 Thread Jaakko Heinonen
Author: jh
Date: Wed Nov 10 17:17:38 2010
New Revision: 215091
URL: http://svn.freebsd.org/changeset/base/215091

Log:
  MFC r214418: Add missing "readahead" to the nfs_opts list.
  
  PR:   151321

Modified:
  stable/8/sys/nfsclient/nfs_vfsops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/nfsclient/nfs_vfsops.c
==
--- stable/8/sys/nfsclient/nfs_vfsops.c Wed Nov 10 16:42:36 2010
(r215090)
+++ stable/8/sys/nfsclient/nfs_vfsops.c Wed Nov 10 17:17:38 2010
(r215091)
@@ -779,10 +779,10 @@ static const char *nfs_opts[] = { "from"
 "noatime", "noexec", "suiddir", "nosuid", "nosymfollow", "union",
 "noclusterr", "noclusterw", "multilabel", "acls", "force", "update",
 "async", "dumbtimer", "noconn", "nolockd", "intr", "rdirplus", "resvport",
-"readdirsize", "soft", "hard", "mntudp", "tcp", "udp", "wsize", "rsize",
-"retrans", "acregmin", "acregmax", "acdirmin", "acdirmax", 
-"deadthresh", "hostname", "timeout", "addr", "fh", "nfsv3", "sec",
-"maxgroups", "principal", "negnametimeo",
+"readahead", "readdirsize", "soft", "hard", "mntudp", "tcp", "udp",
+"wsize", "rsize", "retrans", "acregmin", "acregmax", "acdirmin",
+"acdirmax", "deadthresh", "hostname", "timeout", "addr", "fh", "nfsv3",
+"sec", "maxgroups", "principal", "negnametimeo",
 NULL };
 
 /*
___
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: r215077 - in stable/8: . contrib/top etc/periodic/daily gnu/usr.bin lib/libusb release/picobsd/floppy.tree/sbin sbin/geom/class/sched sys/modules tools/regression/lib/msun tools/regres

2010-11-10 Thread John Baldwin
On Wednesday, November 10, 2010 11:47:21 am Norikatsu Shigemura wrote:
> On Wed, 10 Nov 2010 07:48:55 +0200
> Andriy Gapon  wrote:
> > Hmm, properties changing on pretty much all directories and files with
> > svn:mergeinfo doesn't look correct.
> 
>   Humm, my operations are confirmed by mentor (imp@).  But I was
>   explained by hrs, ume and nyan about this case, too.  Sorry, I
>   forgot http://wiki.freebsd.org/SubversionPrimer/Merging.
>   So I'll contact to mentor, and remove svn:mergeinfo (r211201,
>   r211204, r211270-r211271, r212861, r211249) from src/ exclude
>   src/sys.

If you want to fix the mergeinfo, the easiest way I've found to do so, is to 
do 'svn merge --record-only -c-' for each of the changes.  Then go back 
and redo the svn merges to the proper locations using '--record-only'.  This 
should only affect mergeinfo and nothing else.

-- 
John Baldwin
___
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: r215077 - in stable/8: . contrib/top etc/periodic/daily gnu/usr.bin lib/libusb release/picobsd/floppy.tree/sbin sbin/geom/class/sched sys/modules tools/regression/lib/msun tools/regres

2010-11-10 Thread Norikatsu Shigemura
On Wed, 10 Nov 2010 07:48:55 +0200
Andriy Gapon  wrote:
> Hmm, properties changing on pretty much all directories and files with
> svn:mergeinfo doesn't look correct.

Humm, my operations are confirmed by mentor (imp@).  But I was
explained by hrs, ume and nyan about this case, too.  Sorry, I
forgot http://wiki.freebsd.org/SubversionPrimer/Merging.
So I'll contact to mentor, and remove svn:mergeinfo (r211201,
r211204, r211270-r211271, r212861, r211249) from src/ exclude
src/sys.

-- 
Norikatsu Shigemura 
___
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: r215090 - head/sys/sys

2010-11-10 Thread Alexander Motin
Author: mav
Date: Wed Nov 10 16:42:36 2010
New Revision: 215090
URL: http://svn.freebsd.org/changeset/base/215090

Log:
  Remove unexisted since r212541 timer1hz/timer2hz variables.

Modified:
  head/sys/sys/kernel.h

Modified: head/sys/sys/kernel.h
==
--- head/sys/sys/kernel.h   Wed Nov 10 14:59:13 2010(r215089)
+++ head/sys/sys/kernel.h   Wed Nov 10 16:42:36 2010(r215090)
@@ -64,8 +64,6 @@ extern int stathz;/* statistics clock
 extern int profhz; /* profiling clock's frequency */
 extern int profprocs;  /* number of process's profiling */
 extern int ticks;
-extern int timer1hz;   /* timer 1 frequency */
-extern int timer2hz;   /* timer 2 frequency */
 
 #endif /* _KERNEL */
 
___
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: r215089 - stable/8/sys/x86/x86

2010-11-10 Thread Attilio Rao
2010/11/10 Attilio Rao :
> Author: attilio
> Date: Wed Nov 10 14:59:13 2010
> New Revision: 215089
> URL: http://svn.freebsd.org/changeset/base/215089
>
> Log:
>  Fix-up MFC r214446, r214516:
>  Use the appropriate SYSINIT() ordering between the arches.
>  This is intended as a fixup for r215059, so no further notes are merged.

Forgot to mention: as explained by jhb, on HEAD this is no longer a
problem (fixed by r215009).

Thanks,
Attilio


-- 
Peace can only be achieved by understanding - A. Einstein
___
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: r215089 - stable/8/sys/x86/x86

2010-11-10 Thread Attilio Rao
Author: attilio
Date: Wed Nov 10 14:59:13 2010
New Revision: 215089
URL: http://svn.freebsd.org/changeset/base/215089

Log:
  Fix-up MFC r214446, r214516:
  Use the appropriate SYSINIT() ordering between the arches.
  This is intended as a fixup for r215059, so no further notes are merged.
  
  Reported by:  jhb
  Sponsored by: Sandvine Incorporated

Modified:
  stable/8/sys/x86/x86/mptable.c

Modified: stable/8/sys/x86/x86/mptable.c
==
--- stable/8/sys/x86/x86/mptable.c  Wed Nov 10 14:38:51 2010
(r215088)
+++ stable/8/sys/x86/x86/mptable.c  Wed Nov 10 14:59:13 2010
(r215089)
@@ -53,8 +53,10 @@ __FBSDID("$FreeBSD$");
 
 #ifdef __amd64__
 #defineMAX_LAPIC_ID63  /* Max local APIC ID for HTT 
fixup */
+#defineSI_SUB_MPTBL(SI_SUB_TUNABLES - 1)
 #else
 #defineMAX_LAPIC_ID31  /* Max local APIC ID for HTT 
fixup */
+#defineSI_SUB_MPTBL(SI_SUB_CPU - 1)
 #endif
 
 #ifdef PC98
@@ -389,8 +391,7 @@ mptable_register(void *dummy __unused)
 
apic_register_enumerator(&mptable_enumerator);
 }
-SYSINIT(mptable_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, mptable_register,
-NULL);
+SYSINIT(mptable_register, SI_SUB_MPTBL, SI_ORDER_FIRST, mptable_register, 
NULL);
 
 /*
  * Call the handler routine for each entry in the MP config table.
___
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: r215088 - head/sys/geom/part

2010-11-10 Thread Andrey V. Elsukov
Author: ae
Date: Wed Nov 10 14:38:51 2010
New Revision: 215088
URL: http://svn.freebsd.org/changeset/base/215088

Log:
  In r212554 name of G_PART_PARM_GEOM and G_PART_PARM_PROVIDER
  ctlreq parameters was changed to "arg0". Fix the last place where
  it is used.
  
  Approved by:  kib (mentor)

Modified:
  head/sys/geom/part/g_part.c

Modified: head/sys/geom/part/g_part.c
==
--- head/sys/geom/part/g_part.c Wed Nov 10 14:33:09 2010(r215087)
+++ head/sys/geom/part/g_part.c Wed Nov 10 14:38:51 2010(r215088)
@@ -748,7 +748,7 @@ g_part_ctl_create(struct gctl_req *req, 
g_topology_assert();
 
/* Check that there isn't already a g_part geom on the provider. */
-   error = g_part_parm_geom(req, "provider", &gp);
+   error = g_part_parm_geom(req, "arg0", &gp);
if (!error) {
null = gp->softc;
if (null->gpt_scheme != &g_part_null_scheme) {
___
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: r215087 - head/usr.sbin/freebsd-update

2010-11-10 Thread Benedict Reuschling
Author: bcr (doc committer)
Date: Wed Nov 10 14:33:09 2010
New Revision: 215087
URL: http://svn.freebsd.org/changeset/base/215087

Log:
  Typo fix in a comment.
  
  Reviewed by:  cperciva

Modified:
  head/usr.sbin/freebsd-update/freebsd-update.sh

Modified: head/usr.sbin/freebsd-update/freebsd-update.sh
==
--- head/usr.sbin/freebsd-update/freebsd-update.sh  Wed Nov 10 13:58:24 
2010(r215086)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh  Wed Nov 10 14:33:09 
2010(r215087)
@@ -1470,7 +1470,7 @@ fetch_inspect_system () {
sort -k 3,3 -t '|' > $2.tmp
rm filelist
 
-   # Check if an error occured during system inspection
+   # Check if an error occurred during system inspection
if [ -f .err ]; then
return 1
fi
___
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: r215085 - head/sys/mips/conf

2010-11-10 Thread Jayachandran C.
Author: jchandra
Date: Wed Nov 10 10:23:39 2010
New Revision: 215085
URL: http://svn.freebsd.org/changeset/base/215085

Log:
  Switch to the new network driver nlge, the old rge driver is deprecated now.

Modified:
  head/sys/mips/conf/XLR
  head/sys/mips/conf/XLR64
  head/sys/mips/conf/XLRN32

Modified: head/sys/mips/conf/XLR
==
--- head/sys/mips/conf/XLR  Wed Nov 10 08:46:29 2010(r215084)
+++ head/sys/mips/conf/XLR  Wed Nov 10 10:23:39 2010(r215085)
@@ -77,7 +77,7 @@ options   NFS_ROOT
 options BOOTP
 options BOOTP_NFSROOT
 options BOOTP_NFSV3
-options BOOTP_WIRED_TO=rge0
+options BOOTP_WIRED_TO=nlge0
 options BOOTP_COMPAT
 optionsROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
 #
@@ -123,7 +123,7 @@ device  bpf
 
 # Network
 device miibus
-device rge
+device nlge
 device ether
 device re
 device msk

Modified: head/sys/mips/conf/XLR64
==
--- head/sys/mips/conf/XLR64Wed Nov 10 08:46:29 2010(r215084)
+++ head/sys/mips/conf/XLR64Wed Nov 10 10:23:39 2010(r215085)
@@ -50,7 +50,7 @@ options   NFS_ROOT
 options BOOTP
 options BOOTP_NFSROOT
 options BOOTP_NFSV3
-options BOOTP_WIRED_TO=rge0
+options BOOTP_WIRED_TO=nlge0
 options BOOTP_COMPAT
 optionsROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
 #
@@ -96,7 +96,7 @@ devicebpf
 
 # Network
 device miibus
-device rge
+device nlge
 device ether
 device re
 device msk

Modified: head/sys/mips/conf/XLRN32
==
--- head/sys/mips/conf/XLRN32   Wed Nov 10 08:46:29 2010(r215084)
+++ head/sys/mips/conf/XLRN32   Wed Nov 10 10:23:39 2010(r215085)
@@ -50,7 +50,7 @@ options   NFS_ROOT
 options BOOTP
 options BOOTP_NFSROOT
 options BOOTP_NFSV3
-options BOOTP_WIRED_TO=rge0
+options BOOTP_WIRED_TO=nlge0
 options BOOTP_COMPAT
 optionsROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
 #
@@ -96,7 +96,7 @@ devicebpf
 
 # Network
 device miibus
-device rge
+device nlge
 device ether
 device re
 device msk
___
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: r215084 - stable/8/libexec/rtld-elf

2010-11-10 Thread Konstantin Belousov
Author: kib
Date: Wed Nov 10 08:46:29 2010
New Revision: 215084
URL: http://svn.freebsd.org/changeset/base/215084

Log:
  MFC r214728:
  If dlopen() is called for the dso that has been already loaded as a
  dependency, then the dso never has its DAG initialized. Empty DAG
  makes ref_dag() call in dlopen() a nop, and the dso refcount is off
  by one.
  
  Initialize the DAG on the first dlopen() call, using a boolean flag
  to prevent double initialization.
  
  MFC r214776:
  Fix style.
  
  MFC r214777:
  Change init_dag() to not increment DAG refcount. Unconditionally call
  both init_dag() and ref_dag() in dlopen() for the case when the object
  was already loaded.

Modified:
  stable/8/libexec/rtld-elf/rtld.c
  stable/8/libexec/rtld-elf/rtld.h
Directory Properties:
  stable/8/libexec/rtld-elf/   (props changed)

Modified: stable/8/libexec/rtld-elf/rtld.c
==
--- stable/8/libexec/rtld-elf/rtld.cWed Nov 10 08:21:25 2010
(r215083)
+++ stable/8/libexec/rtld-elf/rtld.cWed Nov 10 08:46:29 2010
(r215084)
@@ -1278,8 +1278,11 @@ init_dag(Obj_Entry *root)
 {
 DoneList donelist;
 
+if (root->dag_inited)
+   return;
 donelist_init(&donelist);
 init_dag1(root, root, &donelist);
+root->dag_inited = true;
 }
 
 static void
@@ -1290,7 +1293,6 @@ init_dag1(Obj_Entry *root, Obj_Entry *ob
 if (donelist_check(dlp, obj))
return;
 
-obj->refcount++;
 objlist_push_tail(&obj->dldags, root);
 objlist_push_tail(&root->dagmembers, obj);
 for (needed = obj->needed;  needed != NULL;  needed = needed->next)
@@ -2035,6 +2037,7 @@ dlopen(const char *name, int mode)
assert(*old_obj_tail == obj);
result = load_needed_objects(obj, RTLD_LO_DLOPEN);
init_dag(obj);
+   ref_dag(obj);
if (result != -1)
result = rtld_verify_versions(&obj->dagmembers);
if (result != -1 && ld_tracing)
@@ -2052,7 +2055,13 @@ dlopen(const char *name, int mode)
}
} else {
 
-   /* Bump the reference counts for objects on this DAG. */
+   /*
+* Bump the reference counts for objects on this DAG.  If
+* this is the first dlopen() call for the object that was
+* already loaded as a dependency, initialize the dag
+* starting at it.
+*/
+   init_dag(obj);
ref_dag(obj);
 
if (ld_tracing)
@@ -3059,6 +3068,7 @@ ref_dag(Obj_Entry *root)
 {
 Objlist_Entry *elm;
 
+assert(root->dag_inited);
 STAILQ_FOREACH(elm, &root->dagmembers, link)
elm->obj->refcount++;
 }
@@ -3068,6 +3078,7 @@ unref_dag(Obj_Entry *root)
 {
 Objlist_Entry *elm;
 
+assert(root->dag_inited);
 STAILQ_FOREACH(elm, &root->dagmembers, link)
elm->obj->refcount--;
 }

Modified: stable/8/libexec/rtld-elf/rtld.h
==
--- stable/8/libexec/rtld-elf/rtld.hWed Nov 10 08:21:25 2010
(r215083)
+++ stable/8/libexec/rtld-elf/rtld.hWed Nov 10 08:46:29 2010
(r215084)
@@ -222,6 +222,7 @@ typedef struct Struct_Obj_Entry {
 bool ref_nodel : 1;/* Refcount increased to prevent 
dlclose */
 bool init_scanned: 1;  /* Object is already on init list. */
 bool on_fini_list: 1;  /* Object is already on fini list. */
+bool dag_inited : 1;   /* Object has its DAG initialized. */
 
 struct link_map linkmap;   /* For GDB and dlinfo() */
 Objlist dldags;/* Object belongs to these dlopened DAGs (%) */
___
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: r215083 - head/crypto/openssh

2010-11-10 Thread Dag-Erling Smorgrav
Author: des
Date: Wed Nov 10 08:21:25 2010
New Revision: 215083
URL: http://svn.freebsd.org/changeset/base/215083

Log:
  Forgot to svn rm this when I imported 5.4p1.

Deleted:
  head/crypto/openssh/ssh-pkcs11-helper.0
___
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"