- Gebaseerd op BSD UNIX® + Gebaseerd op BSD &unix;

Grantham-Allee 20 · i386

 Copyright (c) 1996-2008 Wolfram Schneider

==== //depot/projects/docproj_hu/www/en/platforms/amd64/motherboards.sgml#5 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -1035,6 +1035,14 @@
     
     
       Supermicro
+      PDSMi
+      Intel E7320 / LGA 775
+      
+      6.2-RELEASE
+      Works fine.  Onboard RAID untested.
+    
+    
+      Supermicro
       X6DA8-G2
       Intel E7525 / 2x 604-pin FC-mPGA4
       Erik Power
@@ -1070,6 +1078,21 @@
       
     
     
+      Supermicro
+      X7SBA
+      Intel 3210 + ICH9R / LGA 775
+      Brad Davis
+      7.0-RELEASE
+      Works fine.  Onboard RAID untested.
+    
+    
+      Supermicro
+      X7SBi
+      Intel 3210 + ICH9R / LGA 775
+      Brad Davis
+      7.1-RELEASE
+      Works fine.  Onboard RAID untested.
+    
       Tyan
       Thunder h1000E (S3970)
       Broadcom BCM 5785 / Socket F - 2x Opteron

==== //depot/projects/docproj_hu/www/en/releases/7.2R/announce.sgml#2 (text+ko) ====

@@ -1,13 +1,408 @@
 
-
+
 
 
 ]>
 
   &header;
 
-  FreeBSD 7.2-RELEASE is not released yet.
+  The FreeBSD Release Engineering Team is pleased to announce the
+    availability of FreeBSD 7.2-RELEASE.  This is the third release
+    from the 7-STABLE branch which improves on the functionality of
+    FreeBSD 7.1 and introduces some new features.  Some of the
+    highlights:
+
+  
+    support for fully transparent use of superpages for
+	  application memory
+
+    support for multiple IPv4 and IPv6 addresses for
+	jails
+
+    csup(1) now supports CVSMode to fetch a complete CVS
+	repository
+
+    Gnome updated to 2.26, KDE updated to 4.2.2
+
+    sparc64 now supports UltraSparc-III processors
+  
+
+  For a complete list of new features and known problems, please
+    see the online release notes and errata list, available at:
+
+  
+    http://www.FreeBSD.org/releases/7.2R/relnotes.html
+
+    http://www.FreeBSD.org/releases/7.2R/errata.html
+  
+
+  For more information about FreeBSD release engineering
+    activities, please see:
+
+  
+    http://www.FreeBSD.org/releng/
+  
+
+  Availability
+
+  FreeBSD 7.2-RELEASE is now available for the amd64, i386, ia64,
+    pc98, powerpc, and sparc64 architectures.
+
+  FreeBSD 7.2 can be installed from bootable ISO images or over the
+    network; the required files can be downloaded via FTP or
+    BitTorrent as described in the sections below.  While some of the
+    smaller FTP mirrors may not carry all architectures, they will all
+    generally contain the more common ones, such as i386 and
+    amd64.
+
+  MD5 and SHA256 hashes for the release ISO images are included at
+    the bottom of this message.
+
+  The purpose of the ISO images provided as part of the release are
+    as follows:
+
+  
+    dvd1
+
+    This contains everything necessary to install the base
+	FreeBSD operating system, a collection of pre-built packages,
+	and the documentation.  It also supports booting into a
+	"livefs" based rescue mode.  This should be all you need if
+	you can burn and use DVD-sized media.
+
+    disc1, disc2, disc3, livefs, docs
+
+    disc1 contains the base FreeBSD operating
+	system and a few pre-built packages.  disc2
+	and disc3 contain more pre-built packages.
+	Those three can be burned to CDROM sized media and should be
+	all you need to do a normal installation.
+	livefs contains support for booting into a
+	"livefs" based rescue mode but does not support doing an
+	install from the CD itself.  You would need to perform a
+	network based install.  docs contains the
+	documentation.
+
+    bootonly
+
+    This supports booting a machine using the CDROM drive but
+	does not contain the support for installing FreeBSD from the
+	CD itself.  You would need to perform a network based install
+	(e.g. from an FTP server) after booting from the CD.
+  
+
+  Note: late in the testing cycle it was
+    discovered some machines do not recognize the i386 disc1 as
+    bootable (they just fall through to booting off the next boot
+    device).  All affected machines did see the other discs as
+    bootable.  If you have a machine with that problem booting off
+    either bootonly or livefs and then swapping in disc1 once
+    sysinstall starts should work.
+
+  FreeBSD 7.2-RELEASE can also be purchased on CD-ROM or DVD from
+    several vendors.  One of the vendors that will be offering FreeBSD
+    7.2-based products is:
+
+  
+    FreeBSD Mall, Inc. http://www.freebsdmall.com/
+  
+
+  BitTorrent
+
+  7.2-RELEASE ISOs are available via BitTorrent.  A collection of
+    torrent files to download the images is available at:
+
+  
+    http://torrents.FreeBSD.org:8080/
+  
+
+  FTP
+
+  At the time of this announcement the following FTP sites have
+    FreeBSD 7.2-RELEASE available.
+
+  
+    ftp://ftp.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp1.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp5.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp10.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp12.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp13.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp14.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.dk.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.gr.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp1.ru.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.tw.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp4.tw.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.uk.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp3.us.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp7.us.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp10.us.FreeBSD.org/pub/FreeBSD/
+  
+
+  However before trying these sites please check your regional
+    mirror(s) first by going to:
+
+  
+    ftp://ftp.<yourdomain>.FreeBSD.org/pub/FreeBSD
+  
+
+  Any additional mirror sites will be labeled
+    ftp2, ftp3 and so on.
+
+  More information about FreeBSD mirror sites can be found at:
+
+  
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html
+  
+
+  For instructions on installing FreeBSD, please see Chapter 2 of
+    The FreeBSD Handbook.  It provides a complete installation
+    walk-through for users new to FreeBSD, and can be found online
+    at:
+
+  
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html
+  
+
+  Updates from Source
+
+  The procedure for doing a source code based update is described in the
+    FreeBSD Handbook:
+
+  
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/synching.html
+
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
+  
+
+  The branch tag to use for updating the source is RELENG_7_2.
+
+  FreeBSD Update
+
+  The freebsd-update(8) utility supports binary upgrades of i386
+    and amd64 systems running earlier FreeBSD releases.  Systems
+    running 7.0-RELEASE, 7.1-RELEASE, 7.2-BETA, 7.2-RC1, or 7.2-RC2
+    can upgrade as follows:
+
+  # freebsd-update upgrade -r 7.2-RELEASE
+
+  During this process, FreeBSD Update may ask the user to help by
+    merging some configuration files or by confirming that the
+    automatically performed merging was done correctly.
+
+  # freebsd-update install
+
+  The system must be rebooted with the newly installed kernel
+    before continuing.
+
+  # shutdown -r now
+
+  After rebooting, freebsd-update needs to be run again to
+    install the new userland components, and the system needs to be
+    rebooted again:
+
+  # freebsd-update install
+# shutdown -r now
+
+  Users of earlier FreeBSD releases (FreeBSD 6.x) can also use
+    freebsd-update to upgrade to FreeBSD 7.2, but will be prompted
+    to rebuild all third-party applications (e.g., anything
+    installed from the ports tree) after the second invocation of
+    "freebsd-update install", in order to handle differences in the
+    system libraries between FreeBSD 6.x and FreeBSD 7.x.
+
+  For more information about upgrading from FreeBSD 6.x using
+    FreeBSD Update, see:
+
+  
+    http://www.daemonology.net/blog/2007-11-11-freebsd-major-version-upgrade.html
+  
+
+  Support
+
+  The FreeBSD Security Team currently plans to support FreeBSD
+    7.2 until May 31st, 2010.  For more information on the Security
+    Team and their support of the various FreeBSD branches see:
+
+  
+    http://www.FreeBSD.org/security/
+  
+
+  Acknowledgments
+
+  Many companies donated equipment, network access, or man-hours to
+    support the release engineering activities for FreeBSD 7.2 including
+    The FreeBSD Foundation, Hewlett-Packard, Yahoo!, NetApp,
+    Internet Systems Consortium, and Sentex Communications.
+
+  The release engineering team for 7.2-RELEASE includes:
+
+  
+    
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+    
+  Ken Smith <kensmith@FreeBSD.org> Release Engineering,
+	  amd64, i386, sparc64 Release Building,
+	  Mirror Site Coordination
Robert Watson <rwatson@FreeBSD.org> Release Engineering, Security
Konstantin Belousov <kib@FreeBSD.org> Release Engineering
Marc Fonvieille <blackend@FreeBSD.org> Release Engineering, Documentation
George Neville-Neil <gnn@FreeBSD.org> Release Engineering
Hiroki Sato <hrs@FreeBSD.org> Release Engineering, Documentation
Marcel Moolenaar <marcel@FreeBSD.org> ia64, powerpc Release Building
Takahashi Yoshihiro <nyan@FreeBSD.org> PC98 Release Building
Kris Kennaway <kris@FreeBSD.org> Package Building
Joe Marcus Clarke <marcus@FreeBSD.org> Package Building
Erwin Lansing <erwin@FreeBSD.org> Package Building
Mark Linimon <linimon@FreeBSD.org> Package Building
Pav Lucistnik <pav@FreeBSD.org> Package Building
Colin Percival <cperciva@FreeBSD.org> Security Officer
+
+  Trademark
+
+  FreeBSD is a registered trademark of The FreeBSD Foundation.
+
+  ISO Image Checksums
+
+  MD5 (7.2-RELEASE-amd64-bootonly.iso) = d77d758684d03815be05f90c12085b2f
+MD5 (7.2-RELEASE-amd64-disc1.iso) = 3b281f75acef6f6a16d5e405ed003f36
+MD5 (7.2-RELEASE-amd64-disc2.iso) = e7d2497054a15906d0e4945d8c91e47f
+MD5 (7.2-RELEASE-amd64-disc3.iso) = ba4369f5d39fae3bd11ad537f4c52783
+MD5 (7.2-RELEASE-amd64-docs.iso) = 97db6efd21c531b2a325224d9897f287
+MD5 (7.2-RELEASE-amd64-dvd1.iso) = b3ac4c645aec087480ddefa827c8553c
+MD5 (7.2-RELEASE-amd64-livefs.iso) = 93c4ad283b66f6cb9d1eb1dcace92ce6
+
+  MD5 (7.2-RELEASE-i386-bootonly.iso) = aceb5cdbb14780c97924cb4a645d3258
+MD5 (7.2-RELEASE-i386-disc1.iso) = b2415294a55ab3e5c1931f4e0fe67e4e
+MD5 (7.2-RELEASE-i386-disc2.iso) = b4fd35adea684e6da3a0515b535ece39
+MD5 (7.2-RELEASE-i386-disc3.iso) = da2958a3eb6a3ce6237ed7194bdfdd13
+MD5 (7.2-RELEASE-i386-docs.iso) = fee5de7fbd8c21e5a7523a1c197c32ae
+MD5 (7.2-RELEASE-i386-dvd1.iso) = 1d129a999a1db6aefebc57c2f82cacc0
+MD5 (7.2-RELEASE-i386-livefs.iso) = decdd91479b8059e70eed6d8e4eb5c06
+
+  MD5 (7.2-RELEASE-ia64-bootonly.iso) = d0a84e0014b042f5369e1644a38c380c
+MD5 (7.2-RELEASE-ia64-disc1.iso) = 58eb2db0a7656a05cb6193aad68e150b
+MD5 (7.2-RELEASE-ia64-disc2.iso) = bf27c66277e9bea85d9656af154e94ca
+MD5 (7.2-RELEASE-ia64-disc3.iso) = 1ab4e7e08fa41b7b4e2370a8bde6dcfb
+MD5 (7.2-RELEASE-ia64-docs.iso) = 01de8413d2829c5b1cb6d495b51cf3a0
+MD5 (7.2-RELEASE-ia64-livefs.iso) = 02eadf879e203148610d823e7db515ba
+
+  MD5 (7.2-RELEASE-pc98-bootonly.iso) = a0eaf2126458fc88ee1ac6d82d1f1c3a
+MD5 (7.2-RELEASE-pc98-disc1.iso) = 6555c5c4a8606ee043b5a7fbb7759b32
+MD5 (7.2-RELEASE-pc98-livefs.iso) = 0a23c3c4fc94d2961be5d148003e9511
+
+  MD5 (7.2-RELEASE-powerpc-bootonly.iso) = 17ddd18ad20aa00dd5b4830e536eabad
+MD5 (7.2-RELEASE-powerpc-disc1.iso) = 015869f4f70124c0204ebd111d876142
+MD5 (7.2-RELEASE-powerpc-disc2.iso) = 2f6d5139b57e982039fb90f02cf3f508
+MD5 (7.2-RELEASE-powerpc-disc3.iso) = 0a6d3b4a5808374bb44f3f8583df38f7
+MD5 (7.2-RELEASE-powerpc-docs.iso) = bb30b266f3c0164b512b3b3317f8ab68
+
+  MD5 (7.2-RELEASE-sparc64-bootonly.iso) = e3246598de481f7c1b117c81b46acfaa
+MD5 (7.2-RELEASE-sparc64-disc1.iso) = 2e767c93f195b69ea83274a1dff4dd5c
+MD5 (7.2-RELEASE-sparc64-docs.iso) = 1b3d32f0c82c89e18b6f2a3eeca47ae5
+
+  SHA256 (7.2-RELEASE-amd64-bootonly.iso) = fb87f4c7ddf8870e8758191181ebf3730dd44534ecc3654069a66d85c56695d3
+SHA256 (7.2-RELEASE-amd64-disc1.iso) = 1ea1f6f652d7c5f5eab7ef9f8edbed50cb664b08ed761850f95f48e86cc71ef5
+SHA256 (7.2-RELEASE-amd64-disc2.iso) = 0a951c4eea8891b0d2bf3702eb933037dc6db3530b9a37e5b33d765ba9f67154
+SHA256 (7.2-RELEASE-amd64-disc3.iso) = 870eeb94b3f21d0ab603986bc6fecb6b3a4a7529f6220ba34aef6458fc43a8b4
+SHA256 (7.2-RELEASE-amd64-docs.iso) = 109b9d048b8ff58e392f002ef85f60e75b33ea72ef658edb610f9f50235508d4
+SHA256 (7.2-RELEASE-amd64-dvd1.iso) = 1e13d3b6dfa7034e86f17b9ba379fff56761ffad7e029a23a27e92e9dbde2788
+SHA256 (7.2-RELEASE-amd64-livefs.iso) = df3cc7f8795b9b260ada2facbd0d77114f0535c35b933a503ac3e56e05947e33
+
+  SHA256 (7.2-RELEASE-i386-bootonly.iso) = 6993e73ad5e012d1605c5cf085942b694ec4fa6fb4be114c7e752a012b8c3a5e
+SHA256 (7.2-RELEASE-i386-disc1.iso) = bf4d00102215b07f5a4c8acac80b9d9bd9bf8bd93ac554fe09b21302f0b41380
+SHA256 (7.2-RELEASE-i386-disc2.iso) = 573673db5acebd68dfdbca63f620b923a7e68421f1e946fb26a1381e3d7fd9f8
+SHA256 (7.2-RELEASE-i386-disc3.iso) = ec5c98c02849c181f405e63875f193e33e121cb087cec0bd2a3e10f533ffc8e7
+SHA256 (7.2-RELEASE-i386-docs.iso) = 77beb6e7a7905a2e9aba4adeb2722be5fbdb699bd44bd0a01e3780b4623d2ce9
+SHA256 (7.2-RELEASE-i386-dvd1.iso) = de395cc63cb7fa22a0bf116487c13d56aac71762787fc5581746bfb48e66f750
+SHA256 (7.2-RELEASE-i386-livefs.iso) = 4faa7b9d78d125f9b28521247e32e1f0bef3b0b0f21b654ba22c6e79ca3301ce
+
+  SHA256 (7.2-RELEASE-ia64-bootonly.iso) = 0a2f5fb514f14760b1237059d9ef381e0836fd45579c5264efc2eb49cc57fbb9
+SHA256 (7.2-RELEASE-ia64-disc1.iso) = 048850ab672ae6865225b4d3ca324753dd823d526ce93480adf15f602acd96bf
+SHA256 (7.2-RELEASE-ia64-disc2.iso) = 5fe326d21f2e7646c63a1b6fb5ae913971da99f1c660f0ffd148de19fc47fb11
+SHA256 (7.2-RELEASE-ia64-disc3.iso) = 58c0c94d12ca197593ec48cab2fc5ec619a87caa16ae5421958216773665086d
+SHA256 (7.2-RELEASE-ia64-docs.iso) = 106844d5135e56ed2232ecabe0e4dc8c78e54f7e9d43e92be0ee3f741009a2eb
+SHA256 (7.2-RELEASE-ia64-livefs.iso) = 70294d2d65e2f483af23d9a4c0d14e1af43da68c086b3e247af31e85050b1247
+
+  SHA256 (7.2-RELEASE-pc98-bootonly.iso) = 37f65bb079304353858da6f06936cf12d19cfcdd6f4127aecac91d2a23976db1
+SHA256 (7.2-RELEASE-pc98-disc1.iso) = 877845e4dcd3b617f1c23a47b62d27dbe3a5ff6d35075cb20cd038e2b749220f
+SHA256 (7.2-RELEASE-pc98-livefs.iso) = 3741eb5a178fa0b97a6f50b57dcc750ee7d9d2e1871a244740a4603b22289491
+
+  SHA256 (7.2-RELEASE-powerpc-bootonly.iso) = d933276ab67b6de04144ffb3a15e632f6ac6f0a82237654f9349214e0c0acb9b
+SHA256 (7.2-RELEASE-powerpc-disc1.iso) = b366319ce4cfdbff2ef394cca6f460159dd1e4949927da82904ff5c9baa3f4b8
+SHA256 (7.2-RELEASE-powerpc-disc2.iso) = 40e4d5e94c543018fd692efe7150bcca482f1a0a3ddc50330bbbd5a320d90d36
+SHA256 (7.2-RELEASE-powerpc-disc3.iso) = fc5ed9a503447c68a9e8392b60c4c35650208c42da982c9c6206e349ad327888
+SHA256 (7.2-RELEASE-powerpc-docs.iso) = 58e4f348b057608515bca359a713877964fddf638bca921d09000aada899477b
+
+  SHA256 (7.2-RELEASE-sparc64-bootonly.iso) = 98aa7492c195df441b4e4699984fd8f38af1db03e7e92cc8d1530089a4d50e11
+SHA256 (7.2-RELEASE-sparc64-disc1.iso) = ba7fa45c21d7ca43bacb78fe46c18ef15f73e480e7fe3e6c8ba8c575efe25888
+SHA256 (7.2-RELEASE-sparc64-docs.iso) = b67483a4e198e2aeb99bacf9cc826f36a3d9304482fb49c34d05590661d6da76
 
   &footer;
 

==== //depot/projects/docproj_hu/www/en/releases/7.2R/errata.html#2 (text+ko) ====

@@ -18,8 +18,8 @@
 
 Copyright © 2008, 2009 The FreeBSD Documentation Project
 
-$FreeBSD: releng/7.2/release/doc/en_US.ISO8859-1/errata/article.sgml
-191495 2009-04-25 21:10:38Z hrs $

+
$FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml
+191769 2009-05-03 21:21:17Z hrs $

 
 
 
@@ -73,8 +73,8 @@
 target="_top">http://www.FreeBSD.org/releases/, plus any sites which keep up-to-date
 mirrors of this location.
 
-Source and binary snapshots of FreeBSD 7.2-STABLE also contain up-to-date copies of
-this document (as of the time of the snapshot).
+Source and binary snapshots of FreeBSD 7-STABLE also contain up-to-date copies of this
+document (as of the time of the snapshot).
 
 For a list of all FreeBSD CERT security advisories, see 
 

 3 Open Issues
+
+[20090501] Some machines do not recognize the i386 disc1 as bootable and fall through
+to booting off the next boot device. All affected machines did see the other discs as

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From pgj at FreeBSD.org  Mon May  4 05:16:20 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Mon May  4 05:16:26 2009
Subject: PERFORCE change 161525 for review
Message-ID: <200905040516.n445GIoS086618@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161525

Change 161525 by pgj@beehive on 2009/05/04 05:15:22

	MFen (doc):
		1.1113     -> 1.1114     hu_HU.ISO8859-2/books/faq/book.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#45 edit

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#45 (text+ko) ====

@@ -9,7 +9,7 @@
 
 
 
From hselasky at FreeBSD.org  Mon May  4 08:13:21 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Mon May  4 08:13:28 2009
Subject: PERFORCE change 161533 for review
Message-ID: <200905040813.n448DKFL007822@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161533

Change 161533 by hselasky@hselasky_laptop001 on 2009/05/04 08:12:22

	
	USB storage: Add quirk from "Henri-Pierre Charles". Add new quirk flag to
	UMASS, UMASS_PROTO_DEFAULT, which shall be used when the protocol indicated by
	the USB descriptors is correct.
	
	PR:		usb/134193

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#54 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#13 (text+ko) ====

@@ -309,6 +309,7 @@
 
 	/* wire and command protocol */
 	uint16_t proto;
+#define	UMASS_PROTO_DEFAULT	0x0000	/* use protocol indicated by USB descriptors */
 #define	UMASS_PROTO_BBB		0x0001	/* USB wire protocol */
 #define	UMASS_PROTO_CBI		0x0002
 #define	UMASS_PROTO_CBI_I	0x0004
@@ -372,7 +373,7 @@
 
 static const struct umass_devdescr umass_devdescr[] = {
 	{USB_VENDOR_ASAHIOPTICAL, PID_WILDCARD, RID_WILDCARD,
-		UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I,
+		UMASS_PROTO_DEFAULT,
 		RS_NO_CLEAR_UA
 	},
 	{USB_VENDOR_ADDON, USB_PRODUCT_ADDON_ATTACHE, RID_WILDCARD,
@@ -600,6 +601,10 @@
 		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 		FORCE_SHORT_INQUIRY | NO_INQUIRY_EVPD | NO_GETMAXLUN
 	},
+	{USB_VENDOR_MPMAN, PID_WILDCARD, RID_WILDCARD,
+		UMASS_PROTO_DEFAULT,
+		NO_SYNCHRONIZE_CACHE
+	},
 	{USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY, RID_WILDCARD,
 		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 		IGNORE_RESIDUE | NO_GETMAXLUN | RS_NO_CLEAR_UA
@@ -609,11 +614,11 @@
 		NO_QUIRKS
 	},
 	{USB_VENDOR_MYSON, USB_PRODUCT_MYSON_HEDEN, RID_WILDCARD,
-		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+		UMASS_PROTO_DEFAULT,
 		IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE
 	},
 	{USB_VENDOR_MYSON, USB_PRODUCT_MYSON_STARREADER, RID_WILDCARD,
-		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+		UMASS_PROTO_DEFAULT,
 		NO_SYNCHRONIZE_CACHE
 	},
 	{USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3260, RID_WILDCARD,
@@ -849,7 +854,7 @@
 		NO_QUIRKS
 	},
 	{USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDE, RID_WILDCARD,
-		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+		UMASS_PROTO_DEFAULT,
 		IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE
 	},
 	{USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE, RID_WILDCARD,
@@ -1281,6 +1286,58 @@
  * USB device probe/attach/detach
  */
 
+static uint16_t
+umass_get_proto(struct usb2_interface *iface)
+{
+	struct usb2_interface_descriptor *id;
+	uint16_t retval;
+
+	retval = 0;
+
+	/* Check for a standards compliant device */
+	id = usb2_get_interface_descriptor(iface);
+	if ((id == NULL) ||
+	    (id->bInterfaceClass != UICLASS_MASS)) {
+		goto done;
+	}
+	switch (id->bInterfaceSubClass) {
+	case UISUBCLASS_SCSI:
+		retval |= UMASS_PROTO_SCSI;
+		break;
+	case UISUBCLASS_UFI:
+		retval |= UMASS_PROTO_UFI;
+		break;
+	case UISUBCLASS_RBC:
+		retval |= UMASS_PROTO_RBC;
+		break;
+	case UISUBCLASS_SFF8020I:
+	case UISUBCLASS_SFF8070I:
+		retval |= UMASS_PROTO_ATAPI;
+		break;
+	default:
+		retval = 0;
+		goto done;
+	}
+
+	switch (id->bInterfaceProtocol) {
+	case UIPROTO_MASS_CBI:
+		retval |= UMASS_PROTO_CBI;
+		break;
+	case UIPROTO_MASS_CBI_I:
+		retval |= UMASS_PROTO_CBI_I;
+		break;
+	case UIPROTO_MASS_BBB_OLD:
+	case UIPROTO_MASS_BBB:
+		retval |= UMASS_PROTO_BBB;
+		break;
+	default:
+		retval = 0;
+		goto done;
+	}
+done:
+	return (retval);
+}
+
 /*
  * Match the device we are seeing with the
  * devices supported.
@@ -1289,10 +1346,9 @@
 umass_probe_proto(device_t dev, struct usb2_attach_arg *uaa)
 {
 	const struct umass_devdescr *udd = umass_devdescr;
-	struct usb2_interface_descriptor *id;
 	struct umass_probe_proto ret;
 
-	bzero(&ret, sizeof(ret));
+	memset(&ret, 0, sizeof(ret));
 
 	/*
 	 * An entry specifically for Y-E Data devices as they don't fit in
@@ -1319,7 +1375,6 @@
 			ret.quirks |= NO_TEST_UNIT_READY;
 		}
 		ret.quirks |= RS_NO_CLEAR_UA | FLOPPY_SPEED;
-		ret.error = 0;
 		goto done;
 	}
 	/*
@@ -1327,13 +1382,6 @@
 	 * check for wildcarded and fully matched. First match wins.
 	 */
 	for (; udd->vid != VID_EOT; udd++) {
-		if ((udd->vid == VID_WILDCARD) &&
-		    (udd->pid == PID_WILDCARD) &&
-		    (udd->rid == RID_WILDCARD)) {
-			device_printf(dev, "ignoring invalid "
-			    "wildcard quirk\n");
-			continue;
-		}
 		if (((udd->vid == uaa->info.idVendor) ||
 		    (udd->vid == VID_WILDCARD)) &&
 		    ((udd->pid == uaa->info.idProduct) ||
@@ -1341,64 +1389,28 @@
 			if (udd->rid == RID_WILDCARD) {
 				ret.proto = udd->proto;
 				ret.quirks = udd->quirks;
-				ret.error = 0;
-				goto done;
+				if (ret.proto == UMASS_PROTO_DEFAULT)
+					goto default_proto;
+				else
+					goto done;
 			} else if (udd->rid == uaa->info.bcdDevice) {
 				ret.proto = udd->proto;
 				ret.quirks = udd->quirks;
-				ret.error = 0;
-				goto done;
+				if (ret.proto == UMASS_PROTO_DEFAULT)
+					goto default_proto;
+				else
+					goto done;
 			}		/* else RID does not match */
 		}
 	}
 
-	/* Check for a standards compliant device */
-	id = usb2_get_interface_descriptor(uaa->iface);
-	if ((id == NULL) ||
-	    (id->bInterfaceClass != UICLASS_MASS)) {
+default_proto:
+	ret.proto = umass_get_proto(uaa->iface);
+	if (ret.proto == 0) {
+		device_printf(dev, "Unsupported protocol.\n");
 		ret.error = ENXIO;
-		goto done;
-	}
-	switch (id->bInterfaceSubClass) {
-	case UISUBCLASS_SCSI:
-		ret.proto |= UMASS_PROTO_SCSI;
-		break;
-	case UISUBCLASS_UFI:
-		ret.proto |= UMASS_PROTO_UFI;
-		break;
-	case UISUBCLASS_RBC:
-		ret.proto |= UMASS_PROTO_RBC;
-		break;
-	case UISUBCLASS_SFF8020I:
-	case UISUBCLASS_SFF8070I:
-		ret.proto |= UMASS_PROTO_ATAPI;
-		break;
-	default:
-		device_printf(dev, "unsupported command "
-		    "protocol %d\n", id->bInterfaceSubClass);
-		ret.error = ENXIO;
-		goto done;
-	}
-
-	switch (id->bInterfaceProtocol) {
-	case UIPROTO_MASS_CBI:
-		ret.proto |= UMASS_PROTO_CBI;
-		break;
-	case UIPROTO_MASS_CBI_I:
-		ret.proto |= UMASS_PROTO_CBI_I;
-		break;
-	case UIPROTO_MASS_BBB_OLD:
-	case UIPROTO_MASS_BBB:
-		ret.proto |= UMASS_PROTO_BBB;
-		break;
-	default:
-		device_printf(dev, "unsupported wire "
-		    "protocol %d\n", id->bInterfaceProtocol);
-		ret.error = ENXIO;
-		goto done;
-	}
-
-	ret.error = 0;
+	} else
+		ret.error = 0;
 done:
 	return (ret);
 }

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#54 (text+ko) ====

@@ -624,6 +624,7 @@
 vendor LINKSYS3		0x1915	Linksys
 vendor QUALCOMMINC	0x19d2	Qualcomm, Incorporated
 vendor STELERA		0x1a8d	Stelera Wireless
+vendor MPMAN		0x1cae	MpMan
 vendor DRESDENELEKTRONIK 0x1cf1 dresden elektronik
 vendor DLINK		0x2001	D-Link
 vendor PLANEX2		0x2019	Planex Communications
@@ -2296,6 +2297,10 @@
 product STELERA ZEROCD		0x1000	Zerocd Installer
 product STELERA C105		0x1002	Stelera/Bandrish C105 USB
 
+/* MpMan products */
+product MPMAN MPF400_1		0x36d0	MPF400 Music Player 1Go
+product MPMAN MPF400_2		0x25a8	MPF400 Music Player 2Go
+
 /* STMicroelectronics products */
 product STMICRO BIOCPU		0x2016	Biometric Coprocessor
 product STMICRO COMMUNICATOR	0x7554	USB Communicator
From rene at FreeBSD.org  Mon May  4 09:40:59 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Mon May  4 09:41:05 2009
Subject: PERFORCE change 161539 for review
Message-ID: <200905040940.n449evPV025853@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161539

Change 161539 by rene@rene_self on 2009/05/04 09:40:45

	[solid-state] : incorporate keramida's comments on the "third patchset".
	While here, capitalize a section title.

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#14 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#14 (text+ko) ====

@@ -348,8 +348,9 @@
 	populated by /etc/rc.d/var using the list from
 	/etc/mtree/BSD.var.dist, so the cron, cron/tabs, and at directories get created.
+	  class="directory">cron/tabs, at, and a few other standard
+	directories get created.
 
       However, this does not solve the problem of maintaining cron
 	tabs across reboots.  When the system reboots, the
@@ -379,14 +380,10 @@
 
       &prompt.root; touch /var/log/security /var/log/maillog /var/log/cron /var/log/messages
 &prompt.root; chmod 0644 /var/log/*
-
-      You will also need to add the log directory to the list of
-	directories that /etc/rc.d/var
-	creates.
     
 
     
-      ports installation
+      Ports Installation
 
       Before discussing the changes necessary to successfully use the
 	ports tree, a reminder is necessary regarding the read-only nature of
From rene at FreeBSD.org  Mon May  4 09:47:05 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Mon May  4 09:47:18 2009
Subject: PERFORCE change 161540 for review
Message-ID: <200905040947.n449l4q5026342@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161540

Change 161540 by rene@rene_self on 2009/05/04 09:46:10

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#20 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#13 integrate
.. //depot/projects/docproj_nl/share/images/articles/releng/branches-releng7.pic#2 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd.ent#11 integrate
.. //depot/projects/docproj_nl/www/en/cgi/man.cgi#9 integrate
.. //depot/projects/docproj_nl/www/en/platforms/amd64/motherboards.sgml#4 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.2R/announce.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.2R/errata.html#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.2R/relnotes.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#9 integrate
.. //depot/projects/docproj_nl/www/en/releases/index.sgml#7 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#20 integrate
.. //depot/projects/docproj_nl/www/en/security/security.sgml#6 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#37 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#15 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#20 (text+ko) ====

@@ -12,7 +12,7 @@
 
     The &os; Documentation Project
 
-    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1112 2009/04/03 17:35:31 blackend Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1114 2009/05/03 18:18:56 manolis Exp $
 
     
       1995
@@ -3872,7 +3872,7 @@
 
 	
 	  There is a known problem when enabling &intel; Enhanced
-	    SpeedStep from the BIOS causes the kernel to start printing
+	    SpeedStep from the BIOS: it causes the kernel to start printing
 	    calcru messages like this:
 
 	  calcru: runtime went backwards from 6 usec to 3 usec for pid 37 (pagezero)
@@ -9065,7 +9065,7 @@
 	  set openmode passive
 
 	  Care should be taken with this option.  You should also
-	    use the this command to limit the amount of time that
+	    use this command to limit the amount of time that
 	    &man.ppp.8; waits for the peer to begin negotations:
 
 	  set stopped N

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#10 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -638,7 +638,7 @@
       The tree was branched again in July 2005, this time for RELENG_6.
 	6.0-RELEASE, the first release of the 6.X branch, was released in
 	November 2005.  The most recent &rel2.current;-RELEASE came out in
-	&rel2.current.date;.  This will probably be the final release from the
+	&rel2.current.date;.  There will be no additional releases from the
 	RELENG_6 branch.
 
       The RELENG_7 branch was created in October 2007.  The first

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#13 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -2696,6 +2696,14 @@
 
     
       
+	RELENG_7_2_0_RELEASE
+
+	
+	  FreeBSD 7.2
+	
+      
+
+      
 	RELENG_7_1_0_RELEASE
 
 	

==== //depot/projects/docproj_nl/share/images/articles/releng/branches-releng7.pic#2 (text+ko) ====

@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.\" $FreeBSD: doc/share/images/articles/releng/branches-releng7.pic,v 1.1 2008/10/05 12:41:45 hrs Exp $
+.\" $FreeBSD: doc/share/images/articles/releng/branches-releng7.pic,v 1.2 2009/05/04 00:03:21 hrs Exp $
 
 .PS 6
 
@@ -22,6 +22,14 @@
 	box width .9 "\s-3RELENG_7_1\s+3" dashed
 
 	line -> right from RELENG_7_1_0_RELEASE.e
+RELENG_7_2_0_RELEASE:
+	ellipse width .9 "\s-27.2-RELEASE\s+2"
+
+	line -> down from RELENG_7_2_0_RELEASE.s
+RELENG_7_2:
+	box width .9 "\s-3RELENG_7_2\s+3" dashed
+
+	line -> right from RELENG_7_2_0_RELEASE.e
 RELENG_7:box "\s-27-STABLE\s+2"
 
 .PE

==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#11 (text+ko) ====

@@ -1,7 +1,7 @@
 
-
-
+
+
 
 
 

==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#9 (text+ko) ====

@@ -34,7 +34,7 @@
 # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995
 #
 # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $
-# $FreeBSD: www/en/cgi/man.cgi,v 1.228 2009/04/26 20:30:24 danger Exp $
+# $FreeBSD: www/en/cgi/man.cgi,v 1.232 2009/05/04 07:32:07 wosch Exp $
 
 ############################################################################
 # !!! man.cgi is stale perl4 code !!!
@@ -139,6 +139,7 @@
     'OpenBSD 4.2' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
     'OpenBSD 4.3' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
     'OpenBSD 4.4' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
+    'OpenBSD 4.5' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
 };
 
 foreach my $os ( keys %$sectionpath ) {
@@ -159,18 +160,19 @@
 );
 
 $manLocalDir    = '/usr/local/www/bsddoc/man';
-$manPathDefault = 'FreeBSD 7.1-RELEASE';
+$manPathDefault = 'FreeBSD 7.2-RELEASE';
 
 %manPath = (
-    'FreeBSD 7.1-RELEASE and Ports',
-"$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
+    'FreeBSD 7.2-RELEASE and Ports',
+"$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
     'FreeBSD 6.4-RELEASE and Ports',
 "$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
 
     'FreeBSD Ports', "$manLocalDir/FreeBSD-ports",
     'FreeBSD 8-current', "$manLocalDir/FreeBSD-8-current/man:$manLocalDir/FreeBSD-8-current/openssl/man",
 
-    'FreeBSD 7.1-stable', "$manLocalDir/FreeBSD-7.1-stable",
+    'FreeBSD 7.2-stable', "$manLocalDir/FreeBSD-7.2-stable",
+    'FreeBSD 7.2-RELEASE', "$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man",
     'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man",
     'FreeBSD Ports 7.1-RELEASE', "$manLocalDir/FreeBSD-ports-7.1-RELEASE",
 
@@ -276,6 +278,7 @@
     'OpenBSD 4.2', "$manLocalDir/OpenBSD-4.2",
     'OpenBSD 4.3', "$manLocalDir/OpenBSD-4.3",
     'OpenBSD 4.4', "$manLocalDir/OpenBSD-4.4",
+    'OpenBSD 4.5', "$manLocalDir/OpenBSD-4.5",
 
     #'NetBSD 0.9',            "$manLocalDir/NetBSD-0.9",
     'NetBSD 1.0',   "$manLocalDir/NetBSD-1.0",
@@ -303,6 +306,8 @@
     'NetBSD 3.0',   "$manLocalDir/NetBSD-3.0",
     'NetBSD 3.1',   "$manLocalDir/NetBSD-3.1",
     'NetBSD 4.0',   "$manLocalDir/NetBSD-4.0",
+    'NetBSD 4.0.1', "$manLocalDir/NetBSD-4.0.1",
+    'NetBSD 5.0',   "$manLocalDir/NetBSD-5.0",
 
     '2.8 BSD',      "$manLocalDir/2.8BSD",
     '2.9.1 BSD',    "$manLocalDir/2.9.1BSD",
@@ -389,6 +394,7 @@
     'X11R6.9.0', "$manLocalDir/X11R6.9.0",
     'X11R7.2',   "$manLocalDir/X11R7.2",
     'X11R7.3.2', "$manLocalDir/X11R7.3.2",
+    'X11R7.4',   "$manLocalDir/X11R7.4",
 
     'ULTRIX 4.2',      "$manLocalDir/ULTRIX-4.2",
     'OSF1 V4.0/alpha', "$manLocalDir/OSF1-V4.0-alpha",
@@ -442,6 +448,7 @@
     'OpenBSD 4.2',
     'OpenBSD 4.3',
     'OpenBSD 4.4',
+    'OpenBSD 4.5',
 );
 
 my %no_pdf_output = map { $_ => 1 } @no_pdf_output;
@@ -464,15 +471,15 @@
 
 # keywords must be in lower cases.
 %manPathAliases = (
-    'freebsd',         'FreeBSD 7.1-RELEASE',
-    'freebsd-release', 'FreeBSD 7.1-RELEASE',
+    'freebsd',         'FreeBSD 7.2-RELEASE',
+    'freebsd-release', 'FreeBSD 7.2-RELEASE',
 
-    'freebsd-stable',  'FreeBSD 7.1-stable',
-    'freebsd-stable7', 'FreeBSD 7.1-stable',
+    'freebsd-stable',  'FreeBSD 7.2-stable',
+    'freebsd-stable7', 'FreeBSD 7.2-stable',
     'freebsd-stable6', 'FreeBSD 6.4-stable',
 
     'freebsd-current',       'FreeBSD 8-current',
-    'freebsd-release-ports', 'FreeBSD 7.1-RELEASE and Ports',
+    'freebsd-release-ports', 'FreeBSD 7.2-RELEASE and Ports',
 
     'slackware',  'Linux Slackware 3.1',
     'redhat',     'Red Hat Linux/i386 9',
@@ -482,11 +489,11 @@
     'opendarwin', 'OpenDarwin 7.2.1',
     'macosx',     'Darwin 8.0.1/ppc',
 
-    'netbsd',        'NetBSD 4.0',
-    'openbsd',       'OpenBSD 4.4',
+    'netbsd',        'NetBSD 5.0',
+    'openbsd',       'OpenBSD 4.5',
     'v7',            'Unix Seventh Edition',
     'v7man',         'Unix Seventh Edition',
-    'x11',           'X11R7.3.2',
+    'x11',           'X11R7.4',
     'xfree86',       'XFree86 4.7.0',
     'ultrix',        'ULTRIX 4.2',
     'hpux',          'HP-UX 11.22',
@@ -693,11 +700,10 @@
     my $filename = $manpath;
     $filename =~ s/\s+/_/;
     $filename = &encode_url($filename);
-    $filename .= '.tar.gz';
+    $filename .= '.tgz';
 
-    print qq{Content-type: application/x-tar\n}
-      . qq{Content-encoding: x-gzip\n}
-      . qq{Content-disposition: inline; filename="$filename"\n} . "\n";
+    print qq{Content-type: application/x-tgz\n}
+      . qq{Content-disposition: attachment; filename="$filename"\n} . "\n";
 
     local (@m);
     local ($m) = $manPath{"$manpath"};
@@ -1378,7 +1384,7 @@
     }
 
     local $id =
-      '$FreeBSD: www/en/cgi/man.cgi,v 1.228 2009/04/26 20:30:24 danger Exp $';
+      '$FreeBSD: www/en/cgi/man.cgi,v 1.232 2009/05/04 07:32:07 wosch Exp $';
     return qq{\
 
 Copyright (c) 1996-2008 Wolfram Schneider

==== //depot/projects/docproj_nl/www/en/platforms/amd64/motherboards.sgml#4 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -1035,6 +1035,14 @@
     
     
       Supermicro
+      PDSMi
+      Intel E7320 / LGA 775
+      
+      6.2-RELEASE
+      Works fine.  Onboard RAID untested.
+    
+    
+      Supermicro
       X6DA8-G2
       Intel E7525 / 2x 604-pin FC-mPGA4
       Erik Power
@@ -1070,6 +1078,21 @@
       
     
     
+      Supermicro
+      X7SBA
+      Intel 3210 + ICH9R / LGA 775
+      Brad Davis
+      7.0-RELEASE
+      Works fine.  Onboard RAID untested.
+    
+    
+      Supermicro
+      X7SBi
+      Intel 3210 + ICH9R / LGA 775
+      Brad Davis
+      7.1-RELEASE
+      Works fine.  Onboard RAID untested.
+    
       Tyan
       Thunder h1000E (S3970)
       Broadcom BCM 5785 / Socket F - 2x Opteron

==== //depot/projects/docproj_nl/www/en/releases/7.2R/announce.sgml#2 (text+ko) ====

@@ -1,13 +1,408 @@
 
-
+
 
 
 ]>
 
   &header;
 
-  FreeBSD 7.2-RELEASE is not released yet.
+  The FreeBSD Release Engineering Team is pleased to announce the
+    availability of FreeBSD 7.2-RELEASE.  This is the third release
+    from the 7-STABLE branch which improves on the functionality of
+    FreeBSD 7.1 and introduces some new features.  Some of the
+    highlights:
+
+  
+    support for fully transparent use of superpages for
+	  application memory
+
+    support for multiple IPv4 and IPv6 addresses for
+	jails
+
+    csup(1) now supports CVSMode to fetch a complete CVS
+	repository
+
+    Gnome updated to 2.26, KDE updated to 4.2.2
+
+    sparc64 now supports UltraSparc-III processors
+  
+
+  For a complete list of new features and known problems, please
+    see the online release notes and errata list, available at:
+
+  
+    http://www.FreeBSD.org/releases/7.2R/relnotes.html
+
+    http://www.FreeBSD.org/releases/7.2R/errata.html
+  
+
+  For more information about FreeBSD release engineering
+    activities, please see:
+
+  
+    http://www.FreeBSD.org/releng/
+  
+
+  Availability
+
+  FreeBSD 7.2-RELEASE is now available for the amd64, i386, ia64,
+    pc98, powerpc, and sparc64 architectures.
+
+  FreeBSD 7.2 can be installed from bootable ISO images or over the
+    network; the required files can be downloaded via FTP or
+    BitTorrent as described in the sections below.  While some of the
+    smaller FTP mirrors may not carry all architectures, they will all
+    generally contain the more common ones, such as i386 and
+    amd64.
+
+  MD5 and SHA256 hashes for the release ISO images are included at
+    the bottom of this message.
+
+  The purpose of the ISO images provided as part of the release are
+    as follows:
+
+  
+    dvd1
+
+    This contains everything necessary to install the base
+	FreeBSD operating system, a collection of pre-built packages,
+	and the documentation.  It also supports booting into a
+	"livefs" based rescue mode.  This should be all you need if
+	you can burn and use DVD-sized media.
+
+    disc1, disc2, disc3, livefs, docs
+
+    disc1 contains the base FreeBSD operating
+	system and a few pre-built packages.  disc2
+	and disc3 contain more pre-built packages.
+	Those three can be burned to CDROM sized media and should be
+	all you need to do a normal installation.
+	livefs contains support for booting into a
+	"livefs" based rescue mode but does not support doing an
+	install from the CD itself.  You would need to perform a
+	network based install.  docs contains the
+	documentation.
+
+    bootonly
+
+    This supports booting a machine using the CDROM drive but
+	does not contain the support for installing FreeBSD from the
+	CD itself.  You would need to perform a network based install
+	(e.g. from an FTP server) after booting from the CD.
+  
+
+  Note: late in the testing cycle it was
+    discovered some machines do not recognize the i386 disc1 as
+    bootable (they just fall through to booting off the next boot
+    device).  All affected machines did see the other discs as
+    bootable.  If you have a machine with that problem booting off
+    either bootonly or livefs and then swapping in disc1 once
+    sysinstall starts should work.
+
+  FreeBSD 7.2-RELEASE can also be purchased on CD-ROM or DVD from
+    several vendors.  One of the vendors that will be offering FreeBSD
+    7.2-based products is:
+
+  
+    FreeBSD Mall, Inc. http://www.freebsdmall.com/
+  
+
+  BitTorrent
+
+  7.2-RELEASE ISOs are available via BitTorrent.  A collection of
+    torrent files to download the images is available at:
+
+  
+    http://torrents.FreeBSD.org:8080/
+  
+
+  FTP
+
+  At the time of this announcement the following FTP sites have
+    FreeBSD 7.2-RELEASE available.
+
+  
+    ftp://ftp.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp1.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp5.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp10.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp12.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp13.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp14.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.dk.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.gr.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp1.ru.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.tw.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp4.tw.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.uk.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp3.us.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp7.us.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp10.us.FreeBSD.org/pub/FreeBSD/
+  
+
+  However before trying these sites please check your regional
+    mirror(s) first by going to:
+
+  
+    ftp://ftp.<yourdomain>.FreeBSD.org/pub/FreeBSD
+  
+
+  Any additional mirror sites will be labeled
+    ftp2, ftp3 and so on.
+
+  More information about FreeBSD mirror sites can be found at:
+
+  
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html
+  
+
+  For instructions on installing FreeBSD, please see Chapter 2 of
+    The FreeBSD Handbook.  It provides a complete installation
+    walk-through for users new to FreeBSD, and can be found online
+    at:
+
+  
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html
+  
+
+  Updates from Source
+
+  The procedure for doing a source code based update is described in the
+    FreeBSD Handbook:
+
+  
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/synching.html
+
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
+  
+
+  The branch tag to use for updating the source is RELENG_7_2.
+
+  FreeBSD Update
+
+  The freebsd-update(8) utility supports binary upgrades of i386
+    and amd64 systems running earlier FreeBSD releases.  Systems
+    running 7.0-RELEASE, 7.1-RELEASE, 7.2-BETA, 7.2-RC1, or 7.2-RC2
+    can upgrade as follows:
+
+  # freebsd-update upgrade -r 7.2-RELEASE
+
+  During this process, FreeBSD Update may ask the user to help by
+    merging some configuration files or by confirming that the
+    automatically performed merging was done correctly.
+
+  # freebsd-update install
+
+  The system must be rebooted with the newly installed kernel
+    before continuing.
+
+  # shutdown -r now
+
+  After rebooting, freebsd-update needs to be run again to
+    install the new userland components, and the system needs to be
+    rebooted again:
+
+  # freebsd-update install
+# shutdown -r now
+
+  Users of earlier FreeBSD releases (FreeBSD 6.x) can also use
+    freebsd-update to upgrade to FreeBSD 7.2, but will be prompted
+    to rebuild all third-party applications (e.g., anything
+    installed from the ports tree) after the second invocation of
+    "freebsd-update install", in order to handle differences in the
+    system libraries between FreeBSD 6.x and FreeBSD 7.x.
+
+  For more information about upgrading from FreeBSD 6.x using
+    FreeBSD Update, see:
+
+  
+    http://www.daemonology.net/blog/2007-11-11-freebsd-major-version-upgrade.html
+  
+
+  Support
+
+  The FreeBSD Security Team currently plans to support FreeBSD
+    7.2 until May 31st, 2010.  For more information on the Security
+    Team and their support of the various FreeBSD branches see:
+
+  
+    http://www.FreeBSD.org/security/
+  
+
+  Acknowledgments
+
+  Many companies donated equipment, network access, or man-hours to
+    support the release engineering activities for FreeBSD 7.2 including
+    The FreeBSD Foundation, Hewlett-Packard, Yahoo!, NetApp,
+    Internet Systems Consortium, and Sentex Communications.
+
+  The release engineering team for 7.2-RELEASE includes:
+
+  
+    
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+    
+  Ken Smith <kensmith@FreeBSD.org> Release Engineering,
+	  amd64, i386, sparc64 Release Building,
+	  Mirror Site Coordination
Robert Watson <rwatson@FreeBSD.org> Release Engineering, Security
Konstantin Belousov <kib@FreeBSD.org> Release Engineering
Marc Fonvieille <blackend@FreeBSD.org> Release Engineering, Documentation
George Neville-Neil <gnn@FreeBSD.org> Release Engineering
Hiroki Sato <hrs@FreeBSD.org> Release Engineering, Documentation
Marcel Moolenaar <marcel@FreeBSD.org> ia64, powerpc Release Building
Takahashi Yoshihiro <nyan@FreeBSD.org> PC98 Release Building
Kris Kennaway <kris@FreeBSD.org> Package Building
Joe Marcus Clarke <marcus@FreeBSD.org> Package Building
Erwin Lansing <erwin@FreeBSD.org> Package Building
Mark Linimon <linimon@FreeBSD.org> Package Building
Pav Lucistnik <pav@FreeBSD.org> Package Building
Colin Percival <cperciva@FreeBSD.org> Security Officer
+
+  Trademark
+
+  FreeBSD is a registered trademark of The FreeBSD Foundation.
+
+  ISO Image Checksums
+
+  MD5 (7.2-RELEASE-amd64-bootonly.iso) = d77d758684d03815be05f90c12085b2f
+MD5 (7.2-RELEASE-amd64-disc1.iso) = 3b281f75acef6f6a16d5e405ed003f36
+MD5 (7.2-RELEASE-amd64-disc2.iso) = e7d2497054a15906d0e4945d8c91e47f
+MD5 (7.2-RELEASE-amd64-disc3.iso) = ba4369f5d39fae3bd11ad537f4c52783
+MD5 (7.2-RELEASE-amd64-docs.iso) = 97db6efd21c531b2a325224d9897f287
+MD5 (7.2-RELEASE-amd64-dvd1.iso) = b3ac4c645aec087480ddefa827c8553c
+MD5 (7.2-RELEASE-amd64-livefs.iso) = 93c4ad283b66f6cb9d1eb1dcace92ce6
+
+  MD5 (7.2-RELEASE-i386-bootonly.iso) = aceb5cdbb14780c97924cb4a645d3258
+MD5 (7.2-RELEASE-i386-disc1.iso) = b2415294a55ab3e5c1931f4e0fe67e4e
+MD5 (7.2-RELEASE-i386-disc2.iso) = b4fd35adea684e6da3a0515b535ece39
+MD5 (7.2-RELEASE-i386-disc3.iso) = da2958a3eb6a3ce6237ed7194bdfdd13
+MD5 (7.2-RELEASE-i386-docs.iso) = fee5de7fbd8c21e5a7523a1c197c32ae
+MD5 (7.2-RELEASE-i386-dvd1.iso) = 1d129a999a1db6aefebc57c2f82cacc0
+MD5 (7.2-RELEASE-i386-livefs.iso) = decdd91479b8059e70eed6d8e4eb5c06
+
+  MD5 (7.2-RELEASE-ia64-bootonly.iso) = d0a84e0014b042f5369e1644a38c380c
+MD5 (7.2-RELEASE-ia64-disc1.iso) = 58eb2db0a7656a05cb6193aad68e150b
+MD5 (7.2-RELEASE-ia64-disc2.iso) = bf27c66277e9bea85d9656af154e94ca
+MD5 (7.2-RELEASE-ia64-disc3.iso) = 1ab4e7e08fa41b7b4e2370a8bde6dcfb
+MD5 (7.2-RELEASE-ia64-docs.iso) = 01de8413d2829c5b1cb6d495b51cf3a0
+MD5 (7.2-RELEASE-ia64-livefs.iso) = 02eadf879e203148610d823e7db515ba
+
+  MD5 (7.2-RELEASE-pc98-bootonly.iso) = a0eaf2126458fc88ee1ac6d82d1f1c3a
+MD5 (7.2-RELEASE-pc98-disc1.iso) = 6555c5c4a8606ee043b5a7fbb7759b32
+MD5 (7.2-RELEASE-pc98-livefs.iso) = 0a23c3c4fc94d2961be5d148003e9511
+
+  MD5 (7.2-RELEASE-powerpc-bootonly.iso) = 17ddd18ad20aa00dd5b4830e536eabad
+MD5 (7.2-RELEASE-powerpc-disc1.iso) = 015869f4f70124c0204ebd111d876142
+MD5 (7.2-RELEASE-powerpc-disc2.iso) = 2f6d5139b57e982039fb90f02cf3f508
+MD5 (7.2-RELEASE-powerpc-disc3.iso) = 0a6d3b4a5808374bb44f3f8583df38f7
+MD5 (7.2-RELEASE-powerpc-docs.iso) = bb30b266f3c0164b512b3b3317f8ab68
+
+  MD5 (7.2-RELEASE-sparc64-bootonly.iso) = e3246598de481f7c1b117c81b46acfaa
+MD5 (7.2-RELEASE-sparc64-disc1.iso) = 2e767c93f195b69ea83274a1dff4dd5c
+MD5 (7.2-RELEASE-sparc64-docs.iso) = 1b3d32f0c82c89e18b6f2a3eeca47ae5
+
+  SHA256 (7.2-RELEASE-amd64-bootonly.iso) = fb87f4c7ddf8870e8758191181ebf3730dd44534ecc3654069a66d85c56695d3
+SHA256 (7.2-RELEASE-amd64-disc1.iso) = 1ea1f6f652d7c5f5eab7ef9f8edbed50cb664b08ed761850f95f48e86cc71ef5
+SHA256 (7.2-RELEASE-amd64-disc2.iso) = 0a951c4eea8891b0d2bf3702eb933037dc6db3530b9a37e5b33d765ba9f67154
+SHA256 (7.2-RELEASE-amd64-disc3.iso) = 870eeb94b3f21d0ab603986bc6fecb6b3a4a7529f6220ba34aef6458fc43a8b4
+SHA256 (7.2-RELEASE-amd64-docs.iso) = 109b9d048b8ff58e392f002ef85f60e75b33ea72ef658edb610f9f50235508d4
+SHA256 (7.2-RELEASE-amd64-dvd1.iso) = 1e13d3b6dfa7034e86f17b9ba379fff56761ffad7e029a23a27e92e9dbde2788
+SHA256 (7.2-RELEASE-amd64-livefs.iso) = df3cc7f8795b9b260ada2facbd0d77114f0535c35b933a503ac3e56e05947e33
+
+  SHA256 (7.2-RELEASE-i386-bootonly.iso) = 6993e73ad5e012d1605c5cf085942b694ec4fa6fb4be114c7e752a012b8c3a5e
+SHA256 (7.2-RELEASE-i386-disc1.iso) = bf4d00102215b07f5a4c8acac80b9d9bd9bf8bd93ac554fe09b21302f0b41380
+SHA256 (7.2-RELEASE-i386-disc2.iso) = 573673db5acebd68dfdbca63f620b923a7e68421f1e946fb26a1381e3d7fd9f8
+SHA256 (7.2-RELEASE-i386-disc3.iso) = ec5c98c02849c181f405e63875f193e33e121cb087cec0bd2a3e10f533ffc8e7
+SHA256 (7.2-RELEASE-i386-docs.iso) = 77beb6e7a7905a2e9aba4adeb2722be5fbdb699bd44bd0a01e3780b4623d2ce9
+SHA256 (7.2-RELEASE-i386-dvd1.iso) = de395cc63cb7fa22a0bf116487c13d56aac71762787fc5581746bfb48e66f750
+SHA256 (7.2-RELEASE-i386-livefs.iso) = 4faa7b9d78d125f9b28521247e32e1f0bef3b0b0f21b654ba22c6e79ca3301ce
+
+  SHA256 (7.2-RELEASE-ia64-bootonly.iso) = 0a2f5fb514f14760b1237059d9ef381e0836fd45579c5264efc2eb49cc57fbb9
+SHA256 (7.2-RELEASE-ia64-disc1.iso) = 048850ab672ae6865225b4d3ca324753dd823d526ce93480adf15f602acd96bf
+SHA256 (7.2-RELEASE-ia64-disc2.iso) = 5fe326d21f2e7646c63a1b6fb5ae913971da99f1c660f0ffd148de19fc47fb11
+SHA256 (7.2-RELEASE-ia64-disc3.iso) = 58c0c94d12ca197593ec48cab2fc5ec619a87caa16ae5421958216773665086d
+SHA256 (7.2-RELEASE-ia64-docs.iso) = 106844d5135e56ed2232ecabe0e4dc8c78e54f7e9d43e92be0ee3f741009a2eb
+SHA256 (7.2-RELEASE-ia64-livefs.iso) = 70294d2d65e2f483af23d9a4c0d14e1af43da68c086b3e247af31e85050b1247
+
+  SHA256 (7.2-RELEASE-pc98-bootonly.iso) = 37f65bb079304353858da6f06936cf12d19cfcdd6f4127aecac91d2a23976db1
+SHA256 (7.2-RELEASE-pc98-disc1.iso) = 877845e4dcd3b617f1c23a47b62d27dbe3a5ff6d35075cb20cd038e2b749220f
+SHA256 (7.2-RELEASE-pc98-livefs.iso) = 3741eb5a178fa0b97a6f50b57dcc750ee7d9d2e1871a244740a4603b22289491
+
+  SHA256 (7.2-RELEASE-powerpc-bootonly.iso) = d933276ab67b6de04144ffb3a15e632f6ac6f0a82237654f9349214e0c0acb9b
+SHA256 (7.2-RELEASE-powerpc-disc1.iso) = b366319ce4cfdbff2ef394cca6f460159dd1e4949927da82904ff5c9baa3f4b8
+SHA256 (7.2-RELEASE-powerpc-disc2.iso) = 40e4d5e94c543018fd692efe7150bcca482f1a0a3ddc50330bbbd5a320d90d36
+SHA256 (7.2-RELEASE-powerpc-disc3.iso) = fc5ed9a503447c68a9e8392b60c4c35650208c42da982c9c6206e349ad327888
+SHA256 (7.2-RELEASE-powerpc-docs.iso) = 58e4f348b057608515bca359a713877964fddf638bca921d09000aada899477b
+
+  SHA256 (7.2-RELEASE-sparc64-bootonly.iso) = 98aa7492c195df441b4e4699984fd8f38af1db03e7e92cc8d1530089a4d50e11
+SHA256 (7.2-RELEASE-sparc64-disc1.iso) = ba7fa45c21d7ca43bacb78fe46c18ef15f73e480e7fe3e6c8ba8c575efe25888
+SHA256 (7.2-RELEASE-sparc64-docs.iso) = b67483a4e198e2aeb99bacf9cc826f36a3d9304482fb49c34d05590661d6da76
 
   &footer;
 

==== //depot/projects/docproj_nl/www/en/releases/7.2R/errata.html#2 (text+ko) ====

@@ -18,8 +18,8 @@
 
 Copyright © 2008, 2009 The FreeBSD Documentation Project
 
-$FreeBSD: releng/7.2/release/doc/en_US.ISO8859-1/errata/article.sgml
-191495 2009-04-25 21:10:38Z hrs $

+
$FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml
+191769 2009-05-03 21:21:17Z hrs $

 
 
 
@@ -73,8 +73,8 @@
 target="_top">http://www.FreeBSD.org/releases/, plus any sites which keep up-to-date
 mirrors of this location.
 
-Source and binary snapshots of FreeBSD 7.2-STABLE also contain up-to-date copies of
-this document (as of the time of the snapshot).
+Source and binary snapshots of FreeBSD 7-STABLE also contain up-to-date copies of this
+document (as of the time of the snapshot).
 
 For a list of all FreeBSD CERT security advisories, see 
 

 3 Open Issues
+
+[20090501] Some machines do not recognize the i386 disc1 as bootable and fall through
+to booting off the next boot device. All affected machines did see the other discs as
+bootable. As a workaround, you can boot using the bootonly or livefs CDROM and then swap
+in disc1 once sysinstall starts.
+
+[20090504] A lock handling error has been found in interaction between 
+malloc(3)
+implementation and threading library. When a multi-threaded process calls the 
+fork(2) system
+call in a thread and the 
+malloc(3)
+function in another thread, it can cause a deadlock in the child process. An Errata
+Notice to fix this problem is planned for this problem after the release.
 
 
 
 
 4 Late-Breaking News and
 Corrections
+
+No news.
 
 
 
 
 This file, and other release-related documents, can be
-downloaded from ftp://ftp.FreeBSD.org/.
+downloaded from http://www.FreeBSD.org/snapshots/.
 
 For questions about FreeBSD, read the documentation before contacting <questions@FreeBSD.org>.
 
+All users of FreeBSD 7-STABLE should subscribe to the <stable@FreeBSD.org> mailing list.
+
 For questions about this documentation, e-mail <doc@FreeBSD.org>.
 

==== //depot/projects/docproj_nl/www/en/releases/7.2R/relnotes.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -12,7 +12,189 @@
   The highlights in the 7.2-RELEASE are the following:
 
   
-    To be updated...
+    [amd64, i386] The FreeBSD virtual memory subsystem now
+	supports fully transparent use of superpages for application memory;
+	application memory pages are dynamically promoted to or
+	demoted from superpages without any modification to
+	application code. This change offers the benefit of large page
+	sizes such as improved virtual memory efficiency and reduced
+	TLB (translation lookaside buffer) misses without downsides
+	like application changes and virtual memory
+	inflexibility. This is disabled by default and can be enabled
+	by setting a loader tunable vm.pmap.pg_ps_enabled to 1.
+
+    [amd64] The FreeBSD kernel virtual address space has been
+	increased to 6GB. This allows subsystems to use larger virtual
+	memory space than before. For example, 
+	zfs(8) adaptive
+	replacement cache (ARC) requires large kernel memory space to
+	cache file system data, so it benefits from the increased
+	address space. Note that the ceiling on the kernel map size is
+	now 60% of the size rather than an absolute quantity.
+
+    [sparc64] The FreeBSD now supports Ultra SPARC III
+	(Cheetah) processor family.
+
+    [i386] The 
+	  boot(8) BTX loader
+	  has been improved. This fixes several boot issues on recent
+	  machines reported for 7.1-RELEASE and before.
+
+    A bug in the 
+	  ciss(4) driver which
+	caused low “max device openings” count and led
+	to poor performance has been fixed.
+
+    The 
+	  sdhci(4) driver has
+	been added. This supports PCI devices with class 8 and
+	subclass 5 according to the SD Host Controller
+	Specification.
+
+    Various network interface drivers have been improved,
+	including ae(4), 
+	  ath_hal(4), 
+	  axe(4), 
+	  bce(4), 
+	  cxgb(4), 
+	  fxp(4), 
+	  igb(4), 
+	  jme(4), 
+	  msk(4), 
+	  mxge(4), 
+	  nfe(4), re(4), rl(4), 
+	  sis(4), and 
+	  txp(4).
+
+    The 
+	  btpand(8) daemon
+	from NetBSD has been added. This daemon provides support for
+	Bluetooth Network Access Point (NAP), Group Ad-hoc Network
+	(GN) and Personal Area Network User (PANU)
+	profiles.
+
+    The 
+	  jail(8) subsystem
+	has been updated. Changes include:
+
+      
+	
+	  Multiple addresses of both IPv4 and IPv6 per jail has
+	    been supported. It is even possible to have jails without
+	    an IP address at all, which basically gives one a chrooted
+	    environment with restricted process view and no
+	    networking.
+	
+
+	
+	  SCTP (sctp(4)) with
+	    IPv6 in jails has been implemented.
+	
+
+	Specific CPU binding by using 
+	      cpuset(1) has
+	      been implemented. Note that the current implementation
+	      allows the superuser inside of the jail to change the
+	      CPU bindings specified. This behavior will be fixed in
+	    the next release.
+	
+
+	
+	  A 
+	      jail(8) can
+	    start with a specific route FIB now.
+	
+
+	
+	  A show jails subcommand in 
+	      ddb(8) has been
+	      added.
+	
+
+	Compatibility support which permits 32-bit jail
+	    binaries to be used on 64-bit systems to manage jails has been
+	    added.
+	
+
+	Note that both version numbers of >> TRUNCATED FOR MAIL (1000 lines) <<<
From rene at FreeBSD.org  Mon May  4 09:58:17 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Mon May  4 09:58:23 2009
Subject: PERFORCE change 161541 for review
Message-ID: <200905040958.n449wFNw027199@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161541

Change 161541 by rene@rene_self on 2009/05/04 09:58:14

	MFen:
	* handbook/introduction	1.133 -> 1.134
	* handbook/mirrors	1.458 -> 1.461

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#17 edit
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#20 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#17 (text+ko) ====

@@ -5,7 +5,7 @@
      $FreeBSDnl: nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.35 2005/09/23 17:03:10 siebrand Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
-     %SRCID%	1.133
+     %SRCID%	1.134
 -->
 
 
@@ -776,8 +776,7 @@
       De RELENG_6 tak is gemaakt in juli 2005, de eerste uitgave
 	van de 6.X tak werd vrijgegeven in november 2005.  De meest
 	recente &rel2.current;-RELEASE kwam uit op &rel2.current.date;.
-	Dit zal waarschijnlijk de laatste uitgave zijn van de 6.X
-	tak.
+	Er zullen geen verdere uitgaven komen van de 6.X tak.
 
       De RELENG_7 tak is gemaakt in oktober 2007.  De eerste
 	uitgave van deze tak is 7.0-RELEASE, welke is uitgekomen in

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#20 (text+ko) ====

@@ -6,7 +6,7 @@
      Vertaald door: Siebrand Mazeland
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
-     %SRCID%	1.458
+     %SRCID%	1.461
 -->
 
 
@@ -2832,6 +2832,14 @@
 
     
       
+	RELENG_7_2_0_RELEASE
+
+	
+	  &os; 7.2
+	
+      
+
+      
 	RELENG_7_1_0_RELEASE
 
 	
From hselasky at FreeBSD.org  Mon May  4 10:52:13 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Mon May  4 10:52:21 2009
Subject: PERFORCE change 161545 for review
Message-ID: <200905041052.n44AqADK032226@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161545

Change 161545 by hselasky@hselasky_laptop001 on 2009/05/04 10:51:46

	
	IFC @ 161543

Affected files ...

.. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#14 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#14 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#14 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#21 integrate
.. //depot/projects/usb/src/sys/amd64/conf/GENERIC#24 integrate
.. //depot/projects/usb/src/sys/amd64/include/apicvar.h#8 integrate
.. //depot/projects/usb/src/sys/amd64/include/clock.h#7 integrate
.. //depot/projects/usb/src/sys/amd64/include/smp.h#8 integrate
.. //depot/projects/usb/src/sys/amd64/include/specialreg.h#13 integrate
.. //depot/projects/usb/src/sys/amd64/isa/clock.c#8 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#19 integrate
.. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#18 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91.c#14 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_cfata.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_machdep.c#2 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91rm92reg.h#5 integrate
.. //depot/projects/usb/src/sys/arm/at91/files.at91#10 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#3 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#16 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#14 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#14 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#10 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_futex.h#7 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#9 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#33 integrate
.. //depot/projects/usb/src/sys/conf/files#60 integrate
.. //depot/projects/usb/src/sys/conf/files.powerpc#21 integrate
.. //depot/projects/usb/src/sys/conf/options#26 integrate
.. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi.c#16 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-all.h#12 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#14 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#14 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#17 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#14 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-sata.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ati.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath.c#23 integrate
.. //depot/projects/usb/src/sys/dev/bwi/bitops.h#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/bwimac.c#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/bwimac.h#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/bwiphy.c#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/bwiphy.h#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/bwirf.c#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/bwirf.h#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/if_bwi.c#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/if_bwi_pci.c#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/if_bwireg.h#1 branch
.. //depot/projects/usb/src/sys/dev/bwi/if_bwivar.h#1 branch
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_multiq.c#6 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_em.c#5 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_em.h#4 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ed/if_ed_pccard.c#10 integrate
.. //depot/projects/usb/src/sys/dev/fb/creator.c#8 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#24 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#12 integrate
.. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ipw/if_ipwvar.h#6 integrate
.. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#11 integrate
.. //depot/projects/usb/src/sys/dev/iwi/if_iwivar.h#5 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#7 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwnvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#11 integrate
.. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#11 integrate
.. //depot/projects/usb/src/sys/dev/nve/if_nve.c#8 integrate
.. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#15 integrate
.. //depot/projects/usb/src/sys/dev/rp/rp.c#4 integrate
.. //depot/projects/usb/src/sys/dev/rp/rp_pci.c#2 integrate
.. //depot/projects/usb/src/sys/dev/rp/rpreg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/sk/if_sk.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#22 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#28 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.h#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_request.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_request.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_revision.h#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#142 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumvar.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralvar.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydreg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/usb_wlan.h#5 delete
.. //depot/projects/usb/src/sys/dev/wi/if_wi.c#10 integrate
.. //depot/projects/usb/src/sys/dev/wi/if_wivar.h#6 integrate
.. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#11 integrate
.. //depot/projects/usb/src/sys/dev/wpi/if_wpivar.h#4 integrate
.. //depot/projects/usb/src/sys/dev/xl/if_xl.c#4 integrate
.. //depot/projects/usb/src/sys/i386/bios/apm.c#7 integrate
.. //depot/projects/usb/src/sys/i386/conf/GENERIC#23 integrate
.. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#17 integrate
.. //depot/projects/usb/src/sys/i386/i386/identcpu.c#13 integrate
.. //depot/projects/usb/src/sys/i386/i386/local_apic.c#14 integrate
.. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#17 integrate
.. //depot/projects/usb/src/sys/i386/include/apicvar.h#8 integrate
.. //depot/projects/usb/src/sys/i386/include/clock.h#7 integrate
.. //depot/projects/usb/src/sys/i386/include/smp.h#8 integrate
.. //depot/projects/usb/src/sys/i386/include/specialreg.h#12 integrate
.. //depot/projects/usb/src/sys/i386/isa/clock.c#9 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#14 integrate
.. //depot/projects/usb/src/sys/i386/xen/clock.c#6 integrate
.. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#8 integrate
.. //depot/projects/usb/src/sys/ia64/isa/isa.c#3 integrate
.. //depot/projects/usb/src/sys/isa/atrtc.c#2 integrate
.. //depot/projects/usb/src/sys/isa/rtc.h#3 integrate
.. //depot/projects/usb/src/sys/kern/init_sysent.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_cpuset.c#6 integrate
.. //depot/projects/usb/src/sys/kern/kern_jail.c#18 integrate
.. //depot/projects/usb/src/sys/kern/kern_mib.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_osd.c#3 integrate
.. //depot/projects/usb/src/sys/kern/kern_rmlock.c#3 integrate
.. //depot/projects/usb/src/sys/kern/kern_sysctl.c#13 integrate
.. //depot/projects/usb/src/sys/kern/kern_vimage.c#3 integrate
.. //depot/projects/usb/src/sys/kern/sched_ule.c#16 integrate
.. //depot/projects/usb/src/sys/kern/subr_smp.c#12 integrate
.. //depot/projects/usb/src/sys/kern/subr_witness.c#19 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.c#11 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.master#11 integrate
.. //depot/projects/usb/src/sys/kern/systrace_args.c#10 integrate
.. //depot/projects/usb/src/sys/kern/tty_pts.c#12 integrate
.. //depot/projects/usb/src/sys/kern/uipc_socket.c#17 integrate
.. //depot/projects/usb/src/sys/mips/include/pmap.h#5 integrate
.. //depot/projects/usb/src/sys/mips/mips/pmap.c#9 integrate
.. //depot/projects/usb/src/sys/modules/Makefile#31 integrate
.. //depot/projects/usb/src/sys/modules/bwi/Makefile#1 branch
.. //depot/projects/usb/src/sys/net/bridgestp.c#12 integrate
.. //depot/projects/usb/src/sys/net/flowtable.c#2 integrate
.. //depot/projects/usb/src/sys/net/ieee8023ad_lacp.c#8 integrate
.. //depot/projects/usb/src/sys/net/if.c#23 integrate
.. //depot/projects/usb/src/sys/net/if.h#10 integrate
.. //depot/projects/usb/src/sys/net/if_arcsubr.c#6 integrate
.. //depot/projects/usb/src/sys/net/if_bridge.c#15 integrate
.. //depot/projects/usb/src/sys/net/if_dead.c#1 branch
.. //depot/projects/usb/src/sys/net/if_ef.c#7 integrate
.. //depot/projects/usb/src/sys/net/if_gif.c#13 integrate
.. //depot/projects/usb/src/sys/net/if_gif.h#7 integrate
.. //depot/projects/usb/src/sys/net/if_lagg.c#13 integrate
.. //depot/projects/usb/src/sys/net/if_loop.c#18 integrate
.. //depot/projects/usb/src/sys/net/if_mib.c#7 integrate
.. //depot/projects/usb/src/sys/net/if_var.h#15 integrate
.. //depot/projects/usb/src/sys/net/route.c#16 integrate
.. //depot/projects/usb/src/sys/net/rtsock.c#20 integrate
.. //depot/projects/usb/src/sys/net/vnet.h#7 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211.c#20 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211.h#14 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_adhoc.c#7 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#13 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#15 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#10 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#10 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ht.h#9 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#21 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#21 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#13 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#22 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#17 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_scan.c#8 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_scan.h#5 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#12 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#8 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_superg.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_superg.h#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#20 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_wds.c#8 integrate
.. //depot/projects/usb/src/sys/netgraph/netgraph.h#10 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_base.c#15 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#9 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_ether.c#9 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_iface.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/icmp6.h#5 integrate
.. //depot/projects/usb/src/sys/netinet/igmp.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#21 integrate
.. //depot/projects/usb/src/sys/netinet/in_mcast.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.c#21 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.h#18 integrate
.. //depot/projects/usb/src/sys/netinet/in_rmx.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/ip_carp.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/ip_divert.c#15 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw.h#15 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw2.c#22 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw_pfil.c#9 integrate
.. //depot/projects/usb/src/sys/netinet/ip_input.c#19 integrate
.. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/ip_mroute.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/ip_output.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/raw_ip.c#21 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_subr.c#22 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#20 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_syncache.h#6 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_var.h#17 integrate
.. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#20 integrate
.. //depot/projects/usb/src/sys/netinet/vinet.h#9 integrate
.. //depot/projects/usb/src/sys/netinet6/icmp6.c#17 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.c#20 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.h#7 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#17 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_mcast.c#1 branch
.. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#16 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_proto.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_var.h#8 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_input.c#19 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_output.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_var.h#12 integrate
.. //depot/projects/usb/src/sys/netinet6/mld6.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/mld6.h#1 branch
.. //depot/projects/usb/src/sys/netinet6/mld6_var.h#3 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.c#16 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#15 integrate
.. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#19 integrate
.. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#18 integrate
.. //depot/projects/usb/src/sys/netinet6/vinet6.h#7 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec.c#17 integrate
.. //depot/projects/usb/src/sys/netipsec/key.c#15 integrate
.. //depot/projects/usb/src/sys/netipsec/key.h#2 integrate
.. //depot/projects/usb/src/sys/netipsec/vipsec.h#5 integrate
.. //depot/projects/usb/src/sys/netipx/spx_usrreq.c#6 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_kdtrace.c#2 integrate
.. //depot/projects/usb/src/sys/nfsclient/nfs_krpc.c#4 integrate
.. //depot/projects/usb/src/sys/pc98/cbus/clock.c#8 integrate
.. //depot/projects/usb/src/sys/pc98/conf/GENERIC#18 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#9 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/locore.S#6 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#9 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/swtch.S#3 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/vm_machdep.c#3 integrate
.. //depot/projects/usb/src/sys/powerpc/conf/MPC85XX#5 integrate
.. //depot/projects/usb/src/sys/powerpc/include/hid.h#5 integrate
.. //depot/projects/usb/src/sys/powerpc/include/intr_machdep.h#5 integrate
.. //depot/projects/usb/src/sys/powerpc/include/pte.h#5 integrate
.. //depot/projects/usb/src/sys/powerpc/mpc85xx/atpic.c#1 branch
.. //depot/projects/usb/src/sys/powerpc/mpc85xx/isa.c#1 branch
.. //depot/projects/usb/src/sys/powerpc/mpc85xx/ocpbus.c#6 integrate
.. //depot/projects/usb/src/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/autoconf.c#5 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/bus_machdep.c#3 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#8 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/intr_machdep.c#12 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_atalk.c#3 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_audit.c#7 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_cred.c#4 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_inet.c#12 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_inet6.c#5 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_internal.h#10 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_net.c#8 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_pipe.c#8 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_posix_sem.c#10 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_posix_shm.c#5 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_priv.c#5 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_process.c#12 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_socket.c#8 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_system.c#7 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_sysv_msg.c#8 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_sysv_sem.c#8 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_sysv_shm.c#8 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_vfs.c#10 integrate
.. //depot/projects/usb/src/sys/sys/jail.h#12 integrate
.. //depot/projects/usb/src/sys/sys/ktr.h#3 integrate
.. //depot/projects/usb/src/sys/sys/mbuf.h#13 integrate
.. //depot/projects/usb/src/sys/sys/osd.h#3 integrate
.. //depot/projects/usb/src/sys/sys/param.h#28 integrate
.. //depot/projects/usb/src/sys/sys/priv.h#12 integrate
.. //depot/projects/usb/src/sys/sys/queue.h#4 integrate
.. //depot/projects/usb/src/sys/sys/smp.h#6 integrate
.. //depot/projects/usb/src/sys/sys/socketvar.h#9 integrate
.. //depot/projects/usb/src/sys/sys/syscall.h#11 integrate
.. //depot/projects/usb/src/sys/sys/syscall.mk#11 integrate
.. //depot/projects/usb/src/sys/sys/syscallsubr.h#9 integrate
.. //depot/projects/usb/src/sys/sys/sysctl.h#16 integrate
.. //depot/projects/usb/src/sys/sys/sysproto.h#11 integrate
.. //depot/projects/usb/src/sys/sys/vimage.h#8 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/dinode.h#2 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/inode.h#7 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#14 integrate
.. //depot/projects/usb/src/sys/vm/swap_pager.c#14 integrate
.. //depot/projects/usb/src/sys/vm/vm_fault.c#12 integrate
.. //depot/projects/usb/src/sys/vm/vm_object.c#15 integrate
.. //depot/projects/usb/src/sys/vm/vm_pageout.c#14 integrate
.. //depot/projects/usb/src/sys/vm/vnode_pager.c#14 integrate

Differences ...

==== //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#14 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.91 2009/04/23 20:24:19 jhb Exp $");
 
 #include 
 #include 
@@ -95,7 +95,6 @@
 	int		total_deferred;
 	int		map_count;
 	bus_size_t	alignment;
-	bus_size_t	boundary;
 	bus_addr_t	lowaddr;
 	char		zoneid[8];
 	char		lowaddrid[20];
@@ -978,7 +977,6 @@
 	/* Check to see if we already have a suitable zone */
 	STAILQ_FOREACH(bz, &bounce_zone_list, links) {
 		if ((dmat->alignment <= bz->alignment)
-		 && (dmat->boundary <= bz->boundary)
 		 && (dmat->lowaddr >= bz->lowaddr)) {
 			dmat->bounce_zone = bz;
 			return (0);
@@ -994,8 +992,7 @@
 	bz->reserved_bpages = 0;
 	bz->active_bpages = 0;
 	bz->lowaddr = dmat->lowaddr;
-	bz->alignment = dmat->alignment;
-	bz->boundary = dmat->boundary;
+	bz->alignment = MAX(dmat->alignment, PAGE_SIZE);
 	bz->map_count = 0;
 	snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
 	busdma_zonecount++;
@@ -1042,9 +1039,6 @@
 	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
 	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
 	    "alignment", CTLFLAG_RD, &bz->alignment, 0, "");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "boundary", CTLFLAG_RD, &bz->boundary, 0, "");
 
 	return (0);
 }
@@ -1069,7 +1063,7 @@
 							 M_NOWAIT, 0ul,
 							 bz->lowaddr,
 							 PAGE_SIZE,
-							 bz->boundary);
+							 0);
 		if (bpage->vaddr == 0) {
 			free(bpage, M_DEVBUF);
 			break;

==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#14 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.171 2009/01/22 21:04:46 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.172 2009/04/29 06:54:40 jeff Exp $");
 
 #include "opt_cpu.h"
 
@@ -106,10 +106,7 @@
 	{ CENTAUR_VENDOR_ID,	CPU_VENDOR_CENTAUR },	/* CentaurHauls */
 };
 
-int cpu_cores;
-int cpu_logical;
 
-
 extern int pq_l2size;
 extern int pq_l2nways;
 
@@ -195,7 +192,6 @@
 	    cpu_vendor_id == CPU_VENDOR_CENTAUR) {
 		printf("  Stepping = %u", cpu_id & 0xf);
 		if (cpu_high > 0) {
-			u_int cmp = 1, htt = 1;
 
 			/*
 			 * Here we should probably set up flags indicating
@@ -400,28 +396,6 @@
 			if (tsc_is_invariant)
 				printf("\n  TSC: P-state invariant");
 
-			/*
-			 * If this CPU supports HTT or CMP then mention the
-			 * number of physical/logical cores it contains.
-			 */
-			if (cpu_feature & CPUID_HTT)
-				htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
-			if (cpu_vendor_id == CPU_VENDOR_AMD &&
-			    (amd_feature2 & AMDID2_CMP))
-				cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1;
-			else if (cpu_vendor_id == CPU_VENDOR_INTEL &&
-			    (cpu_high >= 4)) {
-				cpuid_count(4, 0, regs);
-				if ((regs[0] & 0x1f) != 0)
-					cmp = ((regs[0] >> 26) & 0x3f) + 1;
-			}
-			cpu_cores = cmp;
-			cpu_logical = htt / cmp;
-			if (cmp > 1)
-				printf("\n  Cores per package: %d", cmp);
-			if ((htt / cmp) > 1)
-				printf("\n  Logical CPUs per core: %d",
-				    cpu_logical);
 		}
 	}
 	/* Avoid ugly blank lines: only print newline when we have to. */

==== //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#14 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.52 2009/02/21 23:15:34 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.54 2009/05/01 20:53:37 mav Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -112,7 +112,7 @@
 	u_long la_stat_ticks;
 	u_long la_prof_ticks;
 	/* Include IDT_SYSCALL to make indexing easier. */
-	u_int la_ioint_irqs[APIC_NUM_IOINTS + 1];
+	int la_ioint_irqs[APIC_NUM_IOINTS + 1];
 } static lapics[MAX_APIC_ID + 1];
 
 /* XXX: should thermal be an NMI? */
@@ -254,6 +254,8 @@
 		lapics[apic_id].la_lvts[i] = lvts[i];
 		lapics[apic_id].la_lvts[i].lvt_active = 0;
 	}
+	for (i = 0; i <= APIC_NUM_IOINTS; i++)
+	    lapics[apic_id].la_ioint_irqs[i] = -1;
 	lapics[apic_id].la_ioint_irqs[IDT_SYSCALL - APIC_IO_INTS] = IRQ_SYSCALL;
 	lapics[apic_id].la_ioint_irqs[APIC_TIMER_INT - APIC_IO_INTS] =
 	    IRQ_TIMER;
@@ -363,11 +365,15 @@
 lapic_setup_clock(void)
 {
 	u_long value;
+	int i;
 
 	/* Can't drive the timer without a local APIC. */
 	if (lapic == NULL)
 		return (0);
 
+	if (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0)
+		return (0);
+
 	/* Start off with a divisor of 2 (power on reset default). */
 	lapic_timer_divisor = 2;
 
@@ -807,7 +813,7 @@
 	 */
 	mtx_lock_spin(&icu_lock);
 	for (vector = 0; vector < APIC_NUM_IOINTS; vector++) {
-		if (lapics[apic_id].la_ioint_irqs[vector] != 0)
+		if (lapics[apic_id].la_ioint_irqs[vector] != -1)
 			continue;
 		lapics[apic_id].la_ioint_irqs[vector] = irq;
 		mtx_unlock_spin(&icu_lock);
@@ -847,7 +853,7 @@
 	for (vector = 0; vector < APIC_NUM_IOINTS; vector++) {
 
 		/* Vector is in use, end run. */
-		if (lapics[apic_id].la_ioint_irqs[vector] != 0) {
+		if (lapics[apic_id].la_ioint_irqs[vector] != -1) {
 			run = 0;
 			first = 0;
 			continue;
@@ -932,7 +938,7 @@
 	sched_bind(td, apic_cpuid(apic_id));
 	thread_unlock(td);
 	mtx_lock_spin(&icu_lock);
-	lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0;
+	lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1;
 	mtx_unlock_spin(&icu_lock);
 	thread_lock(td);
 	sched_unbind(td);
@@ -944,11 +950,15 @@
 u_int
 apic_idt_to_irq(u_int apic_id, u_int vector)
 {
+	int irq;
 
 	KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL &&
 	    vector <= APIC_IO_INTS + APIC_NUM_IOINTS,
 	    ("Vector %u does not map to an IRQ line", vector));
-	return (lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS]);
+	irq = lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS];
+	if (irq < 0)
+		irq = 0;
+	return (irq);
 }
 
 #ifdef DDB
@@ -974,7 +984,7 @@
 		db_printf("Interrupts bound to lapic %u\n", apic_id);
 		for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) {
 			irq = lapics[apic_id].la_ioint_irqs[i];
-			if (irq == 0 || irq == IRQ_SYSCALL)
+			if (irq == -1 || irq == IRQ_SYSCALL)
 				continue;
 			db_printf("vec 0x%2x -> ", i + APIC_IO_INTS);
 			if (irq == IRQ_TIMER)

==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#21 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.302 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.306 2009/05/02 12:20:43 mav Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -57,6 +57,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -160,6 +161,8 @@
 static volatile u_int cpu_ipi_pending[MAXCPU];
 
 static u_int boot_address;
+static int cpu_logical;
+static int cpu_cores;
 
 static void	assign_cpu_ids(void);
 static void	set_interrupt_apic_ids(void);
@@ -181,13 +184,148 @@
 		mem_range_softc.mr_op->initAP(&mem_range_softc);
 }
 
-struct cpu_group *
-cpu_topo(void)
+static void
+topo_probe_0xb(void)
+{
+	int logical;
+	int p[4];
+	int bits;
+	int type;
+	int cnt;
+	int i;
+	int x;
+
+	/* We only support two levels for now. */
+	for (i = 0; i < 3; i++) {
+		cpuid_count(0x0B, i, p);
+		bits = p[0] & 0x1f;
+		logical = p[1] &= 0xffff;
+		type = (p[2] >> 8) & 0xff;
+		if (type == 0 || logical == 0)
+			break;
+		for (cnt = 0, x = 0; x <= MAX_APIC_ID; x++) {
+			if (!cpu_info[x].cpu_present ||
+			    cpu_info[x].cpu_disabled)
+				continue;
+			if (x >> bits == boot_cpu_id >> bits)
+				cnt++;
+		}
+		if (type == CPUID_TYPE_SMT)
+			cpu_logical = cnt;
+		else if (type == CPUID_TYPE_CORE)
+			cpu_cores = cnt;
+	}
+	if (cpu_logical == 0)
+		cpu_logical = 1;
+	cpu_cores /= cpu_logical;
+}
+
+static void
+topo_probe_0x4(void)
+{
+	u_int threads_per_cache, p[4];
+	u_int htt, cmp;
+	int i;
+
+	htt = cmp = 1;
+	/*
+	 * If this CPU supports HTT or CMP then mention the
+	 * number of physical/logical cores it contains.
+	 */
+	if (cpu_feature & CPUID_HTT)
+		htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
+	if (cpu_vendor_id == CPU_VENDOR_AMD && (amd_feature2 & AMDID2_CMP))
+		cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1;
+	else if (cpu_vendor_id == CPU_VENDOR_INTEL && (cpu_high >= 4)) {
+		cpuid_count(4, 0, p);
+		if ((p[0] & 0x1f) != 0)
+			cmp = ((p[0] >> 26) & 0x3f) + 1;
+	}
+	cpu_cores = cmp;
+	cpu_logical = htt / cmp;
+
+	/* Setup the initial logical CPUs info. */
+	if (cpu_feature & CPUID_HTT)
+		logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
+
+	/*
+	 * Work out if hyperthreading is *really* enabled.  This
+	 * is made really ugly by the fact that processors lie: Dual
+	 * core processors claim to be hyperthreaded even when they're
+	 * not, presumably because they want to be treated the same
+	 * way as HTT with respect to per-cpu software licensing.
+	 * At the time of writing (May 12, 2005) the only hyperthreaded
+	 * cpus are from Intel, and Intel's dual-core processors can be
+	 * identified via the "deterministic cache parameters" cpuid
+	 * calls.
+	 */
+	/*
+	 * First determine if this is an Intel processor which claims
+	 * to have hyperthreading support.
+	 */
+	if ((cpu_feature & CPUID_HTT) && cpu_vendor_id == CPU_VENDOR_INTEL) {
+		/*
+		 * If the "deterministic cache parameters" cpuid calls
+		 * are available, use them.
+		 */
+		if (cpu_high >= 4) {
+			/* Ask the processor about the L1 cache. */
+			for (i = 0; i < 1; i++) {
+				cpuid_count(4, i, p);
+				threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1;
+				if (hyperthreading_cpus < threads_per_cache)
+					hyperthreading_cpus = threads_per_cache;
+				if ((p[0] & 0x1f) == 0)
+					break;
+			}
+		}
+
+		/*
+		 * If the deterministic cache parameters are not
+		 * available, or if no caches were reported to exist,
+		 * just accept what the HTT flag indicated.
+		 */
+		if (hyperthreading_cpus == 0)
+			hyperthreading_cpus = logical_cpus;
+	}
+}
+
+static void
+topo_probe(void)
 {
+	static int cpu_topo_probed = 0;
+
+	if (cpu_topo_probed)
+		return;
+
+	logical_cpus = logical_cpus_mask = 0;
+	if (cpu_high >= 0xb)
+		topo_probe_0xb();
+	else if (cpu_high)
+		topo_probe_0x4();
 	if (cpu_cores == 0)
-		cpu_cores = 1;
+		cpu_cores = mp_ncpus > 0 ? mp_ncpus : 1;
 	if (cpu_logical == 0)
 		cpu_logical = 1;
+	cpu_topo_probed = 1;
+}
+
+struct cpu_group *
+cpu_topo(void)
+{
+	int cg_flags;
+
+	/*
+	 * Determine whether any threading flags are
+	 * necessry.
+	 */
+	topo_probe();
+	if (cpu_logical > 1 && hyperthreading_cpus)
+		cg_flags = CG_FLAG_HTT;
+	else if (cpu_logical > 1)
+		cg_flags = CG_FLAG_SMT;
+	else
+		cg_flags = 0;
 	if (mp_ncpus % (cpu_cores * cpu_logical) != 0) {
 		printf("WARNING: Non-uniform processors.\n");
 		printf("WARNING: Using suboptimal topology.\n");
@@ -202,17 +340,17 @@
 	 * Only HTT no multi-core.
 	 */
 	if (cpu_logical > 1 && cpu_cores == 1)
-		return (smp_topo_1level(CG_SHARE_L1, cpu_logical, CG_FLAG_HTT));
+		return (smp_topo_1level(CG_SHARE_L1, cpu_logical, cg_flags));
 	/*
 	 * Only multi-core no HTT.
 	 */
 	if (cpu_cores > 1 && cpu_logical == 1)
-		return (smp_topo_1level(CG_SHARE_NONE, cpu_cores, 0));
+		return (smp_topo_1level(CG_SHARE_L2, cpu_cores, cg_flags));
 	/*
 	 * Both HTT and multi-core.
 	 */
-	return (smp_topo_2level(CG_SHARE_NONE, cpu_cores,
-	    CG_SHARE_L1, cpu_logical, CG_FLAG_HTT));
+	return (smp_topo_2level(CG_SHARE_L2, cpu_cores,
+	    CG_SHARE_L1, cpu_logical, cg_flags));
 }
 
 /*
@@ -318,7 +456,6 @@
 cpu_mp_start(void)
 {
 	int i;
-	u_int threads_per_cache, p[4];
 
 	/* Initialize the logical ID to APIC ID table. */
 	for (i = 0; i < MAXCPU; i++) {
@@ -354,54 +491,9 @@
 	} else
 		KASSERT(boot_cpu_id == PCPU_GET(apic_id),
 		    ("BSP's APIC ID doesn't match boot_cpu_id"));
-	cpu_apic_ids[0] = boot_cpu_id;
-	apic_cpuids[boot_cpu_id] = 0;
 
-	/* Setup the initial logical CPUs info. */
-	logical_cpus = logical_cpus_mask = 0;
-	if (cpu_feature & CPUID_HTT)
-		logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
-
-	/*
-	 * Work out if hyperthreading is *really* enabled.  This
-	 * is made really ugly by the fact that processors lie: Dual
-	 * core processors claim to be hyperthreaded even when they're
-	 * not, presumably because they want to be treated the same
-	 * way as HTT with respect to per-cpu software licensing.
-	 * At the time of writing (May 12, 2005) the only hyperthreaded
-	 * cpus are from Intel, and Intel's dual-core processors can be
-	 * identified via the "deterministic cache parameters" cpuid
-	 * calls.
-	 */
-	/*
-	 * First determine if this is an Intel processor which claims
-	 * to have hyperthreading support.
-	 */
-	if ((cpu_feature & CPUID_HTT) && cpu_vendor_id == CPU_VENDOR_INTEL) {
-		/*
-		 * If the "deterministic cache parameters" cpuid calls
-		 * are available, use them.
-		 */
-		if (cpu_high >= 4) {
-			/* Ask the processor about the L1 cache. */
-			for (i = 0; i < 1; i++) {
-				cpuid_count(4, i, p);
-				threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1;
-				if (hyperthreading_cpus < threads_per_cache)
-					hyperthreading_cpus = threads_per_cache;
-				if ((p[0] & 0x1f) == 0)
-					break;
-			}
-		}
-
-		/*
-		 * If the deterministic cache parameters are not
-		 * available, or if no caches were reported to exist,
-		 * just accept what the HTT flag indicated.
-		 */
-		if (hyperthreading_cpus == 0)
-			hyperthreading_cpus = logical_cpus;
-	}
+	/* Probe logical/physical core configuration. */
+	topo_probe();
 
 	assign_cpu_ids();
 
@@ -418,28 +510,38 @@
 void
 cpu_mp_announce(void)
 {
-	int i, x;
 	const char *hyperthread;
+	int i;
 
-	/* List CPUs */
+	printf("FreeBSD/SMP: %d package(s) x %d core(s)",
+	    mp_ncpus / (cpu_cores * cpu_logical), cpu_cores);
+	if (hyperthreading_cpus > 1)
+	    printf(" x %d HTT threads", cpu_logical);
+	else if (cpu_logical > 1)
+	    printf(" x %d SMT threads", cpu_logical);
+	printf("\n");
+
+	/* List active CPUs first. */
 	printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id);
-	for (i = 1, x = 0; x <= MAX_APIC_ID; x++) {
-		if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp)
+	for (i = 1; i < mp_ncpus; i++) {
+		if (cpu_info[cpu_apic_ids[i]].cpu_hyperthread)
+			hyperthread = "/HT";
+		else
+			hyperthread = "";
+		printf(" cpu%d (AP%s): APIC ID: %2d\n", i, hyperthread,
+		    cpu_apic_ids[i]);
+	}
+
+	/* List disabled CPUs last. */
+	for (i = 0; i <= MAX_APIC_ID; i++) {
+		if (!cpu_info[i].cpu_present || !cpu_info[i].cpu_disabled)
 			continue;
-		if (cpu_info[x].cpu_hyperthread) {
+		if (cpu_info[i].cpu_hyperthread)
 			hyperthread = "/HT";
-		} else {
+		else
 			hyperthread = "";
-		}
-		if (cpu_info[x].cpu_disabled)
-			printf("  cpu (AP%s): APIC ID: %2d (disabled)\n",
-			    hyperthread, x);
-		else {
-			KASSERT(i < mp_ncpus,
-			    ("mp_ncpus and actual cpus are out of whack"));
-			printf(" cpu%d (AP%s): APIC ID: %2d\n", i++,
-			    hyperthread, x);
-		}
+		printf("  cpu (AP%s): APIC ID: %2d (disabled)\n", hyperthread,
+		    i);
 	}
 }
 
@@ -693,11 +795,19 @@
 
 	/*
 	 * Assign CPU IDs to local APIC IDs and disable any CPUs
-	 * beyond MAXCPU.  CPU 0 has already been assigned to the BSP,
-	 * so we only have to assign IDs for APs.
+	 * beyond MAXCPU.  CPU 0 is always assigned to the BSP.
+	 *
+	 * To minimize confusion for userland, we attempt to number
+	 * CPUs such that all threads and cores in a package are
+	 * grouped together.  For now we assume that the BSP is always
+	 * the first thread in a package and just start adding APs
+	 * starting with the BSP's APIC ID.
 	 */
 	mp_ncpus = 1;
-	for (i = 0; i <= MAX_APIC_ID; i++) {
+	cpu_apic_ids[0] = boot_cpu_id;
+	apic_cpuids[boot_cpu_id] = 0;
+	for (i = boot_cpu_id + 1; i != boot_cpu_id;
+	     i == MAX_APIC_ID ? i = 0 : i++) {
 		if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp ||
 		    cpu_info[i].cpu_disabled)
 			continue;
@@ -1015,6 +1125,15 @@
 		sched_preempt(curthread);
 
 	/* Nothing to do for AST */
+
+	if (ipi_bitmap & (1 << IPI_HARDCLOCK))
+		hardclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_STATCLOCK))
+		statclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_PROFCLOCK))
+		profclockintr(&frame);
 }
 
 /*

==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#24 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.523 2009/04/10 00:40:48 jfv Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.524 2009/05/01 17:20:16 sam Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -292,8 +292,10 @@
 device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
+device		rum		# Ralink Technology RT2501USB wireless NICs
+device		uath		# Atheros AR5523 wireless NICs
 device		ural		# Ralink Technology RT2500USB wireless NICs
-device		rum		# Ralink Technology RT2501USB wireless NICs
+device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
 # USB Serial devices
 device		uark		# Technologies ARK3116 based serial adapters

==== //depot/projects/usb/src/sys/amd64/include/apicvar.h#8 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.28 2009/03/17 00:48:11 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.29 2009/05/02 12:20:43 mav Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
@@ -126,7 +126,10 @@
 /* IPIs handled by IPI_BITMAPED_VECTOR  (XXX ups is there a better place?) */
 #define	IPI_AST		0 	/* Generate software trap. */
 #define IPI_PREEMPT     1
-#define IPI_BITMAP_LAST IPI_PREEMPT
+#define IPI_HARDCLOCK   2
+#define IPI_STATCLOCK   3
+#define IPI_PROFCLOCK   4
+#define IPI_BITMAP_LAST IPI_PROFCLOCK
 #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST)
 
 #define	IPI_STOP	(APIC_IPI_INTS + 7)	/* Stop CPU until restarted. */

==== //depot/projects/usb/src/sys/amd64/include/clock.h#7 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.61 2008/10/21 00:38:00 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.63 2009/05/03 17:47:21 mav Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -15,7 +15,6 @@
  * XXX large parts of the driver and its interface are misplaced.
  */
 extern int	clkintr_pending;
-extern int	statclock_disable;
 extern u_int	i8254_freq;
 extern int	i8254_max_count;
 extern uint64_t	tsc_freq;
@@ -24,6 +23,12 @@
 
 void	i8254_init(void);
 
+struct trapframe;
+
+int	hardclockintr(struct trapframe *frame);
+int	statclockintr(struct trapframe *frame);
+int	profclockintr(struct trapframe *frame);
+
 /*
  * Driver to clock driver interface.
  */

==== //depot/projects/usb/src/sys/amd64/include/smp.h#8 (text+ko) ====

@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD: src/sys/amd64/include/smp.h,v 1.94 2009/03/17 00:48:11 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/smp.h,v 1.95 2009/04/29 06:54:40 jeff Exp $
  *
  */
 
@@ -36,10 +36,6 @@
 extern struct pcb		stoppcbs[];
 extern int			cpu_apic_ids[];
 
-/* global data in identcpu.c */
-extern int			cpu_cores;
-extern int			cpu_logical;

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From hselasky at FreeBSD.org  Mon May  4 12:07:40 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Mon May  4 12:07:47 2009
Subject: PERFORCE change 161551 for review
Message-ID: <200905041207.n44C7XXQ040379@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161551

Change 161551 by hselasky@hselasky_laptop001 on 2009/05/04 12:06:46

	
	USB CORE + USB controller:
	
	Revert back some changes done by Andrew Thompson,
	due to unseen issues. More documentation has been
	added to prevent similar bugs in the future.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#14 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_device.h#18 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_revision.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#143 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#19 (text+ko) ====

@@ -1964,7 +1964,7 @@
 
 	usb2_pc_cpu_flush(qh->page_cache);
 
-	if (xfer->xroot->udev->state != USB_STATE_SUSPENDED) {
+	if (xfer->xroot->udev->flags.self_suspended == 0) {
 		EHCI_APPEND_QH(qh, *qh_last);
 	}
 }

==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#16 (text+ko) ====

@@ -1020,7 +1020,7 @@
 		 * writing the BLF and CLF bits:
 		 */
 
-		if (xfer->xroot->udev->state == USB_STATE_SUSPENDED) {
+		if (xfer->xroot->udev->flags.self_suspended) {
 			/* nothing to do */
 		} else if (xfer->pipe->methods == &ohci_device_bulk_methods) {
 			ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
@@ -1589,7 +1589,7 @@
 
 	ed->ed_headp = td->td_self;
 
-	if (xfer->xroot->udev->state != USB_STATE_SUSPENDED) {
+	if (xfer->xroot->udev->flags.self_suspended == 0) {
 		/* the append function will flush the endpoint descriptor */
 		OHCI_APPEND_QH(ed, *ed_last);
 

==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#13 (text+ko) ====

@@ -1921,7 +1921,7 @@
 	qh->e_next = td;
 	qh->qh_e_next = td->td_self;
 
-	if (xfer->xroot->udev->state != USB_STATE_SUSPENDED) {
+	if (xfer->xroot->udev->flags.self_suspended == 0) {
 		UHCI_APPEND_QH(qh, sc->sc_bulk_p_last);
 		uhci_add_loop(sc);
 		xfer->flags_int.bandwidth_reclaimed = 1;
@@ -1982,7 +1982,7 @@
 	 * NOTE: some devices choke on bandwidth- reclamation for control
 	 * transfers
 	 */
-	if (xfer->xroot->udev->state != USB_STATE_SUSPENDED) {
+	if (xfer->xroot->udev->flags.self_suspended == 0) {
 		if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
 			UHCI_APPEND_QH(qh, sc->sc_ls_ctl_p_last);
 		} else {
@@ -2071,11 +2071,9 @@
 	qh->e_next = td;
 	qh->qh_e_next = td->td_self;
 
-	if (xfer->xroot->udev->state != USB_STATE_SUSPENDED) {
-
+	if (xfer->xroot->udev->flags.self_suspended == 0) {
 		/* enter QHs into the controller data structures */
 		UHCI_APPEND_QH(qh, sc->sc_intr_p_last[xfer->qh_pos]);
-
 	} else {
 		usb2_pc_cpu_flush(qh->page_cache);
 	}

==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#14 (text+ko) ====

@@ -515,7 +515,7 @@
 /* prototypes */
 
 const char *usb2_errstr(usb2_error_t error);
-const char *usb2_statestr(enum usb_dev_state state);
+const char *usb2_statestr(enum usb2_dev_state state);
 struct usb2_config_descriptor *usb2_get_config_descriptor(
 	    struct usb2_device *udev);
 struct usb2_device_descriptor *usb2_get_device_descriptor(
@@ -553,6 +553,6 @@
 uint8_t	usb2_get_bus_index(struct usb2_device *udev);
 uint8_t	usb2_get_device_index(struct usb2_device *udev);
 void	usb2_set_power_mode(struct usb2_device *udev, uint8_t power_mode);
-int	usb2_device_attached(struct usb2_device *udev);
+uint8_t	usb2_device_attached(struct usb2_device *udev);
 
 #endif					/* _USB2_CORE_H_ */

==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#29 (text+ko) ====

@@ -96,15 +96,12 @@
 	[USB_STATE_POWERED]	= "POWERED",
 	[USB_STATE_ADDRESSED]	= "ADDRESSED",
 	[USB_STATE_CONFIGURED]	= "CONFIGURED",
-	[USB_STATE_SUSPENDED]	= "SUSPENDED"
 };
 
 const char *
-usb2_statestr(enum usb_dev_state state)
+usb2_statestr(enum usb2_dev_state state)
 {
-	KASSERT(state < USB_STATE_MAX, ("invalid udev state"));
-
-	return (statestr[state]);
+	return ((state < USB_STATE_MAX) ? statestr[state] : "UNKNOWN");
 }
 
 /*------------------------------------------------------------------------*
@@ -999,7 +996,7 @@
 		    udev->port_no, udev->address);
 
 		if (device_is_attached(dev)) {
-			if (udev->state == USB_STATE_SUSPENDED) {
+			if (udev->flags.peer_suspended) {
 				err = DEVICE_RESUME(dev);
 				if (err) {
 					device_printf(dev, "Resume failed!\n");
@@ -1139,7 +1136,7 @@
 		uaa->temp_dev = NULL;
 		device_set_ivars(iface->subdev, NULL);
 
-		if (udev->state == USB_STATE_SUSPENDED) {
+		if (udev->flags.peer_suspended) {
 			err = DEVICE_SUSPEND(iface->subdev);
 			if (err)
 				device_printf(iface->subdev, "Suspend failed\n");
@@ -1360,12 +1357,12 @@
 
 	USB_BUS_LOCK(udev->bus);
 	/* filter the suspend events */
-	if ((udev->state == USB_STATE_SUSPENDED && do_suspend) ||
-	    (udev->state != USB_STATE_SUSPENDED && !do_suspend)) {
+	if (udev->flags.peer_suspended == do_suspend) {
 		USB_BUS_UNLOCK(udev->bus);
 		/* nothing to do */
 		return (0);
 	}
+	udev->flags.peer_suspended = do_suspend;
 	USB_BUS_UNLOCK(udev->bus);
 
 	/* do the suspend or resume */
@@ -2466,7 +2463,7 @@
 }
 
 void
-usb2_set_device_state(struct usb2_device *udev, enum usb_dev_state state)
+usb2_set_device_state(struct usb2_device *udev, enum usb2_dev_state state)
 {
 
 	KASSERT(state < USB_STATE_MAX, ("invalid udev state"));
@@ -2476,7 +2473,7 @@
 	udev->state = state;
 }
 
-int
+uint8_t
 usb2_device_attached(struct usb2_device *udev)
 {
 	return (udev->state > USB_STATE_DETACHED);

==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#18 (text+ko) ====

@@ -89,6 +89,14 @@
 					 * strings */
 	uint8_t	remote_wakeup:1;	/* set if remote wakeup is enabled */
 	uint8_t	uq_bus_powered:1;	/* set if BUS powered quirk is present */
+
+	/*
+	 * NOTE: Although the flags below will reach the same value
+	 * over time, but the instant values may differ, and
+	 * consequently the flags cannot be merged into one!
+	 */
+	uint8_t peer_suspended:1;	/* set if peer is suspended */
+	uint8_t self_suspended:1;	/* set if self is suspended */
 };
 
 /*
@@ -139,7 +147,7 @@
 #endif
 	usb2_ticks_t plugtime;		/* copy of "ticks" */
 
-	enum usb_dev_state state;
+	enum usb2_dev_state state;
 	uint16_t refcount;
 #define	USB_DEV_REF_MAX 0xffff
 
@@ -207,6 +215,6 @@
 uint8_t	usb2_peer_can_wakeup(struct usb2_device *udev);
 struct usb2_pipe *usb2_pipe_foreach(struct usb2_device *udev, struct usb2_pipe *pipe);
 void	usb2_set_device_state(struct usb2_device *udev,
-	    enum usb_dev_state state);
+	    enum usb2_dev_state state);
 
 #endif					/* _USB2_DEVICE_H_ */

==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#13 (text+ko) ====

@@ -823,11 +823,7 @@
 	di->udi_speed = udev->speed;
 	di->udi_mode = udev->flags.usb2_mode;
 	di->udi_power_mode = udev->power_mode;
-	if (udev->state == USB_STATE_SUSPENDED) {
-		di->udi_suspended = 1;
-	} else {
-		di->udi_suspended = 0;
-	}
+	di->udi_suspended = udev->flags.peer_suspended;
 
 	hub = udev->parent_hub;
 	if (hub) {

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#16 (text+ko) ====

@@ -544,7 +544,8 @@
 	if (udev->depth > USB_HUB_MAX_DEPTH) {
 		return (USB_ERR_TOO_DEEP);
 	}
-	if (udev->state == USB_STATE_SUSPENDED) {
+
+	if (udev->flags.self_suspended) {
 		/* need to wait until the child signals resume */
 		DPRINTF("Device is suspended!\n");
 		return (0);
@@ -1518,7 +1519,7 @@
 		udev->pwr_save.write_refs += val;
 	}
 
-	if (udev->state == USB_STATE_SUSPENDED)
+	if (udev->flags.self_suspended)
 		needs_explore =
 		    (udev->pwr_save.write_refs != 0) ||
 		    ((udev->pwr_save.read_refs != 0) &&
@@ -1600,7 +1601,7 @@
 		    (rem_wakeup == 0))) {
 
 			/* check if we are suspended */
-			if (udev->state == USB_STATE_SUSPENDED) {
+			if (udev->flags.self_suspended != 0) {
 				USB_BUS_UNLOCK(bus);
 				usb2_dev_resume_peer(udev);
 				USB_BUS_LOCK(bus);
@@ -1608,7 +1609,7 @@
 		} else if (temp >= limit) {
 
 			/* check if we are not suspended */
-			if (udev->state != USB_STATE_SUSPENDED) {
+			if (udev->flags.self_suspended == 0) {
 				USB_BUS_UNLOCK(bus);
 				usb2_dev_suspend_peer(udev);
 				USB_BUS_LOCK(bus);
@@ -1647,7 +1648,7 @@
 		if (temp < mintime)
 			mintime = temp;
 
-		if (udev->state != USB_STATE_SUSPENDED) {
+		if (udev->flags.self_suspended == 0) {
 			type_refs[0] += udev->pwr_save.type_refs[0];
 			type_refs[1] += udev->pwr_save.type_refs[1];
 			type_refs[2] += udev->pwr_save.type_refs[2];
@@ -1697,7 +1698,7 @@
 		return;
 
 	/* check if already resumed */
-	if (udev->state != USB_STATE_SUSPENDED)
+	if (udev->flags.self_suspended == 0)
 		return;
 
 	/* we need a parent HUB to do resume */
@@ -1737,7 +1738,7 @@
 	}
 	USB_BUS_LOCK(bus);
 	/* set that this device is now resumed */
-	usb2_set_device_state(udev, USB_STATE_CONFIGURED);
+	udev->flags.self_suspended = 0;
 #if USB_HAVE_POWERD
 	/* make sure that we don't go into suspend right away */
 	udev->pwr_save.last_xfer_time = ticks;
@@ -1797,7 +1798,7 @@
 		return;
 
 	/* check if already suspended */
-	if (udev->state == USB_STATE_SUSPENDED)
+	if (udev->flags.self_suspended)
 		return;
 
 	/* we need a parent HUB to do suspend */
@@ -1819,7 +1820,7 @@
 			if (child == NULL)
 				continue;
 
-			if (child->state == USB_STATE_SUSPENDED)
+			if (child->flags.self_suspended)
 				continue;
 
 			DPRINTFN(1, "Port %u is busy on the HUB!\n", x + 1);
@@ -1846,7 +1847,7 @@
 	 * Set that this device is suspended. This variable must be set
 	 * before calling USB controller suspend callbacks.
 	 */
-	usb2_set_device_state(udev, USB_STATE_SUSPENDED);
+	udev->flags.self_suspended = 1;
 	USB_BUS_UNLOCK(udev->bus);
 
 	if (udev->bus->methods->device_suspend != NULL) {

==== //depot/projects/usb/src/sys/dev/usb/usb_revision.h#3 (text+ko) ====

@@ -28,9 +28,9 @@
 #define	_USB2_REVISION_H_
 
 /*
- * The "USB_SPEED" macro defines all the supported USB speeds.
+ * The "USB_SPEED" macros defines all the supported USB speeds.
  */
-enum {
+enum usb2_speed {
 	USB_SPEED_VARIABLE,
 	USB_SPEED_LOW,
 	USB_SPEED_FULL,
@@ -40,9 +40,9 @@
 };
 
 /*
- * The "USB_REV" macro defines all the supported USB revisions.
+ * The "USB_REV" macros defines all the supported USB revisions.
  */
-enum {
+enum usb2_revision {
 	USB_REV_UNKNOWN,
 	USB_REV_PRE_1_0,
 	USB_REV_1_0,
@@ -54,24 +54,23 @@
 };
 
 /*
- * The "USB_MODE" macro defines all the supported USB modes.
+ * The "USB_MODE" macros defines all the supported USB modes.
  */
-enum {
+enum usb2_mode {
 	USB_MODE_HOST,
 	USB_MODE_DEVICE,
 	USB_MODE_MAX
 };
 
 /*
- * The "USB_MODE" macro defines all the supported device states.
+ * The "USB_MODE" macros defines all the supported device states.
  */
-enum usb_dev_state {
+enum usb2_dev_state {
 	USB_STATE_DETACHED,
 	USB_STATE_ATTACHED,
 	USB_STATE_POWERED,
 	USB_STATE_ADDRESSED,
 	USB_STATE_CONFIGURED,
-	USB_STATE_SUSPENDED,
 	USB_STATE_MAX,
 };
 #endif					/* _USB2_REVISION_H_ */

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#143 (text+ko) ====

@@ -1376,14 +1376,6 @@
 	    xfer, xfer->pipe, xfer->nframes, USB_GET_DATA_ISREAD(xfer) ?
 	    "read" : "write");
 
-	/* Check if the device is still alive */
-	if (info->udev->state < USB_STATE_POWERED) {
-		USB_BUS_LOCK(bus);
-		usb2_transfer_done(xfer, USB_ERR_NOT_CONFIGURED);
-		USB_BUS_UNLOCK(bus);
-		return;
-	}
-
 #if USB_DEBUG
 	if (USB_DEBUG_VAR > 0) {
 		USB_BUS_LOCK(bus);
@@ -1444,8 +1436,15 @@
 	/* clear any previous errors */
 	xfer->error = 0;
 
+	/* Check if the device is still alive */
+	if (info->udev->state < USB_STATE_POWERED) {
+		USB_BUS_LOCK(bus);
+		usb2_transfer_done(xfer, USB_ERR_NOT_CONFIGURED);
+		USB_BUS_UNLOCK(bus);
+		return;
+	}
+
 	/* sanity check */
-
 	if (xfer->nframes == 0) {
 		if (xfer->flags.stall_pipe) {
 			/*
From hselasky at FreeBSD.org  Mon May  4 12:17:45 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Mon May  4 12:17:52 2009
Subject: PERFORCE change 161552 for review
Message-ID: <200905041217.n44CHitJ041168@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161552

Change 161552 by hselasky@hselasky_laptop001 on 2009/05/04 12:17:42

	
	USB: Remove USB shutdown methods because they race with
	the attach/detach/suspend/resume methods. Possibly we
	could detach the Host or Device controller at shutdown
	instead to have a similar effect.
	
	PR:		usb/133896

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#6 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#17 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#5 (text+ko) ====

@@ -173,7 +173,6 @@
 static device_probe_t aue_probe;
 static device_attach_t aue_attach;
 static device_detach_t aue_detach;
-static device_shutdown_t aue_shutdown;
 static miibus_readreg_t aue_miibus_readreg;
 static miibus_writereg_t aue_miibus_writereg;
 static miibus_statchg_t aue_miibus_statchg;
@@ -239,7 +238,6 @@
 	DEVMETHOD(device_probe, aue_probe),
 	DEVMETHOD(device_attach, aue_attach),
 	DEVMETHOD(device_detach, aue_detach),
-	DEVMETHOD(device_shutdown, aue_shutdown),
 
 	/* bus interface */
 	DEVMETHOD(bus_print_child, bus_generic_print_child),
@@ -1038,17 +1036,3 @@
 	aue_csr_write_1(sc, AUE_CTL1, 0);
 	aue_reset(sc);
 }
-
-/*
- * Stop all chip I/O so that the kernel's probe routines don't
- * get confused by errant DMAs when rebooting.
- */
-static int
-aue_shutdown(device_t dev)
-{
-	struct aue_softc *sc = device_get_softc(dev);
-
-	usb2_ether_ifshutdown(&sc->sc_ue);
-
-	return (0);
-}

==== //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#6 (text+ko) ====

@@ -151,7 +151,6 @@
 static device_probe_t axe_probe;
 static device_attach_t axe_attach;
 static device_detach_t axe_detach;
-static device_shutdown_t axe_shutdown;
 
 static usb2_callback_t axe_intr_callback;
 static usb2_callback_t axe_bulk_read_callback;
@@ -216,7 +215,6 @@
 	DEVMETHOD(device_probe, axe_probe),
 	DEVMETHOD(device_attach, axe_attach),
 	DEVMETHOD(device_detach, axe_detach),
-	DEVMETHOD(device_shutdown, axe_shutdown),
 
 	/* bus interface */
 	DEVMETHOD(bus_print_child, bus_generic_print_child),
@@ -1060,17 +1058,3 @@
 
 	axe_reset(sc);
 }
-
-/*
- * Stop all chip I/O so that the kernel's probe routines don't
- * get confused by errant DMAs when rebooting.
- */
-static int
-axe_shutdown(device_t dev)
-{
-	struct axe_softc *sc = device_get_softc(dev);
-
-	usb2_ether_ifshutdown(&sc->sc_ue);
-
-	return (0);
-}

==== //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#8 (text+ko) ====

@@ -67,7 +67,6 @@
 static device_probe_t cdce_probe;
 static device_attach_t cdce_attach;
 static device_detach_t cdce_detach;
-static device_shutdown_t cdce_shutdown;
 static device_suspend_t cdce_suspend;
 static device_resume_t cdce_resume;
 static usb_handle_request_t cdce_handle_request;
@@ -157,7 +156,6 @@
 	DEVMETHOD(device_detach, cdce_detach),
 	DEVMETHOD(device_suspend, cdce_suspend),
 	DEVMETHOD(device_resume, cdce_resume),
-	DEVMETHOD(device_shutdown, cdce_shutdown),
 
 	{0, 0}
 };
@@ -596,16 +594,6 @@
 }
 
 static int
-cdce_shutdown(device_t dev)
-{
-	struct cdce_softc *sc = device_get_softc(dev);
-
-	usb2_ether_ifshutdown(&sc->sc_ue);
-
-	return (0);
-}
-
-static int
 cdce_suspend(device_t dev)
 {
 	device_printf(dev, "Suspending\n");

==== //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#5 (text+ko) ====

@@ -86,7 +86,6 @@
 static device_probe_t cue_probe;
 static device_attach_t cue_attach;
 static device_detach_t cue_detach;
-static device_shutdown_t cue_shutdown;
 
 static usb2_callback_t cue_bulk_read_callback;
 static usb2_callback_t cue_bulk_write_callback;
@@ -142,7 +141,6 @@
 	DEVMETHOD(device_probe, cue_probe),
 	DEVMETHOD(device_attach, cue_attach),
 	DEVMETHOD(device_detach, cue_detach),
-	DEVMETHOD(device_shutdown, cue_shutdown),
 
 	{0, 0}
 };
@@ -629,17 +627,3 @@
 	cue_csr_write_1(sc, CUE_ETHCTL, 0);
 	cue_reset(sc);
 }
-
-/*
- * Stop all chip I/O so that the kernel's probe routines don't
- * get confused by errant DMAs when rebooting.
- */
-static int
-cue_shutdown(device_t dev)
-{
-	struct cue_softc *sc = device_get_softc(dev);
-
-	usb2_ether_ifshutdown(&sc->sc_ue);
-
-	return (0);
-}

==== //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#5 (text+ko) ====

@@ -129,7 +129,6 @@
 static device_probe_t kue_probe;
 static device_attach_t kue_attach;
 static device_detach_t kue_detach;
-static device_shutdown_t kue_shutdown;
 
 static usb2_callback_t kue_bulk_read_callback;
 static usb2_callback_t kue_bulk_write_callback;
@@ -185,7 +184,6 @@
 	DEVMETHOD(device_probe, kue_probe),
 	DEVMETHOD(device_attach, kue_attach),
 	DEVMETHOD(device_detach, kue_detach),
-	DEVMETHOD(device_shutdown, kue_shutdown),
 
 	{0, 0}
 };
@@ -688,17 +686,3 @@
 	usb2_transfer_stop(sc->sc_xfer[KUE_BULK_DT_WR]);
 	usb2_transfer_stop(sc->sc_xfer[KUE_BULK_DT_RD]);
 }
-
-/*
- * Stop all chip I/O so that the kernel's probe routines don't
- * get confused by errant DMAs when rebooting.
- */
-static int
-kue_shutdown(device_t dev)
-{
-	struct kue_softc *sc = device_get_softc(dev);
-
-	usb2_ether_ifshutdown(&sc->sc_ue);
-
-	return (0);
-}

==== //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#5 (text+ko) ====

@@ -105,7 +105,6 @@
 static device_probe_t rue_probe;
 static device_attach_t rue_attach;
 static device_detach_t rue_detach;
-static device_shutdown_t rue_shutdown;
 
 static miibus_readreg_t rue_miibus_readreg;
 static miibus_writereg_t rue_miibus_writereg;
@@ -172,7 +171,6 @@
 	DEVMETHOD(device_probe, rue_probe),
 	DEVMETHOD(device_attach, rue_attach),
 	DEVMETHOD(device_detach, rue_detach),
-	DEVMETHOD(device_shutdown, rue_shutdown),
 
 	/* Bus interface */
 	DEVMETHOD(bus_print_child, bus_generic_print_child),
@@ -897,17 +895,3 @@
 
 	rue_reset(sc);
 }
-
-/*
- * Stop all chip I/O so that the kernel's probe routines don't
- * get confused by errant DMAs when rebooting.
- */
-static int
-rue_shutdown(device_t dev)
-{
-	struct rue_softc *sc = device_get_softc(dev);
-
-	usb2_ether_ifshutdown(&sc->sc_ue);
-
-	return (0);
-}

==== //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#5 (text+ko) ====

@@ -69,7 +69,6 @@
 static device_probe_t udav_probe;
 static device_attach_t udav_attach;
 static device_detach_t udav_detach;
-static device_shutdown_t udav_shutdown;
 
 static usb2_callback_t udav_bulk_write_callback;
 static usb2_callback_t udav_bulk_read_callback;
@@ -132,7 +131,6 @@
 	DEVMETHOD(device_probe, udav_probe),
 	DEVMETHOD(device_attach, udav_attach),
 	DEVMETHOD(device_detach, udav_detach),
-	DEVMETHOD(device_shutdown, udav_shutdown),
 
 	/* bus interface */
 	DEVMETHOD(bus_print_child, bus_generic_print_child),
@@ -840,17 +838,3 @@
 {
 	/* nothing to do */
 }
-
-/*
- * Stop all chip I/O so that the kernel's probe routines don't
- * get confused by errant DMAs when rebooting.
- */
-static int
-udav_shutdown(device_t dev)
-{
-	struct udav_softc *sc = device_get_softc(dev);
-
-	usb2_ether_ifshutdown(&sc->sc_ue);
-
-	return (0);
-}

==== //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#3 (text+ko) ====

@@ -288,19 +288,6 @@
 	usb2_proc_free(&ue->ue_tq);
 }
 
-void
-usb2_ether_ifshutdown(struct usb2_ether *ue)
-{
-	struct ifnet *ifp = ue->ue_ifp;
-
-	UE_LOCK(ue);
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-		ue_queue_command(ue, ue_stop_task,
-		    &ue->ue_sync_task[0].hdr,
-		    &ue->ue_sync_task[1].hdr);
-	UE_UNLOCK(ue);
-}
-
 uint8_t
 usb2_ether_is_gone(struct usb2_ether *ue)
 {

==== //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#3 (text+ko) ====

@@ -118,6 +118,5 @@
 		    struct usb2_page_cache *, 
 		    unsigned int, unsigned int);
 void		usb2_ether_rxflush(struct usb2_ether *);
-void		usb2_ether_ifshutdown(struct usb2_ether *);
 uint8_t		usb2_ether_is_gone(struct usb2_ether *);
 #endif					/* _USB2_ETHERNET_H_ */

==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#11 (text+ko) ====

@@ -202,7 +202,6 @@
 static device_detach_t ustorage_fs_detach;
 static device_suspend_t ustorage_fs_suspend;
 static device_resume_t ustorage_fs_resume;
-static device_shutdown_t ustorage_fs_shutdown;
 static usb_handle_request_t ustorage_fs_handle_request;
 
 static usb2_callback_t ustorage_fs_t_bbb_command_callback;
@@ -239,7 +238,6 @@
 	DEVMETHOD(device_detach, ustorage_fs_detach),
 	DEVMETHOD(device_suspend, ustorage_fs_suspend),
 	DEVMETHOD(device_resume, ustorage_fs_resume),
-	DEVMETHOD(device_shutdown, ustorage_fs_shutdown),
 
 	{0, 0}
 };
@@ -437,12 +435,6 @@
 	return (0);			/* success */
 }
 
-static int
-ustorage_fs_shutdown(device_t dev)
-{
-	return (0);			/* success */
-}
-
 /*
  * Generic functions to handle transfers
  */

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#35 (text+ko) ====

@@ -59,7 +59,6 @@
 static device_detach_t usb_linux_detach;
 static device_suspend_t usb_linux_suspend;
 static device_resume_t usb_linux_resume;
-static device_shutdown_t usb_linux_shutdown;
 
 static usb2_callback_t usb_linux_isoc_callback;
 static usb2_callback_t usb_linux_non_isoc_callback;
@@ -92,7 +91,6 @@
 	DEVMETHOD(device_detach, usb_linux_detach),
 	DEVMETHOD(device_suspend, usb_linux_suspend),
 	DEVMETHOD(device_resume, usb_linux_resume),
-	DEVMETHOD(device_shutdown, usb_linux_shutdown),
 
 	{0, 0}
 };
@@ -360,23 +358,6 @@
 }
 
 /*------------------------------------------------------------------------*
- *	usb_linux_shutdown
- *
- * This function is the FreeBSD shutdown callback. Usually it does nothing.
- *------------------------------------------------------------------------*/
-static int
-usb_linux_shutdown(device_t dev)
-{
-	struct usb_linux_softc *sc = device_get_softc(dev);
-	struct usb_driver *udrv = usb_linux_get_usb_driver(sc);
-
-	if (udrv && udrv->shutdown) {
-		(udrv->shutdown) (sc->sc_ui);
-	}
-	return (0);
-}
-
-/*------------------------------------------------------------------------*
  * Linux emulation layer
  *------------------------------------------------------------------------*/
 

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#17 (text+ko) ====

@@ -132,7 +132,6 @@
 
 	DEVMETHOD(device_suspend, uhub_suspend),
 	DEVMETHOD(device_resume, uhub_resume),
-	DEVMETHOD(device_shutdown, bus_generic_shutdown),
 
 	DEVMETHOD(bus_child_location_str, uhub_child_location_string),
 	DEVMETHOD(bus_child_pnpinfo_str, uhub_child_pnpinfo_string),
From hselasky at FreeBSD.org  Mon May  4 12:26:54 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Mon May  4 12:27:06 2009
Subject: PERFORCE change 161554 for review
Message-ID: <200905041226.n44CQruq041944@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161554

Change 161554 by hselasky@hselasky_laptop001 on 2009/05/04 12:26:50

	
	USB controller:
	  - minor cleanup in USS820 driver

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#6 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#15 (text+ko) ====

@@ -230,11 +230,11 @@
 
 	/* select the correct endpoint */
 	bus_space_write_1(td->io_tag, td->io_hdl,
-	    td->ep_reg, td->ep_index);
+	    USS820_EPINDEX, td->ep_index);
 
 	/* read out FIFO status */
 	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_stat_reg);
+	    USS820_RXSTAT);
 
 	/* get pointer to softc */
 	sc = USS820_DCI_PC2SC(td->pc);
@@ -260,9 +260,9 @@
 
 	/* get the packet byte count */
 	count = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_count_low_reg);
+	    USS820_RXCNTL);
 	count |= (bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_count_high_reg) << 8);
+	    USS820_RXCNTH) << 8);
 	count &= 0x3FF;
 
 	/* verify data length */
@@ -278,11 +278,11 @@
 	}
 	/* receive data */
 	bus_space_read_multi_1(td->io_tag, td->io_hdl,
-	    td->rx_fifo_reg, (void *)&req, sizeof(req));
+	    USS820_RXDAT, (void *)&req, sizeof(req));
 
 	/* read out FIFO status */
 	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_stat_reg);
+	    USS820_RXSTAT);
 
 	if (rx_stat & (USS820_RXSTAT_EDOVW |
 	    USS820_RXSTAT_STOVW)) {
@@ -297,10 +297,10 @@
 
 	/* set RXFFRC bit */
 	temp = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_cntl_reg);
+	    USS820_RXCON);
 	temp |= USS820_RXCON_RXFFRC;
 	bus_space_write_1(td->io_tag, td->io_hdl,
-	    td->rx_cntl_reg, temp);
+	    USS820_RXCON, temp);
 
 	/* copy data into real buffer */
 	usb2_copy_in(td->pc, 0, &req, sizeof(req));
@@ -321,10 +321,10 @@
 
 	/* set RXFFRC bit */
 	temp = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_cntl_reg);
+	    USS820_RXCON);
 	temp |= USS820_RXCON_RXFFRC;
 	bus_space_write_1(td->io_tag, td->io_hdl,
-	    td->rx_cntl_reg, temp);
+	    USS820_RXCON, temp);
 
 	/* FALLTHROUGH */
 
@@ -365,16 +365,16 @@
 	got_short = 0;
 
 	/* select the correct endpoint */
-	bus_space_write_1(td->io_tag, td->io_hdl, td->ep_reg, td->ep_index);
+	bus_space_write_1(td->io_tag, td->io_hdl, USS820_EPINDEX, td->ep_index);
 
 	/* check if any of the FIFO banks have data */
 repeat:
 	/* read out FIFO flag */
 	rx_flag = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_flag_reg);
+	    USS820_RXFLG);
 	/* read out FIFO status */
 	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_stat_reg);
+	    USS820_RXSTAT);
 
 	DPRINTFN(5, "rx_stat=0x%02x rx_flag=0x%02x rem=%u\n",
 	    rx_stat, rx_flag, td->remainder);
@@ -419,10 +419,10 @@
 	}
 	/* get the packet byte count */
 	count = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_count_low_reg);
+	    USS820_RXCNTL);
 
 	count |= (bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_count_high_reg) << 8);
+	    USS820_RXCNTH) << 8);
 	count &= 0x3FF;
 
 	DPRINTFN(5, "count=0x%04x\n", count);
@@ -454,7 +454,7 @@
 		}
 		/* receive data */
 		bus_space_read_multi_1(td->io_tag, td->io_hdl,
-		    td->rx_fifo_reg, buf_res.buffer, buf_res.length);
+		    USS820_RXDAT, buf_res.buffer, buf_res.length);
 
 		/* update counters */
 		count -= buf_res.length;
@@ -464,10 +464,10 @@
 
 	/* set RXFFRC bit */
 	rx_cntl = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_cntl_reg);
+	    USS820_RXCON);
 	rx_cntl |= USS820_RXCON_RXFFRC;
 	bus_space_write_1(td->io_tag, td->io_hdl,
-	    td->rx_cntl_reg, rx_cntl);
+	    USS820_RXCON, rx_cntl);
 
 	/* check if we are complete */
 	if ((td->remainder == 0) || got_short) {
@@ -495,18 +495,18 @@
 
 	/* select the correct endpoint */
 	bus_space_write_1(td->io_tag, td->io_hdl,
-	    td->ep_reg, td->ep_index);
+	    USS820_EPINDEX, td->ep_index);
 
 	to = 2;				/* don't loop forever! */
 
 repeat:
 	/* read out TX FIFO flags */
 	tx_flag = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->tx_flag_reg);
+	    USS820_TXFLG);
 
 	/* read out RX FIFO status last */
 	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_stat_reg);
+	    USS820_RXSTAT);
 
 	DPRINTFN(5, "rx_stat=0x%02x tx_flag=0x%02x rem=%u\n",
 	    rx_stat, tx_flag, td->remainder);
@@ -553,7 +553,7 @@
 		}
 		/* transmit data */
 		bus_space_write_multi_1(td->io_tag, td->io_hdl,
-		    td->tx_fifo_reg, buf_res.buffer, buf_res.length);
+		    USS820_TXDAT, buf_res.buffer, buf_res.length);
 
 		/* update counters */
 		count -= buf_res.length;
@@ -563,11 +563,11 @@
 
 	/* post-write high packet byte count first */
 	bus_space_write_1(td->io_tag, td->io_hdl,
-	    td->tx_count_high_reg, count_copy >> 8);
+	    USS820_TXCNTH, count_copy >> 8);
 
 	/* post-write low packet byte count last */
 	bus_space_write_1(td->io_tag, td->io_hdl,
-	    td->tx_count_low_reg, count_copy);
+	    USS820_TXCNTL, count_copy);
 
 	/*
 	 * Enable TX output, which must happen after that we have written
@@ -600,15 +600,15 @@
 
 	/* select the correct endpoint */
 	bus_space_write_1(td->io_tag, td->io_hdl,
-	    td->ep_reg, td->ep_index);
+	    USS820_EPINDEX, td->ep_index);
 
 	/* read out TX FIFO flag */
 	tx_flag = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->tx_flag_reg);
+	    USS820_TXFLG);
 
 	/* read out RX FIFO status last */
 	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    td->rx_stat_reg);
+	    USS820_RXSTAT);
 
 	DPRINTFN(5, "rx_stat=0x%02x rem=%u\n", rx_stat, td->remainder);
 
@@ -2269,20 +2269,6 @@
 			td->io_tag = sc->sc_io_tag;
 			td->io_hdl = sc->sc_io_hdl;
 			td->max_packet_size = xfer->max_packet_size;
-			td->rx_stat_reg = USS820_GET_REG(sc, USS820_RXSTAT);
-			td->tx_stat_reg = USS820_GET_REG(sc, USS820_TXSTAT);
-			td->rx_flag_reg = USS820_GET_REG(sc, USS820_RXFLG);
-			td->tx_flag_reg = USS820_GET_REG(sc, USS820_TXFLG);
-			td->rx_fifo_reg = USS820_GET_REG(sc, USS820_RXDAT);
-			td->tx_fifo_reg = USS820_GET_REG(sc, USS820_TXDAT);
-			td->rx_count_low_reg = USS820_GET_REG(sc, USS820_RXCNTL);
-			td->rx_count_high_reg = USS820_GET_REG(sc, USS820_RXCNTH);
-			td->tx_count_low_reg = USS820_GET_REG(sc, USS820_TXCNTL);
-			td->tx_count_high_reg = USS820_GET_REG(sc, USS820_TXCNTH);
-			td->rx_cntl_reg = USS820_GET_REG(sc, USS820_RXCON);
-			td->tx_cntl_reg = USS820_GET_REG(sc, USS820_TXCON);
-			td->pend_reg = USS820_GET_REG(sc, USS820_PEND);
-			td->ep_reg = USS820_GET_REG(sc, USS820_EPINDEX);
 			td->ep_index = ep_no;
 			if (pf->support_multi_buffer &&
 			    (parm->methods != &uss820dci_device_ctrl_methods)) {

==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#6 (text+ko) ====

@@ -255,16 +255,11 @@
 #define	USS820_UNK1 0x1f		/* Unknown */
 #define	USS820_UNK1_UNKNOWN 0xFF
 
-#define	USS820_GET_REG(sc,reg) \
-  ((reg) << (sc)->sc_reg_shift)
-
 #define	USS820_READ_1(sc, reg) \
-  bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \
-    USS820_GET_REG(sc,reg))
+  bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg)
 
 #define	USS820_WRITE_1(sc, reg, data)	\
-  bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \
-    USS820_GET_REG(sc,reg), data)
+  bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, data)
 
 struct uss820dci_td;
 
@@ -279,20 +274,6 @@
 	uint32_t offset;
 	uint32_t remainder;
 	uint16_t max_packet_size;
-	uint8_t	rx_stat_reg;
-	uint8_t	tx_stat_reg;
-	uint8_t	rx_flag_reg;
-	uint8_t	tx_flag_reg;
-	uint8_t	rx_fifo_reg;
-	uint8_t	tx_fifo_reg;
-	uint8_t	rx_count_low_reg;
-	uint8_t	rx_count_high_reg;
-	uint8_t	tx_count_low_reg;
-	uint8_t	tx_count_high_reg;
-	uint8_t	rx_cntl_reg;
-	uint8_t	tx_cntl_reg;
-	uint8_t	ep_reg;
-	uint8_t	pend_reg;
 	uint8_t	ep_index;
 	uint8_t	error:1;
 	uint8_t	alt_next:1;
@@ -356,7 +337,6 @@
 	uint8_t	sc_rt_addr;		/* root HUB address */
 	uint8_t	sc_dv_addr;		/* device address */
 	uint8_t	sc_conf;		/* root HUB config */
-	uint8_t	sc_reg_shift;
 
 	uint8_t	sc_hub_idata[1];
 

==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#6 (text+ko) ====

@@ -152,9 +152,6 @@
 	sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
 	sc->sc_io_size = rman_get_size(sc->sc_io_res);
 
-	/* multiply all addresses by 4 */
-	sc->sc_reg_shift = 2;
-
 	rid = 0;
 	sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
From hselasky at FreeBSD.org  Mon May  4 12:28:57 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Mon May  4 12:29:03 2009
Subject: PERFORCE change 161556 for review
Message-ID: <200905041228.n44CStEH042107@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161556

Change 161556 by hselasky@hselasky_laptop001 on 2009/05/04 12:28:38

	
	USB CORE:
	  - Properly parenthesis pointer argument used inside macro.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#15 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#15 (text+ko) ====

@@ -234,8 +234,8 @@
  * receiving or transferring data.
  */
 #define	USB_GET_DATA_ISREAD(xfer) (((xfer)->flags_int.usb2_mode == \
-	USB_MODE_DEVICE) ? ((xfer->endpoint & UE_DIR_IN) ? 0 : 1) : \
-	((xfer->endpoint & UE_DIR_IN) ? 1 : 0))
+	USB_MODE_DEVICE) ? (((xfer)->endpoint & UE_DIR_IN) ? 0 : 1) : \
+	(((xfer)->endpoint & UE_DIR_IN) ? 1 : 0))
 
 /*
  * The following macros are used used to convert milliseconds into
From jhb at freebsd.org  Mon May  4 19:22:26 2009
From: jhb at freebsd.org (John Baldwin)
Date: Mon May  4 19:22:55 2009
Subject: PERFORCE change 161116 for review
In-Reply-To: <200904261736.n3QHaXBY055044@repoman.freebsd.org>
References: <200904261736.n3QHaXBY055044@repoman.freebsd.org>
Message-ID: <200905041112.58901.jhb@freebsd.org>

On Sunday 26 April 2009 1:36:33 pm Marko Zec wrote:
> http://perforce.freebsd.org/chv.cgi?CH=161116
> 
> Change 161116 by zec@zec_amdx2 on 2009/04/26 17:36:10
> 
> 	Access from userland to igmpstat is provided via a sysctl
> 	(which is already V_irtualized).  Hence, there's no need
> 	for kmem / kldsym kludges, so vnet_igmp_symmap can go away.
> 	If not, it should be added to vnet_inet_symmap, because
> 	struct vnet_igmp doesn't exist anyway.
> 	
> 	XXX why was igi_head ever put in vnet_iugmp_symmap?

netstat on crash dumps still uses kmem (and _please_ do not break netstat on 
crash dumps).

-- 
John Baldwin
From hselasky at FreeBSD.org  Mon May  4 19:58:50 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Mon May  4 19:58:57 2009
Subject: PERFORCE change 161578 for review
Message-ID: <200905041958.n44JwlHW007595@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161578

Change 161578 by hselasky@hselasky_laptop001 on 2009/05/04 19:58:29

	
	USB storage:
	  - Remove printout which was also printed when
	    the USB device was not of mass storage kind.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#14 (text+ko) ====

@@ -1406,10 +1406,9 @@
 
 default_proto:
 	ret.proto = umass_get_proto(uaa->iface);
-	if (ret.proto == 0) {
-		device_printf(dev, "Unsupported protocol.\n");
+	if (ret.proto == 0)
 		ret.error = ENXIO;
-	} else
+	else
 		ret.error = 0;
 done:
 	return (ret);
From rene at FreeBSD.org  Mon May  4 22:52:46 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Mon May  4 22:52:52 2009
Subject: PERFORCE change 161587 for review
Message-ID: <200905042252.n44MqioX035405@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161587

Change 161587 by rene@rene_self on 2009/05/04 22:52:03

	Some attempts to build the web site.
	Currently does not build because the nl source mismatches the en source.

Affected files ...

.. //depot/projects/docproj_nl/www/Makefile#1 add
.. //depot/projects/docproj_nl/www/Makefile.inc#1 add
.. //depot/projects/docproj_nl/www/nl/Makefile#2 edit
.. //depot/projects/docproj_nl/www/nl/events/includes.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/gnome/includes.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/includes.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/news/includes.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/news/status/includes.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/platforms/ia64/includes.xsl#2 delete

Differences ...

==== //depot/projects/docproj_nl/www/nl/Makefile#2 (text+ko) ====

@@ -1,4 +1,7 @@
 # $FreeBSD: www/nl/Makefile,v 1.1 2004/09/27 12:00:03 josef Exp $
+# %SOURCE%	www/en/Makefile
+# %SRCID%	1.146
+
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
@@ -6,10 +9,98 @@
 .include "../Makefile.inc"
 .endif
 
+# These are turned into validated, normalized HTML files.
+
+DOCS=  about.sgml
+DOCS+= administration.sgml
+DOCS+= applications.sgml
+DOCS+= art.sgml
+DOCS+= availability.sgml
+DOCS+= docs.sgml
+DOCS+= features.sgml
+DOCS+= internet.sgml
+DOCS+= logo.sgml
+DOCS+= mailto.sgml
+DOCS+= publish.sgml
+DOCS+= relnotes.sgml
+DOCS+= send-pr.sgml
+DOCS+= support.sgml
+DOCS+= where.sgml
+DOCS+= y2kbug.sgml
+
+XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
+DEPENDSET.index=transtable mirrors news press events \
+		advisories notices
+
+XMLDOCS+=	usergroups:${XSL_USERGROUPS}:${XML_USERGROUPS}:
+DEPENDSET.usergroups=transtable usergroups
+PARAMS.usergroups=	--param pagename "'FreeBSD User Groups'"
+
+XMLDOCS+=	community::${XML_EVENTS_EVENTS}:
+DEPENDSET.community=usergroups events
+
+# These will be directly installed.
+
+DATA=	favicon.ico
+DATA+=	freebsd.css
+DATA+=	index.css
+DATA+=	robots.txt
+DATA+=	vendors.html
+
 # Subdirectories
 # SGML
+SUBDIR= FAQ
+SUBDIR+= advocacy
+SUBDIR+= commercial
+SUBDIR+= community
+SUBDIR+= copyright
+SUBDIR+= developers
+SUBDIR+= docproj
+SUBDIR+= docs
+SUBDIR+= donations
+SUBDIR+= events
+SUBDIR+= gnome
+SUBDIR+= handbook
+SUBDIR+= internal
+SUBDIR+= java
+SUBDIR+= kse
+SUBDIR+= marketing
+SUBDIR+= multimedia
+SUBDIR+= news
+SUBDIR+= platforms
+SUBDIR+= portmgr
+SUBDIR+= projects
+SUBDIR+= prstats
+SUBDIR+= releases
+SUBDIR+= releng
+SUBDIR+= search
+SUBDIR+= security
+SUBDIR+= smp
+SUBDIR+= snapshots
+SUBDIR+= support
+SUBDIR+= tutorials
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
-SUBDIR=  doc
+SUBDIR+= doc
+SUBDIR+= ports
+.endif
+.if defined(BUILD_RELNOTES)
+SUBDIR+= relnotes
+.endif
+
+# Non-SGML
+SUBDIR+= cgi
+SUBDIR+= gifs
+SUBDIR+= layout
+SUBDIR+= logo
+
+WEB_LANG?=	da de el es fr hu it ja mn nl pt_BR ru zh_CN zh_TW
+
+# Non-English
+
+.if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
+.for DIR in ${WEB_LANG}
+SUBDIR+=	../${DIR}
+.endfor
 .endif
 
 WEBDIR?=	data/nl
From sson at FreeBSD.org  Tue May  5 01:40:39 2009
From: sson at FreeBSD.org (Stacey Son)
Date: Tue May  5 01:40:45 2009
Subject: PERFORCE change 161590 for review
Message-ID: <200905050140.n451ecQo061560@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161590

Change 161590 by sson@sson_amd64 on 2009/05/05 01:40:11

	Add IPv6 support for au_to_me().	
	
	Fixes a bug when the terminal ID has an IPv6 address type.  au_to_me()
	now calls getaudit_addr(2) first.  If it fails with ENOSYS it falls
	back to calling getaudit(2) to support legacy systems.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#92 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#92 (text+ko) ====

@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#91 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#92 $
  */
 
 #include 
@@ -1270,12 +1270,27 @@
 au_to_me(void)
 {
 	auditinfo_t auinfo;
+	auditinfo_addr_t aia;
 
-	if (getaudit(&auinfo) != 0)
-		return (NULL);
+	/*
+	 * Try to use getaudit_addr(2) first.  If this kernel does not support
+	 * it, then fall back on to getaudit(2).
+	 */
+	if (getaudit_addr(&aia, sizeof(aia)) != 0) {
+		if (errno == ENOSYS) {
+			if (getaudit(&auinfo) != 0)
+				return (NULL);
+			return (au_to_subject32(auinfo.ai_auid, geteuid(),
+				getegid(), getuid(), getgid(), getpid(),
+				auinfo.ai_asid, &auinfo.ai_termid));
+		} else {
+			/* getaudit_addr(2) failed for some other reason. */
+			return (NULL); 
+		}
+	} 
 
-	return (au_to_subject32(auinfo.ai_auid, geteuid(), getegid(),
-	    getuid(), getgid(), getpid(), auinfo.ai_asid, &auinfo.ai_termid));
+	return (au_to_subject32_ex(aia.ai_auid, geteuid(), getegid(), getuid(),
+		getgid(), getpid(), aia.ai_asid, &aia.ai_termid));
 }
 #endif
 
From sson at FreeBSD.org  Tue May  5 02:07:06 2009
From: sson at FreeBSD.org (Stacey Son)
Date: Tue May  5 02:07:12 2009
Subject: PERFORCE change 161591 for review
Message-ID: <200905050207.n45275qq064523@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161591

Change 161591 by sson@sson_amd64 on 2009/05/05 02:06:27

	Align the ai_flags field on a 64-bit boundary 
	so the auditinfo_addr and auditpinfo_addr structures
	are the same size on 32- and 64-bit architectures.	

Affected files ...

.. //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#10 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#10 (text+ko) ====

@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#9 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#10 $
  */
 
 #ifndef	_BSM_AUDIT_H
@@ -172,6 +172,7 @@
 typedef	u_int16_t	au_event_t;
 typedef	u_int16_t	au_emod_t;
 typedef	u_int32_t	au_class_t;
+typedef	u_int64_t	au_asflgs_t __attribute__ ((aligned (8)));
 
 struct au_tid {
 	dev_t		port;
@@ -205,7 +206,7 @@
 	au_mask_t	ai_mask;	/* Audit masks. */
 	au_tid_addr_t	ai_termid;	/* Terminal ID. */
 	au_asid_t	ai_asid;	/* Audit session ID. */
-	u_int64_t	ai_flags;	/* Audit session flags. */
+	au_asflgs_t	ai_flags;	/* Audit session flags. */
 };
 typedef	struct auditinfo_addr	auditinfo_addr_t;
 
@@ -224,7 +225,7 @@
 	au_mask_t	ap_mask;	/* Audit masks. */
 	au_tid_addr_t	ap_termid;	/* Terminal ID. */
 	au_asid_t	ap_asid;	/* Audit session ID. */
-	u_int64_t	ap_flags;	/* Audit session flags. */
+	au_asflgs_t	ap_flags;	/* Audit session flags. */
 };
 typedef	struct auditpinfo_addr	auditpinfo_addr_t;
 
From andre at FreeBSD.org  Tue May  5 07:25:29 2009
From: andre at FreeBSD.org (Andre Oppermann)
Date: Tue May  5 07:25:35 2009
Subject: PERFORCE change 161596 for review
Message-ID: <200905050725.n457PR7o003321@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161596

Change 161596 by andre@andre_t61 on 2009/05/05 07:25:27

	Update comments.

Affected files ...

.. //depot/projects/tcp_new/netinet/tcp_cc_newreno.c#3 edit

Differences ...

==== //depot/projects/tcp_new/netinet/tcp_cc_newreno.c#3 (text+ko) ====

@@ -93,6 +93,7 @@
 	 *   avoid capping cwnd.
 	 *
 	 * NB: Make sure to lower bound cwnd to one (two?) segments.
+	 * XXXAO: Upper bound to link-speed to avoid CWND overshooting.
 	 */
 	if (tp->snd_cwnd > tp->snd_ssthresh) {
 		/* Congestion avoidance */
@@ -150,14 +151,14 @@
 newreno_post_lr(struct tcpcb *tp, struct tcphdr *th)
 {
 	/*
-	* Out of fast recovery.
-	* Window inflation should have left us
-	* with approximately snd_ssthresh
-	* outstanding data.
-	* But in case we would be inclined to
-	* send a burst, better to do it via
-	* the slow start mechanism.
-	*/
+	 * Out of fast recovery.
+	 * Window inflation should have left us
+	 * with approximately snd_ssthresh
+	 * outstanding data.
+	 * But in case we would be inclined to
+	 * send a burst, better to do it via
+	 * the slow start mechanism.
+	 */
 	if (th && SEQ_GT(th->th_ack + tp->snd_ssthresh, tp->snd_nxt))
 		tp->snd_cwnd = tp->snd_nxt - th->th_ack + tp->snd_mss;
 	else
From andre at FreeBSD.org  Tue May  5 07:31:39 2009
From: andre at FreeBSD.org (Andre Oppermann)
Date: Tue May  5 07:31:45 2009
Subject: PERFORCE change 161597 for review
Message-ID: <200905050731.n457VYxi003753@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161597

Change 161597 by andre@andre_t61 on 2009/05/05 07:31:23

	Extend duplicate ACK detection.

Affected files ...

.. //depot/projects/tcp_new/netinet/tcp_input.c#10 edit

Differences ...

==== //depot/projects/tcp_new/netinet/tcp_input.c#10 (text+ko) ====

@@ -2941,10 +2941,11 @@
 	 * XXXAO: This is not entirely correct as it allows for other
 	 * packets between the duplicate ACKs.
 	 */
-	if (sacked > 0 ||
-	    (tlen == 0 && acked == 0 && SEQ_LT(tp->snd_una, tp->snd_nxt) && tp->snd_wnd == tiwin))
-		tp->snd_dupack += 1;
-	else if (acked > 0 && tp->snd_dupack > 0)
+	if ((sacked > 0 && th->th_ack == tp->snd_una) ||
+	    (tlen == 0 && acked == 0 && SEQ_LT(tp->snd_una, tp->snd_nxt) &&
+	     th->th_ack == tp->snd_una && tp->snd_wnd == tiwin))
+		tp->snd_dupack++;
+	else if (tp->snd_dupack > 0 && (acked > 0 || SEQ_GT(th->th_seq, tp->snd_una)))
 		tp->snd_dupack = 0;
 
 	KASSERT(SEQ_LT(tp->snd_una, tp->snd_nxt) || tp->snd_dupack == 0,
@@ -2953,14 +2954,20 @@
 	/*
 	 * Advance the unacknowledged pointer.
 	 */
-	tp->snd_una += acked;
+	if (acked > 0)
+		tp->snd_una += acked;
+
+	KASSERT(tp->snd_una == tp->snd_nxt || tcp_timer_active(TT_RXMIT),
+	    ("%s: outstanding data but RXMIT timer not active", __func__));
 
 	/*
 	 * Stop the retransmit timer if all data we sent has been
-	 * acknowledged.  Otherwise restart it if we still have
+	 * acknowledged.  Otherwise move it forward if we still have
 	 * outstanding data.
+	 *
+	 * XXXAO: Handle backoff on multiple retransmits.
 	 */
-	if (tp->snd_una == tp->snd_nxt)
+	if (acked > 0 && tp->snd_una == tp->snd_nxt)
 		tcp_timer_activate(TT_RXMIT, 0);
 	else if (acked > 0)
 		tcp_timer_activate(TT_RXMIT, tp->snd_rto);
From andre at FreeBSD.org  Tue May  5 07:32:36 2009
From: andre at FreeBSD.org (Andre Oppermann)
Date: Tue May  5 07:32:42 2009
Subject: PERFORCE change 161598 for review
Message-ID: <200905050732.n457WZ7p003818@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161598

Change 161598 by andre@andre_t61 on 2009/05/05 07:32:16

	Various WIP.

Affected files ...

.. //depot/projects/tcp_new/netinet/tcp_output.c#7 edit

Differences ...

==== //depot/projects/tcp_new/netinet/tcp_output.c#7 (text+ko) ====

@@ -200,7 +200,7 @@
 	 *
 	 * duna = unacknowledged data in flight
 	 * swnd = remaining space in send window as advertised by remote end
-	 * cwnd = congestion window, remaing amount of data that can be unacknowledged in flight
+	 * cwnd = congestion window, remaing amount of data that can be in flight unacknowledged
 	 * dlen = remaing amount of data in send buffer available for sending
 	 * len = amount of data we have *and* can send righ now
 	 *
@@ -218,14 +218,25 @@
 	dlen = so->so_snd.sb_cc - duna;
 	len = min(dlen, min(swnd, cwnd));
 
+	/*
+	 * XXXAO: todo token bucket, mss sized
+	 * Retransmits should not fall under pacing limit
+	 * and neither ACKs, window updates, etc. if there
+	 * is no data pending.
+	 */
 	if (len > 0 && (tp->t_flags & TF_PACE)) {
-		len = tcp_snd_pace(tp, len);	/* XXXAO: todo token bucket, mss sized */
+		len = tcp_snd_pace(tp, len);
 		if (len == 0)
 			return (0);		/* next token is pending */
 	}
 
 	inflight = duna - tp->snd_sacked;
 
+	switch (tp->t_phase) {
+	case TP_IDLE:
+		break;
+	}
+
 	/*
 	 * Send out a SYN immediatly.
 	 */
@@ -248,7 +259,7 @@
 		 * if the window is big enough.  Do not care about nagle
 		 * and others.  Otherwise things will go their normal way.
 		 */
-		if (len > 0)
+		if (len <= dlen)
 			goto send;
 	}
 
@@ -259,6 +270,7 @@
 		goto send;
 	if (SEQ_LT(tp->snd_lastack, tp->snd_nxt) && !(tp->t_flags & TF_DELACK))
 		goto send;
+
 	/*
 	 * For a duplicate ACK to be acceptable it must not carry any
 	 * data nor update the window.  This is a serious problem for
@@ -268,9 +280,9 @@
 	 * a duplicate ACK (if the ack value didn't move forward).  The
 	 * question whether the other implementations see it the same way.
 	 */
-	if ((tp->t_flags & TF_DUPACK) && tp->snd_dupack > 0 &&
-	    (tp->t_flags & TF_SACK_PERMIT)) {
-		len = 0;
+	if ((tp->t_flags & TF_DUPACK) && tp->snd_dupack > 0) {
+		if (!(tp->t_flags & TF_SACK_PERMIT))
+			len = 0;
 		goto send;
 	}
 
@@ -431,81 +443,13 @@
 	return (0);
 
 send:
-	SOCKBUF_LOCK(&so->so_snd);
+	tcp_options(tp, &to, flags);
+	return (tcp_send(tp, &to, flags));
+}
 
-	/*
-	 * Compute options for segment.
-	 * We only have to care about SYN and established connection
-	 * segments.  Options for SYN-ACK segments are handled in TCP
-	 * syncache. Before ESTABLISHED, force sending of initial options
-	 * unless TCP set not to do any options.
-	 */
-	to.to_flags = 0;
-	if (!(tp->t_flags & TF_NOOPT)) {
-		/*
-		 * Maximum segment size.
-		 */
-		if (flags & TH_SYN) {
-			to.to_mss = tcp_mss(&inp->inp_inc, 0, 0);
-			to.to_flags |= TOF_MSS;
-		}
-
-		/*
-		 * Window scaling.
-		 */
-		if ((flags & TH_SYN) && (tp->t_flags & TF_WINSCALE)) {
-			to.to_wscale = tp->rcv_scale;
-			to.to_flags |= TOF_SCALE;
-		}
-
-		/*
-		 * Timestamps.
-		 */
-		if (tp->t_flags & TF_TIMESTAMP) {
-			to.to_tsval = ticks + tp->ts_offset;
-			to.to_tsecr = tp->ts_recent;
-			to.to_flags |= TOF_TS;
-			/*
-			 * Set receive buffer autosizing timestamp.
-			 */
-			if (tp->rfbuf_ts == 0 &&
-			    (so->so_rcv.sb_flags & SB_AUTOSIZE))
-				tp->rfbuf_ts = ticks;
-		}
-
-		/*
-		 * Selective ACK's.
-		 */
-		if (tp->t_flags & TF_SACK_PERMIT) {
-			if (flags & TH_SYN)
-				to.to_flags |= TOF_SACKPERM;
-			else if (TCPS_HAVEESTABLISHED(tp->t_state) &&
-			    tp->rcv_numsacks > 0) {
-				to.to_flags |= TOF_SACK;
-				to.to_nsacks = tp->rcv_numsacks;
-				to.to_sacks = (u_char *)tp->sackblks;
-			}
-		}
-
-		/*
-		 * TCP-MD5 (RFC2385).
-		 */
-#ifdef TCP_SIGNATURE
-#ifdef INET6
-		if (!isipv6 && (tp->t_flags & TF_SIGNATURE)) {
-#else
-		if (tp->t_flags & TF_SIGNATURE) {
-#endif /* INET6 */
-			to.to_flags |= TOF_SIGNATURE;
-		}
-#endif /* TCP_SIGNATURE */
-
-		/*
-		 * Processing the options.
-		 */
-		optlen = tcp_addoptions(&to, (u_char *)&opt);
-	} else
-		optlen = 0;
+int
+tcp_send(struct tcpcb *tp, struct tcpopt *to, int flags)
+{
 
 	/*
 	 * Be careful not to send data and/or FIN on SYN segments.
@@ -535,6 +479,7 @@
 	else
 		th->th_win = (u_short)(rwin >> tp->rcv_scale);
 
+	SOCKBUF_LOCK(&so->so_snd);
 	/*
 	 * Fill in fields.
 	 */
@@ -547,7 +492,7 @@
 	}
 
 	/*
-	 * If resending a SYN or FIN, be sure not to use a new sequence number.
+	 * If resending a SYN or FIN, be sure NOT to use a new sequence number.
 	 */
 	if ((flags & TH_SYN) && (tp->t_flags & TF_SENTSYN))
 		th->th_seq--;
@@ -598,6 +543,18 @@
 		}
 
 		/*
+		 * Update last send timestamp.
+		 */
+		if ((tp->t_flags & TF_TIMESTAMP) && tp->snd_tslast != to->to_tsval)
+			tp->snd_tslast = to->to_tsval;
+
+		/*
+		 * Last ACK we sent.
+		 */
+		if (tp->snd_lastack != th->th_ack)
+			tp->snd_lastack = th->th_ack;
+
+		/*
 		 * Any pending ACK has been sent.
 		 * Clear related flags and disarm the delayed ACK timer.
 		 */
@@ -808,6 +765,7 @@
     int off, int *olen, int optlen)
 {
 	int len, slen, hdrs, hdrlen, linkhdr, optlen, ipoptlen;
+	int error = 0;
 	struct tcphdr *th;
 	struct ip *ip;
 	struct inpcb *inp = tp->t_inpcb;
@@ -997,18 +955,12 @@
 		    ("%s: data beyond FIN", __func__);
 
 		/*
-		 * Set the PUSH bit to indicate that we have reached
-		 * the end of the send buffer.
-		 */
-		if (off + slen == so->so_snd.sb_cc) {
-			th->th_flags =| TH_PSH;
-		}
-
-		/*
 		 * If we're sending everything we've got, set PUSH.
 		 * This will keep happy those implementations which
 		 * only give data to the user when a buffer fills or
 		 * a PUSH comes in.
+		 * Set the PUSH bit to indicate that we have reached
+		 * the end of the send buffer.
 		 */
 		if (slen > 0 && off + slen == so->so_snd.sb_cc)
 			th->th_flags |= TH_PUSH;
@@ -1201,6 +1153,84 @@
 	return;
 }
 
+void
+tcp_options(struct tcpcb *tp, struct tcpopt *to, int flags)
+{
+	/*
+	 * Compute options for segment.
+	 * We only have to care about SYN and established connection
+	 * segments.  Options for SYN-ACK segments are handled in TCP
+	 * syncache. Before ESTABLISHED, force sending of initial options
+	 * unless TCP set not to do any options.
+	 */
+	to.to_flags = 0;
+	if (!(tp->t_flags & TF_NOOPT)) {
+		/*
+		 * Maximum segment size.
+		 */
+		if (flags & TH_SYN) {
+			to.to_mss = tcp_mss(&inp->inp_inc, 0, 0);
+			to.to_flags |= TOF_MSS;
+		}
+
+		/*
+		 * Window scaling.
+		 */
+		if ((flags & TH_SYN) && (tp->t_flags & TF_WINSCALE)) {
+			to.to_wscale = tp->rcv_scale;
+			to.to_flags |= TOF_SCALE;
+		}
+
+		/*
+		 * Timestamps.
+		 */
+		if (tp->t_flags & TF_TIMESTAMP) {
+			to.to_tsval = ticks + tp->ts_offset;
+			to.to_tsecr = tp->ts_recent;
+			to.to_flags |= TOF_TS;
+			/*
+			 * Set receive buffer autosizing timestamp.
+			 */
+			if (tp->rfbuf_ts == 0 &&
+			    (so->so_rcv.sb_flags & SB_AUTOSIZE))
+				tp->rfbuf_ts = ticks;
+		}
+
+		/*
+		 * Selective ACK's.
+		 */
+		if (tp->t_flags & TF_SACK_PERMIT) {
+			if (flags & TH_SYN)
+				to.to_flags |= TOF_SACKPERM;
+			else if (TCPS_HAVEESTABLISHED(tp->t_state) &&
+			    tp->rcv_numsacks > 0) {
+				to.to_flags |= TOF_SACK;
+				to.to_nsacks = tp->rcv_numsacks;
+				to.to_sacks = (u_char *)tp->sackblks;
+			}
+		}
+
+		/*
+		 * TCP-MD5 (RFC2385).
+		 */
+#ifdef TCP_SIGNATURE
+#ifdef INET6
+		if (!isipv6 && (tp->t_flags & TF_SIGNATURE)) {
+#else
+		if (tp->t_flags & TF_SIGNATURE) {
+#endif /* INET6 */
+			to.to_flags |= TOF_SIGNATURE;
+		}
+#endif /* TCP_SIGNATURE */
+
+		/*
+		 * Processing the options.
+		 */
+		optlen = tcp_addoptions(&to, (u_char *)&opt);
+	} else
+		optlen = 0;
+}
+
 static void
 tcp_snd_autoscale(struct tcpcb *tp, int swnd)
 {
From andre at FreeBSD.org  Tue May  5 07:33:38 2009
From: andre at FreeBSD.org (Andre Oppermann)
Date: Tue May  5 07:33:43 2009
Subject: PERFORCE change 161599 for review
Message-ID: <200905050733.n457XauA003929@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161599

Change 161599 by andre@andre_t61 on 2009/05/05 07:32:53

	Various WIP.

Affected files ...

.. //depot/projects/tcp_new/netinet/tcp_var.h#7 edit

Differences ...

==== //depot/projects/tcp_new/netinet/tcp_var.h#7 (text+ko) ====

@@ -144,7 +144,8 @@
 #define	TP_LOSSRECOV	3		/* loss recovery */
 #define	TP_LOSSREXMT	4		/* loss recovery failed, retransmit */
 #define	TP_PERSIST	5		/* persistent mode */
-#define	TP_URGENT	6		/* urgent mode */
+#define	TP_RETRY	6		/* retry after ENOMEM or ENOBUF */
+#define	TP_URGENT	7		/* urgent mode */
 
 	int	t_softerror;		/* possible error not yet reported */
 
@@ -159,6 +160,7 @@
 	tcp_seq	snd_nxt;		/* send next */
 	tcp_seq	snd_rxmt;		/* from where to retransmit */
 	tcp_seq snd_inflight;		/* estimate of data currently in the network (~SACK) */
+	u_int	snd_maxburst;		/* maximum send burst length */
 
 	tcp_seq	snd_up;			/* send urgent pointer */
 
@@ -240,21 +242,12 @@
 	int	snd_sacked;		/* data currently ack'ed through SACK */
 
 /* Congestion control algorithms */
-	union {
-	    struct tcc_newreno {
-		tcp_win	xxx;
-	    } tc_newreno;
-	    struct tcc_vegas {
-		tcp_win xxx;
-	    }
-	int	t_dupacks;		/* consecutive dup acks recd */
 	tcp_seq	snd_recover;		/* for use in NewReno Fast Recovery */
 	tcp_win	snd_cwnd_prev;		/* cwnd prior to retransmit */
 	tcp_win	snd_ssthresh_prev;	/* ssthresh prior to retransmit */
 	tcp_seq	snd_recover_prev;	/* snd_recover prior to retransmit */
 	tcp_win	t_badrxtwin;		/* window for retransmit recovery */
 	int	snd_limited;		/* segments limited transmitted */
-	} t_congest;
 };
 
 /*
From rene at FreeBSD.org  Tue May  5 09:37:44 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Tue May  5 09:37:50 2009
Subject: PERFORCE change 161601 for review
Message-ID: <200905050937.n459bg0g025245@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161601

Change 161601 by rene@rene_self on 2009/05/05 09:36:57

	Remove all remaining corresponding files deleted in the "www cleanup mega commit" (hrs, 2006-08-19 21:20:54 UTC)

Affected files ...

.. //depot/projects/docproj_nl/www/nl/commercial/consult.xml#2 delete
.. //depot/projects/docproj_nl/www/nl/commercial/consult_bycat.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/commercial/entries.dtd#2 delete
.. //depot/projects/docproj_nl/www/nl/commercial/entries.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/commercial/hardware.xml#2 delete
.. //depot/projects/docproj_nl/www/nl/commercial/isp.xml#2 delete
.. //depot/projects/docproj_nl/www/nl/commercial/misc.xml#2 delete
.. //depot/projects/docproj_nl/www/nl/commercial/soft_bycat.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/commercial/software.xml#2 delete
.. //depot/projects/docproj_nl/www/nl/events/events.dtd#2 delete
.. //depot/projects/docproj_nl/www/nl/events/events.xml#2 delete
.. //depot/projects/docproj_nl/www/nl/events/events.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/gnome/includes.navgnome.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/gnome/includes.navgnome.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/gnome/includes.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/includes.navabout.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/includes.navcommunity.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/includes.navdevelopers.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/includes.navdocs.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/includes.navdownload.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/includes.navsupport.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/includes.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/news/includes.sgml#2 delete
.. //depot/projects/docproj_nl/www/nl/news/news-rdf.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/news/news.xml#2 delete
.. //depot/projects/docproj_nl/www/nl/news/newsflash.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/news/oldnewsflash.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/news/oldpress.xsl#2 delete
.. //depot/projects/docproj_nl/www/nl/news/press.xml#2 delete
.. //depot/projects/docproj_nl/www/nl/news/press.xsl#2 delete

Differences ...
From rene at FreeBSD.org  Tue May  5 09:43:50 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Tue May  5 09:43:58 2009
Subject: PERFORCE change 161602 for review
Message-ID: <200905050943.n459hmdu025731@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161602

Change 161602 by rene@rene_self on 2009/05/05 09:43:28

	Add the corresponding added files from the "www cleanup mega commit".
	To be translated.

Affected files ...

.. //depot/projects/docproj_nl/www/nl/share/sgml/catalog#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/catalog.xml#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/l10n.ent#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#1 add
.. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#1 add

Differences ...
From hselasky at FreeBSD.org  Tue May  5 10:42:50 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue May  5 10:42:56 2009
Subject: PERFORCE change 161607 for review
Message-ID: <200905051042.n45AgmFP031481@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161607

Change 161607 by hselasky@hselasky_laptop001 on 2009/05/05 10:41:55

	
	USB core: Fix comment.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_device.h#19 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#19 (text+ko) ====

@@ -92,7 +92,7 @@
 
 	/*
 	 * NOTE: Although the flags below will reach the same value
-	 * over time, but the instant values may differ, and
+	 * over time, the instant values may differ and
 	 * consequently the flags cannot be merged into one!
 	 */
 	uint8_t peer_suspended:1;	/* set if peer is suspended */
From zec at FreeBSD.org  Tue May  5 11:06:14 2009
From: zec at FreeBSD.org (Marko Zec)
Date: Tue May  5 11:06:22 2009
Subject: PERFORCE change 161609 for review
Message-ID: <200905051106.n45B6CaY034383@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161609

Change 161609 by zec@zec_tpx32 on 2009/05/05 11:05:23

	IFC @ 161608

Affected files ...

.. //depot/projects/vimage-commit/src/sys/amd64/amd64/identcpu.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/include/apicvar.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/include/clock.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_mib.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files#24 integrate
.. //depot/projects/vimage-commit/src/sys/conf/kern.post.mk#5 integrate
.. //depot/projects/vimage-commit/src/sys/conf/options#15 integrate
.. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_cpu.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/dev/bwi/bitops.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/bwimac.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/bwimac.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/bwiphy.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/bwiphy.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/bwirf.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/bwirf.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/if_bwi.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/if_bwi_pci.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/if_bwireg.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bwi/if_bwivar.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndisvar.h#8 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ipw/if_ipw.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ipw/if_ipwvar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwi.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwivar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwnvar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rum.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rumvar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uath.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_ural.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uralvar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_zyd.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/usb_wlan.h#3 delete
.. //depot/projects/vimage-commit/src/sys/dev/wi/if_wi.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/dev/wi/if_wivar.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpi.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonacl.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonport.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonsubs.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_var.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfscl.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsclstate.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsdport.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfskpiport.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsm_subs.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsport.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsproto.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsrvcache.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsrvstate.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsv4_errstr.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/rpcv2.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfs/xdr_subs.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clbio.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_cllock.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clnode.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clport.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clstate.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_lock.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfsargs.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfsdiskless.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfsmount.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfsnode.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nlminfo.h#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch
.. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch
.. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_var.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/i386/bios/apm.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/identcpu.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/local_apic.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/i386/i386/mp_machdep.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/apicvar.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/i386/include/clock.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/i386/linux/linux_sysvec.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/i386/xen/clock.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/i386/xen/mp_machdep.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/isa/atrtc.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/isa/rtc.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/kern/init_main.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#9 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_osd.c#5 integrate
.. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#13 integrate
.. //depot/projects/vimage-commit/src/sys/kern/subr_pcpu.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/kern/sys_socket.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/kern/tty.c#13 integrate
.. //depot/projects/vimage-commit/src/sys/kern/uipc_socket.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/kern/uipc_usrreq.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/modules/bwi/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/net/bpf.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/net/if.c#23 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_clone.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/net/if_var.h#15 integrate
.. //depot/projects/vimage-commit/src/sys/net/netisr.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net/rtsock.c#15 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.h#7 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_adhoc.c#7 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#10 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.h#8 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ht.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.c#8 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.h#6 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_proto.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan.h#5 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan_sta.c#6 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_superg.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_superg.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#12 integrate
.. //depot/projects/vimage-commit/src/sys/netgraph/netgraph.h#10 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#14 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#20 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#14 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#18 integrate
.. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#15 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#16 integrate
.. //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#11 integrate
.. //depot/projects/vimage-commit/src/sys/netipsec/xform_tcp.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_kdtrace.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_krpc.c#4 integrate
.. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#12 integrate
.. //depot/projects/vimage-commit/src/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/sys/jail.h#8 integrate
.. //depot/projects/vimage-commit/src/sys/sys/proc.h#10 integrate
.. //depot/projects/vimage-commit/src/sys/sys/ucred.h#4 integrate
.. //depot/projects/vimage-commit/src/sys/sys/vimage.h#17 integrate
.. //depot/projects/vimage-commit/src/sys/vm/vnode_pager.c#7 integrate

Differences ...

==== //depot/projects/vimage-commit/src/sys/amd64/amd64/identcpu.c#6 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.172 2009/04/29 06:54:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -472,6 +472,22 @@
 	cpu_feature = regs[3];
 	cpu_feature2 = regs[2];
 
+	/*
+	 * Clear "Limit CPUID Maxval" bit and get the largest standard CPUID
+	 * function number again if it is set from BIOS.  It is necessary
+	 * for probing correct CPU topology later.
+	 * XXX This is only done on the BSP package.
+	 */
+	if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_high > 0 && cpu_high < 4) {
+		uint64_t msr;
+		msr = rdmsr(MSR_IA32_MISC_ENABLE);
+		if ((msr & 0x400000ULL) != 0) {
+			wrmsr(MSR_IA32_MISC_ENABLE, msr & ~0x400000ULL);
+			do_cpuid(0, regs);
+			cpu_high = regs[0];
+		}
+	}
+
 	if (cpu_vendor_id == CPU_VENDOR_INTEL ||
 	    cpu_vendor_id == CPU_VENDOR_AMD ||
 	    cpu_vendor_id == CPU_VENDOR_CENTAUR) {

==== //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#7 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.54 2009/05/01 20:53:37 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -319,7 +319,7 @@
 	}
 
 	/* We don't setup the timer during boot on the BSP until later. */
-	if (!(boot && PCPU_GET(cpuid) == 0)) {
+	if (!(boot && PCPU_GET(cpuid) == 0) && lapic_timer_hz != 0) {
 		KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor",
 		    lapic_id()));
 		lapic_timer_set_divisor(lapic_timer_divisor);

==== //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#11 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.305 2009/04/30 22:10:04 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.306 2009/05/02 12:20:43 mav Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -57,6 +57,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1124,6 +1125,15 @@
 		sched_preempt(curthread);
 
 	/* Nothing to do for AST */
+
+	if (ipi_bitmap & (1 << IPI_HARDCLOCK))
+		hardclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_STATCLOCK))
+		statclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_PROFCLOCK))
+		profclockintr(&frame);
 }
 
 /*

==== //depot/projects/vimage-commit/src/sys/amd64/include/apicvar.h#5 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.28 2009/03/17 00:48:11 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.29 2009/05/02 12:20:43 mav Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
@@ -126,7 +126,10 @@
 /* IPIs handled by IPI_BITMAPED_VECTOR  (XXX ups is there a better place?) */
 #define	IPI_AST		0 	/* Generate software trap. */
 #define IPI_PREEMPT     1
-#define IPI_BITMAP_LAST IPI_PREEMPT
+#define IPI_HARDCLOCK   2
+#define IPI_STATCLOCK   3
+#define IPI_PROFCLOCK   4
+#define IPI_BITMAP_LAST IPI_PROFCLOCK
 #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST)
 
 #define	IPI_STOP	(APIC_IPI_INTS + 7)	/* Stop CPU until restarted. */

==== //depot/projects/vimage-commit/src/sys/amd64/include/clock.h#4 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.61 2008/10/21 00:38:00 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.63 2009/05/03 17:47:21 mav Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -15,7 +15,6 @@
  * XXX large parts of the driver and its interface are misplaced.
  */
 extern int	clkintr_pending;
-extern int	statclock_disable;
 extern u_int	i8254_freq;
 extern int	i8254_max_count;
 extern uint64_t	tsc_freq;
@@ -24,6 +23,12 @@
 
 void	i8254_init(void);
 
+struct trapframe;
+
+int	hardclockintr(struct trapframe *frame);
+int	statclockintr(struct trapframe *frame);
+int	profclockintr(struct trapframe *frame);
+
 /*
  * Driver to clock driver interface.
  */

==== //depot/projects/vimage-commit/src/sys/amd64/isa/clock.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.244 2009/05/01 21:43:04 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.246 2009/05/03 17:47:21 mav Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -62,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #ifdef DEV_ISA
@@ -74,7 +76,6 @@
 int	clkintr_pending;
 static int pscnt = 1;
 static int psdiv = 1;
-int	statclock_disable;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   1193182
 #endif
@@ -89,6 +90,7 @@
 static	u_int32_t i8254_offset;
 static	int	(*i8254_pending)(struct intsrc *);
 static	int	i8254_ticked;
+static	int	using_atrtc_timer;
 static	int	using_lapic_timer;
 
 /* Values for timerX_state: */
@@ -112,6 +114,37 @@
 	0			/* quality */
 };
 
+int
+hardclockintr(struct trapframe *frame)
+{
+
+	if (PCPU_GET(cpuid) == 0)
+		hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+	else
+		hardclock_cpu(TRAPF_USERMODE(frame));
+	if (!using_atrtc_timer)
+		statclockintr(frame);
+	return (FILTER_HANDLED);
+}
+
+int
+statclockintr(struct trapframe *frame)
+{
+
+	if (profprocs != 0)
+		profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+	statclock(TRAPF_USERMODE(frame));
+	return (FILTER_HANDLED);
+}
+
+int
+profclockintr(struct trapframe *frame)
+{
+
+	profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+	return (FILTER_HANDLED);
+}
+
 static int
 clkintr(struct trapframe *frame)
 {
@@ -128,7 +161,11 @@
 		mtx_unlock_spin(&clock_lock);
 	}
 	KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer"));
-	hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+#ifdef SMP
+	if (smp_started)
+		ipi_all_but_self(IPI_HARDCLOCK);
+#endif
+	hardclockintr(frame);
 	return (FILTER_HANDLED);
 }
 
@@ -209,10 +246,19 @@
 		if (profprocs != 0) {
 			if (--pscnt == 0)
 				pscnt = psdiv;
+#ifdef SMP
+			if (pscnt != psdiv && smp_started)
+				ipi_all_but_self(IPI_PROFCLOCK);
+#endif
 			profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
 		}
-		if (pscnt == psdiv)
+		if (pscnt == psdiv) {
+#ifdef SMP
+			if (smp_started)
+				ipi_all_but_self(IPI_STATCLOCK);
+#endif
 			statclock(TRAPF_USERMODE(frame));
+		}
 	}
 	return(flag ? FILTER_HANDLED : FILTER_STRAY);
 }
@@ -414,7 +460,6 @@
 void
 cpu_initclocks()
 {
-	int diag;
 
 	using_lapic_timer = lapic_setup_clock();
 	/*
@@ -446,21 +491,17 @@
 	 * kernel clocks, then setup the RTC to periodically interrupt to
 	 * drive statclock() and profclock().
 	 */
-	if (!statclock_disable && !using_lapic_timer) {
-		diag = rtcin(RTC_DIAG);
-		if (diag != 0)
-			printf("RTC BIOS diagnostic error %b\n",
-			    diag, RTCDG_BITS);
-
-	        /* Setting stathz to nonzero early helps avoid races. */
-		stathz = RTC_NOPROFRATE;
-		profhz = RTC_PROFRATE;
-
-		/* Enable periodic interrupts from the RTC. */
-		intr_add_handler("rtc", 8,
-		    (driver_filter_t *)rtcintr, NULL, NULL,
-		    INTR_TYPE_CLK, NULL);
-		atrtc_enable_intr();
+	if (!using_lapic_timer) {
+		using_atrtc_timer = atrtc_setup_clock();
+		if (using_atrtc_timer) {
+			/* Enable periodic interrupts from the RTC. */
+			intr_add_handler("rtc", 8,
+			    (driver_filter_t *)rtcintr, NULL, NULL,
+			    INTR_TYPE_CLK, NULL);
+			atrtc_enable_intr();
+		} else {
+			profhz = stathz = hz;
+		}
 	}
 
 	init_TSC_tc();

==== //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysvec.c#7 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.47 2009/05/01 15:36:02 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.48 2009/05/02 10:06:49 dchagin Exp $");
 #include "opt_compat.h"
 
 #ifndef COMPAT_IA32
@@ -76,6 +76,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -127,9 +128,6 @@
 				   u_long stack, u_long ps_strings);
 static void	linux32_fixlimit(struct rlimit *rl, int which);
 
-extern LIST_HEAD(futex_list, futex) futex_list;
-extern struct mtx futex_mtx;
-
 static eventhandler_tag linux_exit_tag;
 static eventhandler_tag linux_schedtail_tag;
 static eventhandler_tag linux_exec_tag;

==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.c#7 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.20 2009/05/01 15:36:02 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.21 2009/05/02 10:06:49 dchagin Exp $");
 #if 0
 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $");
 #endif
@@ -81,7 +81,7 @@
 	TAILQ_HEAD(lf_waiting_proc, waiting_proc) f_waiting_proc;
 };
 
-LIST_HEAD(futex_list, futex) futex_list;
+struct futex_list futex_list;
 
 #define FUTEX_LOCK(f)		sx_xlock(&(f)->f_lck)
 #define FUTEX_UNLOCK(f)		sx_xunlock(&(f)->f_lck)

==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.h#5 (text+ko) ====

@@ -30,12 +30,15 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.6 2009/03/15 19:38:34 dchagin Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.7 2009/05/02 10:06:49 dchagin Exp $
  */
 
 #ifndef _LINUX_FUTEX_H
 #define _LINUX_FUTEX_H
 
+extern LIST_HEAD(futex_list, futex) futex_list;
+extern struct mtx futex_mtx;
+
 #define LINUX_FUTEX_WAIT	0
 #define LINUX_FUTEX_WAKE	1
 #define LINUX_FUTEX_FD		2	/* unused */

==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_mib.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.30 2008/06/03 17:50:13 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.31 2009/05/04 19:06:05 jamie Exp $");
 
 #include 
 #include 
@@ -78,7 +78,7 @@
 }
 
 SYSCTL_PROC(_compat_linux, OID_AUTO, osname,
-	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON,
+	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
 	    0, 0, linux_sysctl_osname, "A",
 	    "Linux kernel OS name");
 
@@ -100,7 +100,7 @@
 }
 
 SYSCTL_PROC(_compat_linux, OID_AUTO, osrelease,
-	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON,
+	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
 	    0, 0, linux_sysctl_osrelease, "A",
 	    "Linux kernel OS release");
 
@@ -121,7 +121,7 @@
 }
 
 SYSCTL_PROC(_compat_linux, OID_AUTO, oss_version,
-	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_PRISON,
+	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
 	    0, 0, linux_sysctl_oss_version, "I",
 	    "Linux OSS version");
 

==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#10 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.81 2009/04/26 22:06:42 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.82 2009/05/02 10:51:40 dchagin Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
@@ -859,7 +859,10 @@
 		return (EINVAL);
 
 	bsd_args.type = args->type;
-	bsd_args.protocol = args->protocol;
+	if (bsd_args.domain == AF_LOCAL && args->protocol == PF_UNIX)
+		bsd_args.protocol = 0;
+	else
+		bsd_args.protocol = args->protocol;
 	bsd_args.rsv = (int *)PTRIN(args->rsv);
 	return (socketpair(td, &bsd_args));
 }

==== //depot/projects/vimage-commit/src/sys/conf/files#24 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1396 2009/05/01 17:16:33 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1398 2009/05/05 10:56:12 zec Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -712,6 +712,11 @@
 dev/buslogic/bt_isa.c		optional bt isa
 dev/buslogic/bt_mca.c		optional bt mca
 dev/buslogic/bt_pci.c		optional bt pci
+dev/bwi/bwiirf.c		optional bwi
+dev/bwi/bwimac.c		optional bwi
+dev/bwi/bwiphy.c		optional bwi
+dev/bwi/if_bwi.c		optional bwi
+dev/bwi/if_bwi_pci.c		optional bwi pci
 dev/cardbus/cardbus.c		optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
 dev/cardbus/cardbus_device.c	optional cardbus
@@ -1947,8 +1952,8 @@
 kern/kern_timeout.c		standard
 kern/kern_umtx.c		standard
 kern/kern_uuid.c		standard
+kern/kern_vimage.c		standard
 kern/kern_xxx.c			standard
-kern/kern_vimage.c		standard
 kern/link_elf.c			standard
 kern/linker_if.m		standard
 kern/md4c.c			optional netsmb

==== //depot/projects/vimage-commit/src/sys/conf/kern.post.mk#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.104 2009/01/07 09:56:54 bz Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.105 2009/05/04 20:25:56 jhb Exp $
 
 # Part of a unified Makefile for building kernels.  This part includes all
 # the definitions that need to be after all the % directives except %RULES
@@ -12,7 +12,8 @@
 .if defined(DESTDIR)
 MKMODULESENV+=	DESTDIR="${DESTDIR}"
 .endif
-MKMODULESENV+=	KERNBUILDDIR="${.CURDIR}"
+SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
+MKMODULESENV+=	KERNBUILDDIR="${.CURDIR}" SYSDIR="${SYSDIR}"
 
 .MAIN: all
 
@@ -29,7 +30,6 @@
 
 # Handle out of tree ports 
 .if !defined(NO_MODULES) && defined(PORTS_MODULES)
-SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
 PORTSMODULESENV=SYSDIR=${SYSDIR}
 .for __target in all install reinstall clean
 ${__target}: ports-${__target}

==== //depot/projects/vimage-commit/src/sys/conf/options#15 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.667 2009/05/01 17:18:45 sam Exp $
+# $FreeBSD: src/sys/conf/options,v 1.668 2009/05/03 04:01:43 imp Exp $
 #
 #        On the handling of kernel options
 #
@@ -763,6 +763,10 @@
 AH_USE_INIPDGAIN	opt_ah.h
 AH_MAXCHAN		opt_ah.h
 
+# options for the Broadcom BCM43xx driver (bwi)
+BWI_DEBUG		opt_bwi.h
+BWI_DEBUG_VERBOSE	opt_bwi.h
+
 # options for the Marvell 8335 wireless driver
 MALO_DEBUG		opt_malo.h
 MALO_TXBUF		opt_malo.h

==== //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_cpu.c#5 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.74 2009/03/26 21:10:35 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.77 2009/05/03 06:25:37 mav Exp $");
 
 #include "opt_acpi.h"
 #include 
@@ -79,7 +79,6 @@
     int			 cpu_features;	/* Child driver supported features. */
     /* Runtime state. */
     int			 cpu_non_c3;	/* Index of lowest non-C3 state. */
-    int			 cpu_short_slp;	/* Count of < 1us sleeps. */
     u_int		 cpu_cx_stats[MAX_CX_STATES];/* Cx usage history. */
     /* Values for sysctl. */
     struct sysctl_ctx_list cpu_sysctl_ctx;
@@ -882,43 +881,13 @@
 	return;
     }
 
-    /*
-     * If we slept 100 us or more, use the lowest Cx state.  Otherwise,
-     * find the lowest state that has a latency less than or equal to
-     * the length of our last sleep.
-     */
-    cx_next_idx = sc->cpu_cx_lowest;
-    if (sc->cpu_prev_sleep < 100) {
-	/*
-	 * If we sleep too short all the time, this system may not implement
-	 * C2/3 correctly (i.e. reads return immediately).  In this case,
-	 * back off and use the next higher level.
-	 * It seems that when you have a dual core cpu (like the Intel Core Duo)
-	 * that both cores will get out of C3 state as soon as one of them
-	 * requires it. This breaks the sleep detection logic as the sleep
-	 * counter is local to each cpu. Disable the sleep logic for now as a
-	 * workaround if there's more than one CPU. The right fix would probably
-	 * be to add quirks for system that don't really support C3 state.
-	 */
-	if (mp_ncpus < 2 && sc->cpu_prev_sleep <= 1) {
-	    sc->cpu_short_slp++;
-	    if (sc->cpu_short_slp == 1000 && sc->cpu_cx_lowest != 0) {
-		if (sc->cpu_non_c3 == sc->cpu_cx_lowest && sc->cpu_non_c3 != 0)
-		    sc->cpu_non_c3--;
-		sc->cpu_cx_lowest--;
-		sc->cpu_short_slp = 0;
-		device_printf(sc->cpu_dev,
-		    "too many short sleeps, backing off to C%d\n",
-		    sc->cpu_cx_lowest + 1);
-	    }
-	} else
-	    sc->cpu_short_slp = 0;
-
-	for (i = sc->cpu_cx_lowest; i >= 0; i--)
-	    if (sc->cpu_cx_states[i].trans_lat <= sc->cpu_prev_sleep) {
-		cx_next_idx = i;
-		break;
-	    }
+    /* Find the lowest state that has small enough latency. */
+    cx_next_idx = 0;
+    for (i = sc->cpu_cx_lowest; i >= 0; i--) {
+	if (sc->cpu_cx_states[i].trans_lat * 3 <= sc->cpu_prev_sleep) {
+	    cx_next_idx = i;
+	    break;
+	}
     }
 
     /*
@@ -943,10 +912,10 @@
     /*
      * Execute HLT (or equivalent) and wait for an interrupt.  We can't
      * calculate the time spent in C1 since the place we wake up is an
-     * ISR.  Assume we slept one quantum and return.
+     * ISR.  Assume we slept half of quantum and return.
      */
     if (cx_next->type == ACPI_STATE_C1) {
-	sc->cpu_prev_sleep = 1000000 / hz;
+	sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 + 500000 / hz) / 4;
 	acpi_cpu_c1();
 	return;
     }
@@ -989,9 +958,9 @@
     }
     ACPI_ENABLE_IRQS();
 
-    /* Find the actual time asleep in microseconds, minus overhead. */
+    /* Find the actual time asleep in microseconds. */
     end_time = acpi_TimerDelta(end_time, start_time);
-    sc->cpu_prev_sleep = PM_USEC(end_time) - cx_next->trans_lat;
+    sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 + PM_USEC(end_time)) / 4;
 }
 
 /*
@@ -1136,8 +1105,9 @@
 	    sbuf_printf(&sb, "%u.%02u%% ", (u_int)(whole / sum),
 		(u_int)(fract / sum));
 	} else
-	    sbuf_printf(&sb, "0%% ");
+	    sbuf_printf(&sb, "0.00%% ");
     }
+    sbuf_printf(&sb, "last %dus", sc->cpu_prev_sleep);
     sbuf_trim(&sb);
     sbuf_finish(&sb);
     sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req);

==== //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#8 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.248 2009/04/13 20:58:47 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.249 2009/05/02 20:16:55 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -3995,12 +3995,7 @@
 
 	if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0) {
 #ifdef IEEE80211_SUPPORT_SUPERG
-		if (ic->ic_stageqdepth) {
-			ieee80211_age_stageq(ic, WME_AC_VO, 100);
-			ieee80211_age_stageq(ic, WME_AC_VI, 100);
-			ieee80211_age_stageq(ic, WME_AC_BE, 100);
-			ieee80211_age_stageq(ic, WME_AC_BK, 100);
-		}
+		ieee80211_ff_age_all(ic, 100);
 #endif
 		if (!IFQ_IS_EMPTY(&ifp->if_snd))
 			ath_start(ifp);
@@ -4980,7 +4975,7 @@
 	 * Flush fast-frame staging queue when traffic slows.
 	 */
 	if (txq->axq_depth <= 1)
-		ieee80211_flush_stageq(ic, txq->axq_ac);
+		ieee80211_ff_flush(ic, txq->axq_ac);
 #endif
 	return nacked;
 }

==== //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 (text+ko) ====

@@ -28,7 +28,7 @@
 ***************************************************************************/
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.30 2009/04/11 22:07:19 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.31 2009/05/05 10:56:12 zec Exp $");
 
 #include 
 #include 
@@ -1217,7 +1217,7 @@
  * receive window.
  */
 static __inline int
-select_rcv_wscale(int space)
+select_rcv_wscale(int space, struct vnet *vnet)
 {
 	INIT_VNET_INET(so->so_vnet);
 	int wscale = 0;
@@ -1326,7 +1326,7 @@
 calc_opt0h(struct socket *so, int mtu_idx)
 {
 	struct tcpcb *tp = so_sototcpcb(so);
-	int wscale = select_rcv_wscale(tp->rcv_wnd);
+	int wscale = select_rcv_wscale(tp->rcv_wnd, so->so_vnet);
 	
 	return V_NAGLE((tp->t_flags & TF_NODELAY) == 0) |
 	    V_KEEP_ALIVE((so_options_get(so) & SO_KEEPALIVE) != 0) | F_TCAM_BYPASS |

==== //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis.c#11 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.157 2009/04/16 23:42:00 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.158 2009/05/02 15:14:18 thompsa Exp $");
 
 #include 
 #include 
@@ -50,7 +50,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 #include 
@@ -173,7 +172,7 @@
 	int);
 static int ndis_nettype_chan	(uint32_t);
 static int ndis_nettype_mode	(uint32_t);
-static void ndis_scan		(void *, int);
+static void ndis_scan		(void *);
 static void ndis_scan_results	(struct ndis_softc *);
 static void ndis_scan_start	(struct ieee80211com *);
 static void ndis_scan_end	(struct ieee80211com *);
@@ -184,8 +183,6 @@
 static void ndis_stop		(struct ndis_softc *);
 static int ndis_ifmedia_upd	(struct ifnet *);
 static void ndis_ifmedia_sts	(struct ifnet *, struct ifmediareq *);
-static void ndis_auth		(void *, int);
-static void ndis_assoc		(void *, int);
 static int ndis_get_assoc	(struct ndis_softc *, ndis_wlan_bssid_ex **);
 static int ndis_probe_offload	(struct ndis_softc *);
 static int ndis_set_offload	(struct ndis_softc *);
@@ -741,13 +738,7 @@
 		uint32_t		arg;
 		int			r;
 
-		sc->ndis_tq = taskqueue_create("nids_taskq", M_NOWAIT | M_ZERO,
-		    taskqueue_thread_enqueue, &sc->ndis_tq);
-		taskqueue_start_threads(&sc->ndis_tq, 1, PI_NET, "%s taskq",
-		    device_get_nameunit(dev));
-		TASK_INIT(&sc->ndis_scantask, 0, ndis_scan, sc);
-		TASK_INIT(&sc->ndis_authtask, 0, ndis_auth, sc);
-		TASK_INIT(&sc->ndis_assoctask, 0, ndis_assoc, sc);
+		callout_init(&sc->ndis_scan_callout, CALLOUT_MPSAFE);
 
 		ifp->if_ioctl = ndis_ioctl_80211;
 		ic->ic_ifp = ifp;
@@ -1054,12 +1045,6 @@
 	} else
 		NDIS_UNLOCK(sc);
 
-	if (sc->ndis_80211) {
-		taskqueue_drain(sc->ndis_tq, &sc->ndis_scantask);
-		taskqueue_drain(sc->ndis_tq, &sc->ndis_authtask);
-		taskqueue_drain(sc->ndis_tq, &sc->ndis_assoctask);
-	}
-
 	if (sc->ndis_tickitem != NULL)
 		IoFreeWorkItem(sc->ndis_tickitem);
 	if (sc->ndis_startitem != NULL)
@@ -1121,8 +1106,6 @@
 	if (sc->ndis_iftype == PCIBus)
 		bus_dma_tag_destroy(sc->ndis_parent_tag);
 
-	if (sc->ndis_80211)
-		taskqueue_free(sc->ndis_tq);
 	return(0);
 }
 
@@ -2419,30 +2402,6 @@
 }
 
 static void
-ndis_auth(void *arg, int npending)
-{
-	struct ndis_softc *sc = arg;
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211com *ic = ifp->if_l2com;
-	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-
-	vap->iv_state = IEEE80211_S_AUTH;
-	ndis_auth_and_assoc(sc, vap);
-}
-
-static void
-ndis_assoc(void *arg, int npending)
-{
-	struct ndis_softc *sc = arg;
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211com *ic = ifp->if_l2com;
-	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-
-	vap->iv_state = IEEE80211_S_ASSOC;
-	ndis_auth_and_assoc(sc, vap);
-}
-
-static void
 ndis_auth_and_assoc(sc, vap)
 	struct ndis_softc	*sc;
 	struct ieee80211vap	*vap;
@@ -2656,9 +2615,6 @@
 	if (rval)
 		device_printf (sc->ndis_dev, "set ssid failed: %d\n", rval);
 
-	if (vap->iv_state == IEEE80211_S_AUTH)
-		ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
-
 	return;
 }
 
@@ -3304,13 +3260,18 @@
 		return nvp->newstate(vap, nstate, arg);
 	case IEEE80211_S_ASSOC:
 		if (ostate != IEEE80211_S_AUTH) {
-			taskqueue_enqueue(sc->ndis_tq, &sc->ndis_assoctask);
-			return EINPROGRESS;
+			IEEE80211_UNLOCK(ic);
+			ndis_auth_and_assoc(sc, vap);
+			IEEE80211_LOCK(ic);
 		}
 		break;
 	case IEEE80211_S_AUTH:
-		taskqueue_enqueue(sc->ndis_tq, &sc->ndis_authtask);
-		return EINPROGRESS;
+		IEEE80211_UNLOCK(ic);
+		ndis_auth_and_assoc(sc, vap);
+		if (vap->iv_state == IEEE80211_S_AUTH) /* XXX */
+			ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
+		IEEE80211_LOCK(ic);
+		break;
 	default:
 		break;
 	}

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From zec at FreeBSD.org  Tue May  5 11:07:17 2009
From: zec at FreeBSD.org (Marko Zec)
Date: Tue May  5 11:07:24 2009
Subject: PERFORCE change 161610 for review
Message-ID: <200905051107.n45B7E7v034448@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161610

Change 161610 by zec@zec_amdx2 on 2009/05/05 11:06:49

	IFC @ 161608

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/apicvar.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_mib.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files#34 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/kern.post.mk#4 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/options#26 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/bitops.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/bwimac.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/bwimac.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/bwiphy.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/bwiphy.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/bwirf.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/bwirf.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/if_bwi.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/if_bwi_pci.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/if_bwireg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/bwi/if_bwivar.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ipw/if_ipw.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ipw/if_ipwvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iwi/if_iwivar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iwn/if_iwn.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iwn/if_iwnvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumvar.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uath.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uralvar.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydreg.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/usb_wlan.h#3 delete
.. //depot/projects/vimage-commit2/src/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wi/if_wivar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpi.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpivar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonacl.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonport.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonsubs.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_var.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfscl.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsclstate.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsdport.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfskpiport.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsm_subs.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsport.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsproto.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsrvcache.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsrvstate.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsv4_errstr.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/rpcv2.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/xdr_subs.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clbio.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_cllock.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clnode.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clport.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clstate.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_lock.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfsargs.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfsdiskless.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfsmount.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfsnode.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nlminfo.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_var.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/bios/apm.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/identcpu.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/local_apic.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/mp_machdep.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/apicvar.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/clock.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_sysvec.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/xen/clock.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/xen/mp_machdep.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/isa/atrtc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/isa/rtc.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/init_main.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_osd.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#25 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_pcpu.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_socket.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/bwi/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/net/bpf.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if.c#52 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_var.h#21 integrate
.. //depot/projects/vimage-commit2/src/sys/net/netisr.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_adhoc.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_superg.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_superg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#34 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#33 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#29 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#38 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#31 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#33 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_tcp.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_kdtrace.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_krpc.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/pc98/cbus/clock.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/jail.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/proc.h#14 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/ucred.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#48 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vnode_pager.c#8 integrate

Differences ...

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#9 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.172 2009/04/29 06:54:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -472,6 +472,22 @@
 	cpu_feature = regs[3];
 	cpu_feature2 = regs[2];
 
+	/*
+	 * Clear "Limit CPUID Maxval" bit and get the largest standard CPUID
+	 * function number again if it is set from BIOS.  It is necessary
+	 * for probing correct CPU topology later.
+	 * XXX This is only done on the BSP package.
+	 */
+	if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_high > 0 && cpu_high < 4) {
+		uint64_t msr;
+		msr = rdmsr(MSR_IA32_MISC_ENABLE);
+		if ((msr & 0x400000ULL) != 0) {
+			wrmsr(MSR_IA32_MISC_ENABLE, msr & ~0x400000ULL);
+			do_cpuid(0, regs);
+			cpu_high = regs[0];
+		}
+	}
+
 	if (cpu_vendor_id == CPU_VENDOR_INTEL ||
 	    cpu_vendor_id == CPU_VENDOR_AMD ||
 	    cpu_vendor_id == CPU_VENDOR_CENTAUR) {

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#8 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.54 2009/05/01 20:53:37 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -319,7 +319,7 @@
 	}
 
 	/* We don't setup the timer during boot on the BSP until later. */
-	if (!(boot && PCPU_GET(cpuid) == 0)) {
+	if (!(boot && PCPU_GET(cpuid) == 0) && lapic_timer_hz != 0) {
 		KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor",
 		    lapic_id()));
 		lapic_timer_set_divisor(lapic_timer_divisor);

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#14 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.305 2009/04/30 22:10:04 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.306 2009/05/02 12:20:43 mav Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -57,6 +57,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1124,6 +1125,15 @@
 		sched_preempt(curthread);
 
 	/* Nothing to do for AST */
+
+	if (ipi_bitmap & (1 << IPI_HARDCLOCK))
+		hardclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_STATCLOCK))
+		statclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_PROFCLOCK))
+		profclockintr(&frame);
 }
 
 /*

==== //depot/projects/vimage-commit2/src/sys/amd64/include/apicvar.h#5 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.28 2009/03/17 00:48:11 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.29 2009/05/02 12:20:43 mav Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
@@ -126,7 +126,10 @@
 /* IPIs handled by IPI_BITMAPED_VECTOR  (XXX ups is there a better place?) */
 #define	IPI_AST		0 	/* Generate software trap. */
 #define IPI_PREEMPT     1
-#define IPI_BITMAP_LAST IPI_PREEMPT
+#define IPI_HARDCLOCK   2
+#define IPI_STATCLOCK   3
+#define IPI_PROFCLOCK   4
+#define IPI_BITMAP_LAST IPI_PROFCLOCK
 #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST)
 
 #define	IPI_STOP	(APIC_IPI_INTS + 7)	/* Stop CPU until restarted. */

==== //depot/projects/vimage-commit2/src/sys/amd64/include/clock.h#3 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.61 2008/10/21 00:38:00 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.63 2009/05/03 17:47:21 mav Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -15,7 +15,6 @@
  * XXX large parts of the driver and its interface are misplaced.
  */
 extern int	clkintr_pending;
-extern int	statclock_disable;
 extern u_int	i8254_freq;
 extern int	i8254_max_count;
 extern uint64_t	tsc_freq;
@@ -24,6 +23,12 @@
 
 void	i8254_init(void);
 
+struct trapframe;
+
+int	hardclockintr(struct trapframe *frame);
+int	statclockintr(struct trapframe *frame);
+int	profclockintr(struct trapframe *frame);
+
 /*
  * Driver to clock driver interface.
  */

==== //depot/projects/vimage-commit2/src/sys/amd64/isa/clock.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.244 2009/05/01 21:43:04 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.246 2009/05/03 17:47:21 mav Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -62,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #ifdef DEV_ISA
@@ -74,7 +76,6 @@
 int	clkintr_pending;
 static int pscnt = 1;
 static int psdiv = 1;
-int	statclock_disable;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   1193182
 #endif
@@ -89,6 +90,7 @@
 static	u_int32_t i8254_offset;
 static	int	(*i8254_pending)(struct intsrc *);
 static	int	i8254_ticked;
+static	int	using_atrtc_timer;
 static	int	using_lapic_timer;
 
 /* Values for timerX_state: */
@@ -112,6 +114,37 @@
 	0			/* quality */
 };
 
+int
+hardclockintr(struct trapframe *frame)
+{
+
+	if (PCPU_GET(cpuid) == 0)
+		hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+	else
+		hardclock_cpu(TRAPF_USERMODE(frame));
+	if (!using_atrtc_timer)
+		statclockintr(frame);
+	return (FILTER_HANDLED);
+}
+
+int
+statclockintr(struct trapframe *frame)
+{
+
+	if (profprocs != 0)
+		profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+	statclock(TRAPF_USERMODE(frame));
+	return (FILTER_HANDLED);
+}
+
+int
+profclockintr(struct trapframe *frame)
+{
+
+	profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+	return (FILTER_HANDLED);
+}
+
 static int
 clkintr(struct trapframe *frame)
 {
@@ -128,7 +161,11 @@
 		mtx_unlock_spin(&clock_lock);
 	}
 	KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer"));
-	hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+#ifdef SMP
+	if (smp_started)
+		ipi_all_but_self(IPI_HARDCLOCK);
+#endif
+	hardclockintr(frame);
 	return (FILTER_HANDLED);
 }
 
@@ -209,10 +246,19 @@
 		if (profprocs != 0) {
 			if (--pscnt == 0)
 				pscnt = psdiv;
+#ifdef SMP
+			if (pscnt != psdiv && smp_started)
+				ipi_all_but_self(IPI_PROFCLOCK);
+#endif
 			profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
 		}
-		if (pscnt == psdiv)
+		if (pscnt == psdiv) {
+#ifdef SMP
+			if (smp_started)
+				ipi_all_but_self(IPI_STATCLOCK);
+#endif
 			statclock(TRAPF_USERMODE(frame));
+		}
 	}
 	return(flag ? FILTER_HANDLED : FILTER_STRAY);
 }
@@ -414,7 +460,6 @@
 void
 cpu_initclocks()
 {
-	int diag;
 
 	using_lapic_timer = lapic_setup_clock();
 	/*
@@ -446,21 +491,17 @@
 	 * kernel clocks, then setup the RTC to periodically interrupt to
 	 * drive statclock() and profclock().
 	 */
-	if (!statclock_disable && !using_lapic_timer) {
-		diag = rtcin(RTC_DIAG);
-		if (diag != 0)
-			printf("RTC BIOS diagnostic error %b\n",
-			    diag, RTCDG_BITS);
-
-	        /* Setting stathz to nonzero early helps avoid races. */
-		stathz = RTC_NOPROFRATE;
-		profhz = RTC_PROFRATE;
-
-		/* Enable periodic interrupts from the RTC. */
-		intr_add_handler("rtc", 8,
-		    (driver_filter_t *)rtcintr, NULL, NULL,
-		    INTR_TYPE_CLK, NULL);
-		atrtc_enable_intr();
+	if (!using_lapic_timer) {
+		using_atrtc_timer = atrtc_setup_clock();
+		if (using_atrtc_timer) {
+			/* Enable periodic interrupts from the RTC. */
+			intr_add_handler("rtc", 8,
+			    (driver_filter_t *)rtcintr, NULL, NULL,
+			    INTR_TYPE_CLK, NULL);
+			atrtc_enable_intr();
+		} else {
+			profhz = stathz = hz;
+		}
 	}
 
 	init_TSC_tc();

==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#9 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.47 2009/05/01 15:36:02 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.48 2009/05/02 10:06:49 dchagin Exp $");
 #include "opt_compat.h"
 
 #ifndef COMPAT_IA32
@@ -76,6 +76,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -127,9 +128,6 @@
 				   u_long stack, u_long ps_strings);
 static void	linux32_fixlimit(struct rlimit *rl, int which);
 
-extern LIST_HEAD(futex_list, futex) futex_list;
-extern struct mtx futex_mtx;
-
 static eventhandler_tag linux_exit_tag;
 static eventhandler_tag linux_schedtail_tag;
 static eventhandler_tag linux_exec_tag;

==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.c#7 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.20 2009/05/01 15:36:02 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.21 2009/05/02 10:06:49 dchagin Exp $");
 #if 0
 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $");
 #endif
@@ -81,7 +81,7 @@
 	TAILQ_HEAD(lf_waiting_proc, waiting_proc) f_waiting_proc;
 };
 
-LIST_HEAD(futex_list, futex) futex_list;
+struct futex_list futex_list;
 
 #define FUTEX_LOCK(f)		sx_xlock(&(f)->f_lck)
 #define FUTEX_UNLOCK(f)		sx_xunlock(&(f)->f_lck)

==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.h#4 (text+ko) ====

@@ -30,12 +30,15 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.6 2009/03/15 19:38:34 dchagin Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.7 2009/05/02 10:06:49 dchagin Exp $
  */
 
 #ifndef _LINUX_FUTEX_H
 #define _LINUX_FUTEX_H
 
+extern LIST_HEAD(futex_list, futex) futex_list;
+extern struct mtx futex_mtx;
+
 #define LINUX_FUTEX_WAIT	0
 #define LINUX_FUTEX_WAKE	1
 #define LINUX_FUTEX_FD		2	/* unused */

==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_mib.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.30 2008/06/03 17:50:13 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.31 2009/05/04 19:06:05 jamie Exp $");
 
 #include 
 #include 
@@ -78,7 +78,7 @@
 }
 
 SYSCTL_PROC(_compat_linux, OID_AUTO, osname,
-	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON,
+	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
 	    0, 0, linux_sysctl_osname, "A",
 	    "Linux kernel OS name");
 
@@ -100,7 +100,7 @@
 }
 
 SYSCTL_PROC(_compat_linux, OID_AUTO, osrelease,
-	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON,
+	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
 	    0, 0, linux_sysctl_osrelease, "A",
 	    "Linux kernel OS release");
 
@@ -121,7 +121,7 @@
 }
 
 SYSCTL_PROC(_compat_linux, OID_AUTO, oss_version,
-	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_PRISON,
+	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
 	    0, 0, linux_sysctl_oss_version, "I",
 	    "Linux OSS version");
 

==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#15 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.81 2009/04/26 22:06:42 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.82 2009/05/02 10:51:40 dchagin Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
@@ -859,7 +859,10 @@
 		return (EINVAL);
 
 	bsd_args.type = args->type;
-	bsd_args.protocol = args->protocol;
+	if (bsd_args.domain == AF_LOCAL && args->protocol == PF_UNIX)
+		bsd_args.protocol = 0;
+	else
+		bsd_args.protocol = args->protocol;
 	bsd_args.rsv = (int *)PTRIN(args->rsv);
 	return (socketpair(td, &bsd_args));
 }

==== //depot/projects/vimage-commit2/src/sys/conf/files#34 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1396 2009/05/01 17:16:33 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1398 2009/05/05 10:56:12 zec Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -712,6 +712,11 @@
 dev/buslogic/bt_isa.c		optional bt isa
 dev/buslogic/bt_mca.c		optional bt mca
 dev/buslogic/bt_pci.c		optional bt pci
+dev/bwi/bwiirf.c		optional bwi
+dev/bwi/bwimac.c		optional bwi
+dev/bwi/bwiphy.c		optional bwi
+dev/bwi/if_bwi.c		optional bwi
+dev/bwi/if_bwi_pci.c		optional bwi pci
 dev/cardbus/cardbus.c		optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
 dev/cardbus/cardbus_device.c	optional cardbus

==== //depot/projects/vimage-commit2/src/sys/conf/kern.post.mk#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.104 2009/01/07 09:56:54 bz Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.105 2009/05/04 20:25:56 jhb Exp $
 
 # Part of a unified Makefile for building kernels.  This part includes all
 # the definitions that need to be after all the % directives except %RULES
@@ -12,7 +12,8 @@
 .if defined(DESTDIR)
 MKMODULESENV+=	DESTDIR="${DESTDIR}"
 .endif
-MKMODULESENV+=	KERNBUILDDIR="${.CURDIR}"
+SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
+MKMODULESENV+=	KERNBUILDDIR="${.CURDIR}" SYSDIR="${SYSDIR}"
 
 .MAIN: all
 
@@ -29,7 +30,6 @@
 
 # Handle out of tree ports 
 .if !defined(NO_MODULES) && defined(PORTS_MODULES)
-SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
 PORTSMODULESENV=SYSDIR=${SYSDIR}
 .for __target in all install reinstall clean
 ${__target}: ports-${__target}

==== //depot/projects/vimage-commit2/src/sys/conf/options#26 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.667 2009/05/01 17:18:45 sam Exp $
+# $FreeBSD: src/sys/conf/options,v 1.668 2009/05/03 04:01:43 imp Exp $
 #
 #        On the handling of kernel options
 #
@@ -763,6 +763,10 @@
 AH_USE_INIPDGAIN	opt_ah.h
 AH_MAXCHAN		opt_ah.h
 
+# options for the Broadcom BCM43xx driver (bwi)
+BWI_DEBUG		opt_bwi.h
+BWI_DEBUG_VERBOSE	opt_bwi.h
+
 # options for the Marvell 8335 wireless driver
 MALO_DEBUG		opt_malo.h
 MALO_TXBUF		opt_malo.h

==== //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_cpu.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.74 2009/03/26 21:10:35 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.77 2009/05/03 06:25:37 mav Exp $");
 
 #include "opt_acpi.h"
 #include 
@@ -79,7 +79,6 @@
     int			 cpu_features;	/* Child driver supported features. */
     /* Runtime state. */
     int			 cpu_non_c3;	/* Index of lowest non-C3 state. */
-    int			 cpu_short_slp;	/* Count of < 1us sleeps. */
     u_int		 cpu_cx_stats[MAX_CX_STATES];/* Cx usage history. */
     /* Values for sysctl. */
     struct sysctl_ctx_list cpu_sysctl_ctx;
@@ -882,43 +881,13 @@
 	return;
     }
 
-    /*
-     * If we slept 100 us or more, use the lowest Cx state.  Otherwise,
-     * find the lowest state that has a latency less than or equal to
-     * the length of our last sleep.
-     */
-    cx_next_idx = sc->cpu_cx_lowest;
-    if (sc->cpu_prev_sleep < 100) {
-	/*
-	 * If we sleep too short all the time, this system may not implement
-	 * C2/3 correctly (i.e. reads return immediately).  In this case,
-	 * back off and use the next higher level.
-	 * It seems that when you have a dual core cpu (like the Intel Core Duo)
-	 * that both cores will get out of C3 state as soon as one of them
-	 * requires it. This breaks the sleep detection logic as the sleep
-	 * counter is local to each cpu. Disable the sleep logic for now as a
-	 * workaround if there's more than one CPU. The right fix would probably
-	 * be to add quirks for system that don't really support C3 state.
-	 */
-	if (mp_ncpus < 2 && sc->cpu_prev_sleep <= 1) {
-	    sc->cpu_short_slp++;
-	    if (sc->cpu_short_slp == 1000 && sc->cpu_cx_lowest != 0) {
-		if (sc->cpu_non_c3 == sc->cpu_cx_lowest && sc->cpu_non_c3 != 0)
-		    sc->cpu_non_c3--;
-		sc->cpu_cx_lowest--;
-		sc->cpu_short_slp = 0;
-		device_printf(sc->cpu_dev,
-		    "too many short sleeps, backing off to C%d\n",
-		    sc->cpu_cx_lowest + 1);
-	    }
-	} else
-	    sc->cpu_short_slp = 0;
-
-	for (i = sc->cpu_cx_lowest; i >= 0; i--)
-	    if (sc->cpu_cx_states[i].trans_lat <= sc->cpu_prev_sleep) {
-		cx_next_idx = i;
-		break;
-	    }
+    /* Find the lowest state that has small enough latency. */
+    cx_next_idx = 0;
+    for (i = sc->cpu_cx_lowest; i >= 0; i--) {
+	if (sc->cpu_cx_states[i].trans_lat * 3 <= sc->cpu_prev_sleep) {
+	    cx_next_idx = i;
+	    break;
+	}
     }
 
     /*
@@ -943,10 +912,10 @@
     /*
      * Execute HLT (or equivalent) and wait for an interrupt.  We can't
      * calculate the time spent in C1 since the place we wake up is an
-     * ISR.  Assume we slept one quantum and return.
+     * ISR.  Assume we slept half of quantum and return.
      */
     if (cx_next->type == ACPI_STATE_C1) {
-	sc->cpu_prev_sleep = 1000000 / hz;
+	sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 + 500000 / hz) / 4;
 	acpi_cpu_c1();
 	return;
     }
@@ -989,9 +958,9 @@
     }
     ACPI_ENABLE_IRQS();
 
-    /* Find the actual time asleep in microseconds, minus overhead. */
+    /* Find the actual time asleep in microseconds. */
     end_time = acpi_TimerDelta(end_time, start_time);
-    sc->cpu_prev_sleep = PM_USEC(end_time) - cx_next->trans_lat;
+    sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 + PM_USEC(end_time)) / 4;
 }
 
 /*
@@ -1136,8 +1105,9 @@
 	    sbuf_printf(&sb, "%u.%02u%% ", (u_int)(whole / sum),
 		(u_int)(fract / sum));
 	} else
-	    sbuf_printf(&sb, "0%% ");
+	    sbuf_printf(&sb, "0.00%% ");
     }
+    sbuf_printf(&sb, "last %dus", sc->cpu_prev_sleep);
     sbuf_trim(&sb);
     sbuf_finish(&sb);
     sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req);

==== //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#13 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.248 2009/04/13 20:58:47 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.249 2009/05/02 20:16:55 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -3995,12 +3995,7 @@
 
 	if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0) {
 #ifdef IEEE80211_SUPPORT_SUPERG
-		if (ic->ic_stageqdepth) {
-			ieee80211_age_stageq(ic, WME_AC_VO, 100);
-			ieee80211_age_stageq(ic, WME_AC_VI, 100);
-			ieee80211_age_stageq(ic, WME_AC_BE, 100);
-			ieee80211_age_stageq(ic, WME_AC_BK, 100);
-		}
+		ieee80211_ff_age_all(ic, 100);
 #endif
 		if (!IFQ_IS_EMPTY(&ifp->if_snd))
 			ath_start(ifp);
@@ -4980,7 +4975,7 @@
 	 * Flush fast-frame staging queue when traffic slows.
 	 */
 	if (txq->axq_depth <= 1)
-		ieee80211_flush_stageq(ic, txq->axq_ac);
+		ieee80211_ff_flush(ic, txq->axq_ac);
 #endif
 	return nacked;
 }

==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#21 (text+ko) ====

@@ -28,7 +28,7 @@
 ***************************************************************************/
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.30 2009/04/11 22:07:19 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.31 2009/05/05 10:56:12 zec Exp $");
 
 #include 
 #include 

==== //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#12 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.157 2009/04/16 23:42:00 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.158 2009/05/02 15:14:18 thompsa Exp $");
 
 #include 
 #include 
@@ -50,7 +50,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 #include 
@@ -173,7 +172,7 @@
 	int);
 static int ndis_nettype_chan	(uint32_t);
 static int ndis_nettype_mode	(uint32_t);
-static void ndis_scan		(void *, int);
+static void ndis_scan		(void *);
 static void ndis_scan_results	(struct ndis_softc *);
 static void ndis_scan_start	(struct ieee80211com *);
 static void ndis_scan_end	(struct ieee80211com *);
@@ -184,8 +183,6 @@
 static void ndis_stop		(struct ndis_softc *);
 static int ndis_ifmedia_upd	(struct ifnet *);
 static void ndis_ifmedia_sts	(struct ifnet *, struct ifmediareq *);
-static void ndis_auth		(void *, int);
-static void ndis_assoc		(void *, int);
 static int ndis_get_assoc	(struct ndis_softc *, ndis_wlan_bssid_ex **);
 static int ndis_probe_offload	(struct ndis_softc *);
 static int ndis_set_offload	(struct ndis_softc *);
@@ -741,13 +738,7 @@
 		uint32_t		arg;
 		int			r;
 
-		sc->ndis_tq = taskqueue_create("nids_taskq", M_NOWAIT | M_ZERO,
-		    taskqueue_thread_enqueue, &sc->ndis_tq);
-		taskqueue_start_threads(&sc->ndis_tq, 1, PI_NET, "%s taskq",
-		    device_get_nameunit(dev));
-		TASK_INIT(&sc->ndis_scantask, 0, ndis_scan, sc);
-		TASK_INIT(&sc->ndis_authtask, 0, ndis_auth, sc);
-		TASK_INIT(&sc->ndis_assoctask, 0, ndis_assoc, sc);
+		callout_init(&sc->ndis_scan_callout, CALLOUT_MPSAFE);
 
 		ifp->if_ioctl = ndis_ioctl_80211;
 		ic->ic_ifp = ifp;
@@ -1054,12 +1045,6 @@
 	} else
 		NDIS_UNLOCK(sc);
 
-	if (sc->ndis_80211) {
-		taskqueue_drain(sc->ndis_tq, &sc->ndis_scantask);
-		taskqueue_drain(sc->ndis_tq, &sc->ndis_authtask);
-		taskqueue_drain(sc->ndis_tq, &sc->ndis_assoctask);
-	}
-
 	if (sc->ndis_tickitem != NULL)
 		IoFreeWorkItem(sc->ndis_tickitem);
 	if (sc->ndis_startitem != NULL)
@@ -1121,8 +1106,6 @@
 	if (sc->ndis_iftype == PCIBus)
 		bus_dma_tag_destroy(sc->ndis_parent_tag);
 
-	if (sc->ndis_80211)
-		taskqueue_free(sc->ndis_tq);
 	return(0);
 }
 
@@ -2419,30 +2402,6 @@
 }
 
 static void
-ndis_auth(void *arg, int npending)
-{
-	struct ndis_softc *sc = arg;
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211com *ic = ifp->if_l2com;
-	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-
-	vap->iv_state = IEEE80211_S_AUTH;
-	ndis_auth_and_assoc(sc, vap);
-}
-
-static void
-ndis_assoc(void *arg, int npending)
-{
-	struct ndis_softc *sc = arg;
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211com *ic = ifp->if_l2com;
-	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-
-	vap->iv_state = IEEE80211_S_ASSOC;
-	ndis_auth_and_assoc(sc, vap);
-}
-
-static void
 ndis_auth_and_assoc(sc, vap)
 	struct ndis_softc	*sc;
 	struct ieee80211vap	*vap;
@@ -2656,9 +2615,6 @@
 	if (rval)
 		device_printf (sc->ndis_dev, "set ssid failed: %d\n", rval);
 
-	if (vap->iv_state == IEEE80211_S_AUTH)
-		ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
-
 	return;
 }
 
@@ -3304,13 +3260,18 @@
 		return nvp->newstate(vap, nstate, arg);
 	case IEEE80211_S_ASSOC:
 		if (ostate != IEEE80211_S_AUTH) {
-			taskqueue_enqueue(sc->ndis_tq, &sc->ndis_assoctask);
-			return EINPROGRESS;
+			IEEE80211_UNLOCK(ic);
+			ndis_auth_and_assoc(sc, vap);
+			IEEE80211_LOCK(ic);
 		}
 		break;
 	case IEEE80211_S_AUTH:
-		taskqueue_enqueue(sc->ndis_tq, &sc->ndis_authtask);
-		return EINPROGRESS;
+		IEEE80211_UNLOCK(ic);
+		ndis_auth_and_assoc(sc, vap);
+		if (vap->iv_state == IEEE80211_S_AUTH) /* XXX */
+			ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
+		IEEE80211_LOCK(ic);
+		break;
 	default:
 		break;
 	}
@@ -3318,54 +3279,18 @@
 }
 
 static void
-ndis_scan(void *arg, int npending)
+ndis_scan(void *arg)
 {
 	struct ndis_softc *sc = arg;
 	struct ieee80211com *ic;
 	struct ieee80211vap *vap;
-	struct ieee80211_scan_state *ss;
-	ndis_80211_ssid ssid;
-	int error, len;
 
 	ic = sc->ifp->if_l2com;
-	ss = ic->ic_scan;
 	vap = TAILQ_FIRST(&ic->ic_vaps);
 
-	if (!NDIS_INITIALIZED(sc)) {
-		DPRINTF(("%s: scan aborted\n", __func__));
-		ieee80211_cancel_scan(vap);
-		return;
-	}
-
-	len = sizeof(ssid);
-	bzero((char *)&ssid, len);
-	if (ss->ss_nssid == 0)
-		ssid.ns_ssidlen = 1;

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From rene at FreeBSD.org  Tue May  5 11:12:21 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Tue May  5 11:12:27 2009
Subject: PERFORCE change 161611 for review
Message-ID: <200905051112.n45BCKmi034861@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161611

Change 161611 by rene@rene_self on 2009/05/05 11:12:05

	[solid-state] : reword the Apache section a bit.
	Obtained from:	keramida

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#15 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/solid-state/article.sgml#15 (text+ko) ====

@@ -440,10 +440,11 @@
 	directory apache_log_dir
 	outside of /var.
-	Since these directories doubtlessly exist on a read-only filesystem, this
-	will not work.  It is necessary to add a new directory to the
-	/etc/rc.d/var list of directories to create
-	in /var, and to link
+	Since this directory lives on a read-only filesystem, Apache
+	will probably not work since it will not be able to save any log
+	entries.  If so, it is necessary to add a new directory to the
+	list of directories in /etc/rc.d/var to
+	create in /var, and to link
 	apache_log_dir to
 	/var/log/apache.  It is also necessary to set
 	permissions and ownership on this new directory.
From zec at FreeBSD.org  Tue May  5 11:18:30 2009
From: zec at FreeBSD.org (Marko Zec)
Date: Tue May  5 11:18:37 2009
Subject: PERFORCE change 161613 for review
Message-ID: <200905051118.n45BIQig035305@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161613

Change 161613 by zec@zec_tpx32 on 2009/05/05 11:18:22

	IFC @ 161608

Affected files ...

.. //depot/projects/vimage/src/share/man/man4/u3g.4#4 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#16 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#18 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#22 integrate
.. //depot/projects/vimage/src/sys/amd64/include/apicvar.h#8 integrate
.. //depot/projects/vimage/src/sys/amd64/include/clock.h#6 integrate
.. //depot/projects/vimage/src/sys/amd64/isa/clock.c#11 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#16 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#11 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_futex.h#7 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_mib.c#5 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#18 integrate
.. //depot/projects/vimage/src/sys/conf/files#66 integrate
.. //depot/projects/vimage/src/sys/conf/kern.post.mk#8 integrate
.. //depot/projects/vimage/src/sys/conf/options#48 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#35 integrate
.. //depot/projects/vimage/src/sys/dev/bwi/bitops.h#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/bwimac.c#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/bwimac.h#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/bwiphy.c#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/bwiphy.h#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/bwirf.c#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/bwirf.h#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/if_bwi.c#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/if_bwi_pci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/if_bwireg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/bwi/if_bwivar.h#1 branch
.. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#22 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#25 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#11 integrate
.. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/ipw/if_ipwvar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/iwi/if_iwivar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/iwn/if_iwnvar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uath.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/usb_wlan.h#4 delete
.. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/wi/if_wivar.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/wpi/if_wpivar.h#4 integrate
.. //depot/projects/vimage/src/sys/fs/nfs/nfs.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonacl.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonport.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonsubs.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfs_var.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfscl.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfsclstate.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfsdport.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfskpiport.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfsm_subs.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfsport.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfsproto.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfsrvcache.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfsrvstate.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/nfsv4_errstr.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/rpcv2.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfs/xdr_subs.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clbio.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_cllock.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clnode.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clport.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clstate.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_lock.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfsargs.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfsdiskless.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfsmount.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfsnode.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsclient/nlminfo.h#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch
.. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_var.h#4 integrate
.. //depot/projects/vimage/src/sys/i386/bios/apm.c#7 integrate
.. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#18 integrate
.. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#18 integrate
.. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#21 integrate
.. //depot/projects/vimage/src/sys/i386/include/apicvar.h#9 integrate
.. //depot/projects/vimage/src/sys/i386/include/clock.h#6 integrate
.. //depot/projects/vimage/src/sys/i386/isa/clock.c#10 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#12 integrate
.. //depot/projects/vimage/src/sys/i386/xen/clock.c#6 integrate
.. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#10 integrate
.. //depot/projects/vimage/src/sys/isa/atrtc.c#3 integrate
.. //depot/projects/vimage/src/sys/isa/rtc.h#3 integrate
.. //depot/projects/vimage/src/sys/kern/init_main.c#25 integrate
.. //depot/projects/vimage/src/sys/kern/kern_fork.c#24 integrate
.. //depot/projects/vimage/src/sys/kern/kern_linker.c#25 integrate
.. //depot/projects/vimage/src/sys/kern/kern_osd.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#86 integrate
.. //depot/projects/vimage/src/sys/kern/subr_pcpu.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/sys_socket.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#34 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_socket.c#32 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#24 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#25 integrate
.. //depot/projects/vimage/src/sys/modules/bwi/Makefile#1 branch
.. //depot/projects/vimage/src/sys/net/bpf.c#34 integrate
.. //depot/projects/vimage/src/sys/net/if.c#81 integrate
.. //depot/projects/vimage/src/sys/net/if_clone.c#14 integrate
.. //depot/projects/vimage/src/sys/net/if_ethersubr.c#40 integrate
.. //depot/projects/vimage/src/sys/net/if_var.h#35 integrate
.. //depot/projects/vimage/src/sys/net/netisr.c#15 integrate
.. //depot/projects/vimage/src/sys/net/rtsock.c#34 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.c#32 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.h#14 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#10 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#23 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#20 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#18 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#11 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#24 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#22 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#14 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#16 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#10 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.h#6 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#15 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_superg.c#4 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_superg.h#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#27 integrate
.. //depot/projects/vimage/src/sys/netgraph/netgraph.h#21 integrate
.. //depot/projects/vimage/src/sys/netinet/if_ether.c#43 integrate
.. //depot/projects/vimage/src/sys/netinet/igmp.c#38 integrate
.. //depot/projects/vimage/src/sys/netinet/in_rmx.c#33 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#56 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#36 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#35 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet6/mld6.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6.c#50 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#35 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_tcp.c#6 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_kdtrace.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_krpc.c#4 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#33 integrate
.. //depot/projects/vimage/src/sys/pc98/cbus/clock.c#8 integrate
.. //depot/projects/vimage/src/sys/sys/jail.h#12 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#30 integrate
.. //depot/projects/vimage/src/sys/sys/ucred.h#8 integrate
.. //depot/projects/vimage/src/sys/sys/vimage.h#90 integrate
.. //depot/projects/vimage/src/sys/vm/vnode_pager.c#14 integrate

Differences ...

==== //depot/projects/vimage/src/share/man/man4/u3g.4#4 (text+ko) ====

@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.10 2009/04/23 08:37:56 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.11 2009/05/02 11:59:56 hrs Exp $
 .\"
 .Dd October 7, 2008
 .Dt U3G 4
@@ -66,13 +66,13 @@
 .It
 Huawei B190, E220 ('')
 .It
-Novatal U740, MC950D, X950D, etc.
+Novatel U740, MC950D, X950D, etc.
 .It
 Sierra MC875U, MC8775U, etc.
 .El
 .Pp
 (See
-.Pa /sys/dev/u3g.c
+.Pa /sys/dev/usb/serial/u3g.c
 for the complete list of supported cards for each vendor
 mentioned above.)
 .Pp

==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#16 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.172 2009/04/29 06:54:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -472,6 +472,22 @@
 	cpu_feature = regs[3];
 	cpu_feature2 = regs[2];
 
+	/*
+	 * Clear "Limit CPUID Maxval" bit and get the largest standard CPUID
+	 * function number again if it is set from BIOS.  It is necessary
+	 * for probing correct CPU topology later.
+	 * XXX This is only done on the BSP package.
+	 */
+	if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_high > 0 && cpu_high < 4) {
+		uint64_t msr;
+		msr = rdmsr(MSR_IA32_MISC_ENABLE);
+		if ((msr & 0x400000ULL) != 0) {
+			wrmsr(MSR_IA32_MISC_ENABLE, msr & ~0x400000ULL);
+			do_cpuid(0, regs);
+			cpu_high = regs[0];
+		}
+	}
+
 	if (cpu_vendor_id == CPU_VENDOR_INTEL ||
 	    cpu_vendor_id == CPU_VENDOR_AMD ||
 	    cpu_vendor_id == CPU_VENDOR_CENTAUR) {

==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#18 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.54 2009/05/01 20:53:37 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -319,7 +319,7 @@
 	}
 
 	/* We don't setup the timer during boot on the BSP until later. */
-	if (!(boot && PCPU_GET(cpuid) == 0)) {
+	if (!(boot && PCPU_GET(cpuid) == 0) && lapic_timer_hz != 0) {
 		KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor",
 		    lapic_id()));
 		lapic_timer_set_divisor(lapic_timer_divisor);

==== //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#22 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.305 2009/04/30 22:10:04 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.306 2009/05/02 12:20:43 mav Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -57,6 +57,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1124,6 +1125,15 @@
 		sched_preempt(curthread);
 
 	/* Nothing to do for AST */
+
+	if (ipi_bitmap & (1 << IPI_HARDCLOCK))
+		hardclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_STATCLOCK))
+		statclockintr(&frame);
+
+	if (ipi_bitmap & (1 << IPI_PROFCLOCK))
+		profclockintr(&frame);
 }
 
 /*

==== //depot/projects/vimage/src/sys/amd64/include/apicvar.h#8 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.28 2009/03/17 00:48:11 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.29 2009/05/02 12:20:43 mav Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
@@ -126,7 +126,10 @@
 /* IPIs handled by IPI_BITMAPED_VECTOR  (XXX ups is there a better place?) */
 #define	IPI_AST		0 	/* Generate software trap. */
 #define IPI_PREEMPT     1
-#define IPI_BITMAP_LAST IPI_PREEMPT
+#define IPI_HARDCLOCK   2
+#define IPI_STATCLOCK   3
+#define IPI_PROFCLOCK   4
+#define IPI_BITMAP_LAST IPI_PROFCLOCK
 #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST)
 
 #define	IPI_STOP	(APIC_IPI_INTS + 7)	/* Stop CPU until restarted. */

==== //depot/projects/vimage/src/sys/amd64/include/clock.h#6 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.61 2008/10/21 00:38:00 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.63 2009/05/03 17:47:21 mav Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -15,7 +15,6 @@
  * XXX large parts of the driver and its interface are misplaced.
  */
 extern int	clkintr_pending;
-extern int	statclock_disable;
 extern u_int	i8254_freq;
 extern int	i8254_max_count;
 extern uint64_t	tsc_freq;
@@ -24,6 +23,12 @@
 
 void	i8254_init(void);
 
+struct trapframe;
+
+int	hardclockintr(struct trapframe *frame);
+int	statclockintr(struct trapframe *frame);
+int	profclockintr(struct trapframe *frame);
+
 /*
  * Driver to clock driver interface.
  */

==== //depot/projects/vimage/src/sys/amd64/isa/clock.c#11 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.244 2009/05/01 21:43:04 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.246 2009/05/03 17:47:21 mav Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -62,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #ifdef DEV_ISA
@@ -74,7 +76,6 @@
 int	clkintr_pending;
 static int pscnt = 1;
 static int psdiv = 1;
-int	statclock_disable;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   1193182
 #endif
@@ -89,6 +90,7 @@
 static	u_int32_t i8254_offset;
 static	int	(*i8254_pending)(struct intsrc *);
 static	int	i8254_ticked;
+static	int	using_atrtc_timer;
 static	int	using_lapic_timer;
 
 /* Values for timerX_state: */
@@ -112,6 +114,37 @@
 	0			/* quality */
 };
 
+int
+hardclockintr(struct trapframe *frame)
+{
+
+	if (PCPU_GET(cpuid) == 0)
+		hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+	else
+		hardclock_cpu(TRAPF_USERMODE(frame));
+	if (!using_atrtc_timer)
+		statclockintr(frame);
+	return (FILTER_HANDLED);
+}
+
+int
+statclockintr(struct trapframe *frame)
+{
+
+	if (profprocs != 0)
+		profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+	statclock(TRAPF_USERMODE(frame));
+	return (FILTER_HANDLED);
+}
+
+int
+profclockintr(struct trapframe *frame)
+{
+
+	profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+	return (FILTER_HANDLED);
+}
+
 static int
 clkintr(struct trapframe *frame)
 {
@@ -128,7 +161,11 @@
 		mtx_unlock_spin(&clock_lock);
 	}
 	KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer"));
-	hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
+#ifdef SMP
+	if (smp_started)
+		ipi_all_but_self(IPI_HARDCLOCK);
+#endif
+	hardclockintr(frame);
 	return (FILTER_HANDLED);
 }
 
@@ -209,10 +246,19 @@
 		if (profprocs != 0) {
 			if (--pscnt == 0)
 				pscnt = psdiv;
+#ifdef SMP
+			if (pscnt != psdiv && smp_started)
+				ipi_all_but_self(IPI_PROFCLOCK);
+#endif
 			profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
 		}
-		if (pscnt == psdiv)
+		if (pscnt == psdiv) {
+#ifdef SMP
+			if (smp_started)
+				ipi_all_but_self(IPI_STATCLOCK);
+#endif
 			statclock(TRAPF_USERMODE(frame));
+		}
 	}
 	return(flag ? FILTER_HANDLED : FILTER_STRAY);
 }
@@ -414,7 +460,6 @@
 void
 cpu_initclocks()
 {
-	int diag;
 
 	using_lapic_timer = lapic_setup_clock();
 	/*
@@ -446,21 +491,17 @@
 	 * kernel clocks, then setup the RTC to periodically interrupt to
 	 * drive statclock() and profclock().
 	 */
-	if (!statclock_disable && !using_lapic_timer) {
-		diag = rtcin(RTC_DIAG);
-		if (diag != 0)
-			printf("RTC BIOS diagnostic error %b\n",
-			    diag, RTCDG_BITS);
-
-	        /* Setting stathz to nonzero early helps avoid races. */
-		stathz = RTC_NOPROFRATE;
-		profhz = RTC_PROFRATE;
-
-		/* Enable periodic interrupts from the RTC. */
-		intr_add_handler("rtc", 8,
-		    (driver_filter_t *)rtcintr, NULL, NULL,
-		    INTR_TYPE_CLK, NULL);
-		atrtc_enable_intr();
+	if (!using_lapic_timer) {
+		using_atrtc_timer = atrtc_setup_clock();
+		if (using_atrtc_timer) {
+			/* Enable periodic interrupts from the RTC. */
+			intr_add_handler("rtc", 8,
+			    (driver_filter_t *)rtcintr, NULL, NULL,
+			    INTR_TYPE_CLK, NULL);
+			atrtc_enable_intr();
+		} else {
+			profhz = stathz = hz;
+		}
 	}
 
 	init_TSC_tc();

==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#16 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.47 2009/05/01 15:36:02 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.48 2009/05/02 10:06:49 dchagin Exp $");
 #include "opt_compat.h"
 
 #ifndef COMPAT_IA32
@@ -76,6 +76,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -127,9 +128,6 @@
 				   u_long stack, u_long ps_strings);
 static void	linux32_fixlimit(struct rlimit *rl, int which);
 
-extern LIST_HEAD(futex_list, futex) futex_list;
-extern struct mtx futex_mtx;
-
 static eventhandler_tag linux_exit_tag;
 static eventhandler_tag linux_schedtail_tag;
 static eventhandler_tag linux_exec_tag;

==== //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#11 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.20 2009/05/01 15:36:02 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.21 2009/05/02 10:06:49 dchagin Exp $");
 #if 0
 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $");
 #endif
@@ -81,7 +81,7 @@
 	TAILQ_HEAD(lf_waiting_proc, waiting_proc) f_waiting_proc;
 };
 
-LIST_HEAD(futex_list, futex) futex_list;
+struct futex_list futex_list;
 
 #define FUTEX_LOCK(f)		sx_xlock(&(f)->f_lck)
 #define FUTEX_UNLOCK(f)		sx_xunlock(&(f)->f_lck)

==== //depot/projects/vimage/src/sys/compat/linux/linux_futex.h#7 (text+ko) ====

@@ -30,12 +30,15 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.6 2009/03/15 19:38:34 dchagin Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.7 2009/05/02 10:06:49 dchagin Exp $
  */
 
 #ifndef _LINUX_FUTEX_H
 #define _LINUX_FUTEX_H
 
+extern LIST_HEAD(futex_list, futex) futex_list;
+extern struct mtx futex_mtx;
+
 #define LINUX_FUTEX_WAIT	0
 #define LINUX_FUTEX_WAKE	1
 #define LINUX_FUTEX_FD		2	/* unused */

==== //depot/projects/vimage/src/sys/compat/linux/linux_mib.c#5 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.30 2008/06/03 17:50:13 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.31 2009/05/04 19:06:05 jamie Exp $");
 
 #include 
 #include 
@@ -78,7 +78,7 @@
 }
 
 SYSCTL_PROC(_compat_linux, OID_AUTO, osname,
-	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON,
+	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
 	    0, 0, linux_sysctl_osname, "A",
 	    "Linux kernel OS name");
 
@@ -100,7 +100,7 @@
 }
 
 SYSCTL_PROC(_compat_linux, OID_AUTO, osrelease,
-	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON,
+	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
 	    0, 0, linux_sysctl_osrelease, "A",
 	    "Linux kernel OS release");
 
@@ -121,7 +121,7 @@
 }
 
 SYSCTL_PROC(_compat_linux, OID_AUTO, oss_version,
-	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_PRISON,
+	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
 	    0, 0, linux_sysctl_oss_version, "I",
 	    "Linux OSS version");
 

==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#18 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.81 2009/04/26 22:06:42 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.82 2009/05/02 10:51:40 dchagin Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
@@ -859,7 +859,10 @@
 		return (EINVAL);
 
 	bsd_args.type = args->type;
-	bsd_args.protocol = args->protocol;
+	if (bsd_args.domain == AF_LOCAL && args->protocol == PF_UNIX)
+		bsd_args.protocol = 0;
+	else
+		bsd_args.protocol = args->protocol;
 	bsd_args.rsv = (int *)PTRIN(args->rsv);
 	return (socketpair(td, &bsd_args));
 }

==== //depot/projects/vimage/src/sys/conf/files#66 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1396 2009/05/01 17:16:33 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1398 2009/05/05 10:56:12 zec Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -712,6 +712,11 @@
 dev/buslogic/bt_isa.c		optional bt isa
 dev/buslogic/bt_mca.c		optional bt mca
 dev/buslogic/bt_pci.c		optional bt pci
+dev/bwi/bwiirf.c		optional bwi
+dev/bwi/bwimac.c		optional bwi
+dev/bwi/bwiphy.c		optional bwi
+dev/bwi/if_bwi.c		optional bwi
+dev/bwi/if_bwi_pci.c		optional bwi pci
 dev/cardbus/cardbus.c		optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
 dev/cardbus/cardbus_device.c	optional cardbus

==== //depot/projects/vimage/src/sys/conf/kern.post.mk#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.104 2009/01/07 09:56:54 bz Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.105 2009/05/04 20:25:56 jhb Exp $
 
 # Part of a unified Makefile for building kernels.  This part includes all
 # the definitions that need to be after all the % directives except %RULES
@@ -12,7 +12,8 @@
 .if defined(DESTDIR)
 MKMODULESENV+=	DESTDIR="${DESTDIR}"
 .endif
-MKMODULESENV+=	KERNBUILDDIR="${.CURDIR}"
+SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
+MKMODULESENV+=	KERNBUILDDIR="${.CURDIR}" SYSDIR="${SYSDIR}"
 
 .MAIN: all
 
@@ -29,7 +30,6 @@
 
 # Handle out of tree ports 
 .if !defined(NO_MODULES) && defined(PORTS_MODULES)
-SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
 PORTSMODULESENV=SYSDIR=${SYSDIR}
 .for __target in all install reinstall clean
 ${__target}: ports-${__target}

==== //depot/projects/vimage/src/sys/conf/options#48 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.667 2009/05/01 17:18:45 sam Exp $
+# $FreeBSD: src/sys/conf/options,v 1.668 2009/05/03 04:01:43 imp Exp $
 #
 #        On the handling of kernel options
 #
@@ -764,6 +764,10 @@
 AH_USE_INIPDGAIN	opt_ah.h
 AH_MAXCHAN		opt_ah.h
 
+# options for the Broadcom BCM43xx driver (bwi)
+BWI_DEBUG		opt_bwi.h
+BWI_DEBUG_VERBOSE	opt_bwi.h
+
 # options for the Marvell 8335 wireless driver
 MALO_DEBUG		opt_malo.h
 MALO_TXBUF		opt_malo.h

==== //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#11 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.74 2009/03/26 21:10:35 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.77 2009/05/03 06:25:37 mav Exp $");
 
 #include "opt_acpi.h"
 #include 
@@ -79,7 +79,6 @@
     int			 cpu_features;	/* Child driver supported features. */
     /* Runtime state. */
     int			 cpu_non_c3;	/* Index of lowest non-C3 state. */
-    int			 cpu_short_slp;	/* Count of < 1us sleeps. */
     u_int		 cpu_cx_stats[MAX_CX_STATES];/* Cx usage history. */
     /* Values for sysctl. */
     struct sysctl_ctx_list cpu_sysctl_ctx;
@@ -882,43 +881,13 @@
 	return;
     }
 
-    /*
-     * If we slept 100 us or more, use the lowest Cx state.  Otherwise,
-     * find the lowest state that has a latency less than or equal to
-     * the length of our last sleep.
-     */
-    cx_next_idx = sc->cpu_cx_lowest;
-    if (sc->cpu_prev_sleep < 100) {
-	/*
-	 * If we sleep too short all the time, this system may not implement
-	 * C2/3 correctly (i.e. reads return immediately).  In this case,
-	 * back off and use the next higher level.
-	 * It seems that when you have a dual core cpu (like the Intel Core Duo)
-	 * that both cores will get out of C3 state as soon as one of them
-	 * requires it. This breaks the sleep detection logic as the sleep
-	 * counter is local to each cpu. Disable the sleep logic for now as a
-	 * workaround if there's more than one CPU. The right fix would probably
-	 * be to add quirks for system that don't really support C3 state.
-	 */
-	if (mp_ncpus < 2 && sc->cpu_prev_sleep <= 1) {
-	    sc->cpu_short_slp++;
-	    if (sc->cpu_short_slp == 1000 && sc->cpu_cx_lowest != 0) {
-		if (sc->cpu_non_c3 == sc->cpu_cx_lowest && sc->cpu_non_c3 != 0)
-		    sc->cpu_non_c3--;
-		sc->cpu_cx_lowest--;
-		sc->cpu_short_slp = 0;
-		device_printf(sc->cpu_dev,
-		    "too many short sleeps, backing off to C%d\n",
-		    sc->cpu_cx_lowest + 1);
-	    }
-	} else
-	    sc->cpu_short_slp = 0;
-
-	for (i = sc->cpu_cx_lowest; i >= 0; i--)
-	    if (sc->cpu_cx_states[i].trans_lat <= sc->cpu_prev_sleep) {
-		cx_next_idx = i;
-		break;
-	    }
+    /* Find the lowest state that has small enough latency. */
+    cx_next_idx = 0;
+    for (i = sc->cpu_cx_lowest; i >= 0; i--) {
+	if (sc->cpu_cx_states[i].trans_lat * 3 <= sc->cpu_prev_sleep) {
+	    cx_next_idx = i;
+	    break;
+	}
     }
 
     /*
@@ -943,10 +912,10 @@
     /*
      * Execute HLT (or equivalent) and wait for an interrupt.  We can't
      * calculate the time spent in C1 since the place we wake up is an
-     * ISR.  Assume we slept one quantum and return.
+     * ISR.  Assume we slept half of quantum and return.
      */
     if (cx_next->type == ACPI_STATE_C1) {
-	sc->cpu_prev_sleep = 1000000 / hz;
+	sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 + 500000 / hz) / 4;
 	acpi_cpu_c1();
 	return;
     }
@@ -989,9 +958,9 @@
     }
     ACPI_ENABLE_IRQS();
 
-    /* Find the actual time asleep in microseconds, minus overhead. */
+    /* Find the actual time asleep in microseconds. */
     end_time = acpi_TimerDelta(end_time, start_time);
-    sc->cpu_prev_sleep = PM_USEC(end_time) - cx_next->trans_lat;
+    sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 + PM_USEC(end_time)) / 4;
 }
 
 /*
@@ -1136,8 +1105,9 @@
 	    sbuf_printf(&sb, "%u.%02u%% ", (u_int)(whole / sum),
 		(u_int)(fract / sum));
 	} else
-	    sbuf_printf(&sb, "0%% ");
+	    sbuf_printf(&sb, "0.00%% ");
     }
+    sbuf_printf(&sb, "last %dus", sc->cpu_prev_sleep);
     sbuf_trim(&sb);
     sbuf_finish(&sb);
     sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req);

==== //depot/projects/vimage/src/sys/dev/ath/if_ath.c#35 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.248 2009/04/13 20:58:47 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.249 2009/05/02 20:16:55 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -3995,12 +3995,7 @@
 
 	if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0) {
 #ifdef IEEE80211_SUPPORT_SUPERG
-		if (ic->ic_stageqdepth) {
-			ieee80211_age_stageq(ic, WME_AC_VO, 100);
-			ieee80211_age_stageq(ic, WME_AC_VI, 100);
-			ieee80211_age_stageq(ic, WME_AC_BE, 100);
-			ieee80211_age_stageq(ic, WME_AC_BK, 100);
-		}
+		ieee80211_ff_age_all(ic, 100);
 #endif
 		if (!IFQ_IS_EMPTY(&ifp->if_snd))
 			ath_start(ifp);
@@ -4980,7 +4975,7 @@
 	 * Flush fast-frame staging queue when traffic slows.
 	 */
 	if (txq->axq_depth <= 1)
-		ieee80211_flush_stageq(ic, txq->axq_ac);
+		ieee80211_ff_flush(ic, txq->axq_ac);
 #endif
 	return nacked;
 }

==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#22 (text+ko) ====

@@ -28,7 +28,7 @@
 ***************************************************************************/
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.30 2009/04/11 22:07:19 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.31 2009/05/05 10:56:12 zec Exp $");
 
 #include 
 #include 
@@ -1217,9 +1217,9 @@
  * receive window.
  */
 static __inline int
-select_rcv_wscale(int space, struct socket *so)
+select_rcv_wscale(int space, struct vnet *vnet)
 {
-	INIT_VNET_INET(so->so_vnet);
+	INIT_VNET_INET(vnet);
 	int wscale = 0;
 
 	if (space > MAX_RCV_WND)
@@ -1326,7 +1326,7 @@
 calc_opt0h(struct socket *so, int mtu_idx)
 {
 	struct tcpcb *tp = so_sototcpcb(so);
-	int wscale = select_rcv_wscale(tp->rcv_wnd, so);
+	int wscale = select_rcv_wscale(tp->rcv_wnd, so->so_vnet);
 	
 	return V_NAGLE((tp->t_flags & TF_NODELAY) == 0) |
 	    V_KEEP_ALIVE((so_options_get(so) & SO_KEEPALIVE) != 0) | F_TCAM_BYPASS |

==== //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#25 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.157 2009/04/16 23:42:00 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.158 2009/05/02 15:14:18 thompsa Exp $");
 
 #include 
 #include 
@@ -50,7 +50,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 #include 
@@ -173,7 +172,7 @@
 	int);
 static int ndis_nettype_chan	(uint32_t);
 static int ndis_nettype_mode	(uint32_t);
-static void ndis_scan		(void *, int);
+static void ndis_scan		(void *);
 static void ndis_scan_results	(struct ndis_softc *);
 static void ndis_scan_start	(struct ieee80211com *);
 static void ndis_scan_end	(struct ieee80211com *);
@@ -184,8 +183,6 @@
 static void ndis_stop		(struct ndis_softc *);
 static int ndis_ifmedia_upd	(struct ifnet *);
 static void ndis_ifmedia_sts	(struct ifnet *, struct ifmediareq *);
-static void ndis_auth		(void *, int);
-static void ndis_assoc		(void *, int);
 static int ndis_get_assoc	(struct ndis_softc *, ndis_wlan_bssid_ex **);
 static int ndis_probe_offload	(struct ndis_softc *);
 static int ndis_set_offload	(struct ndis_softc *);
@@ -741,13 +738,7 @@
 		uint32_t		arg;
 		int			r;
 
-		sc->ndis_tq = taskqueue_create("nids_taskq", M_NOWAIT | M_ZERO,
-		    taskqueue_thread_enqueue, &sc->ndis_tq);
-		taskqueue_start_threads(&sc->ndis_tq, 1, PI_NET, "%s taskq",
-		    device_get_nameunit(dev));
-		TASK_INIT(&sc->ndis_scantask, 0, ndis_scan, sc);
-		TASK_INIT(&sc->ndis_authtask, 0, ndis_auth, sc);
-		TASK_INIT(&sc->ndis_assoctask, 0, ndis_assoc, sc);
+		callout_init(&sc->ndis_scan_callout, CALLOUT_MPSAFE);
 
 		ifp->if_ioctl = ndis_ioctl_80211;
 		ic->ic_ifp = ifp;
@@ -1054,12 +1045,6 @@
 	} else
 		NDIS_UNLOCK(sc);
 
-	if (sc->ndis_80211) {
-		taskqueue_drain(sc->ndis_tq, &sc->ndis_scantask);
-		taskqueue_drain(sc->ndis_tq, &sc->ndis_authtask);
-		taskqueue_drain(sc->ndis_tq, &sc->ndis_assoctask);
-	}
-
 	if (sc->ndis_tickitem != NULL)
 		IoFreeWorkItem(sc->ndis_tickitem);
 	if (sc->ndis_startitem != NULL)
@@ -1121,8 +1106,6 @@
 	if (sc->ndis_iftype == PCIBus)
 		bus_dma_tag_destroy(sc->ndis_parent_tag);
 
-	if (sc->ndis_80211)
-		taskqueue_free(sc->ndis_tq);
 	return(0);
 }
 
@@ -2419,30 +2402,6 @@
 }
 
 static void
-ndis_auth(void *arg, int npending)
-{
-	struct ndis_softc *sc = arg;
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211com *ic = ifp->if_l2com;
-	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-
-	vap->iv_state = IEEE80211_S_AUTH;
-	ndis_auth_and_assoc(sc, vap);
-}
-
-static void
-ndis_assoc(void *arg, int npending)
-{
-	struct ndis_softc *sc = arg;
-	struct ifnet *ifp = sc->ifp;
-	struct ieee80211com *ic = ifp->if_l2com;
-	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-
-	vap->iv_state = IEEE80211_S_ASSOC;
-	ndis_auth_and_assoc(sc, vap);
-}
-
-static void
 ndis_auth_and_assoc(sc, vap)
 	struct ndis_softc	*sc;
 	struct ieee80211vap	*vap;
@@ -2656,9 +2615,6 @@
 	if (rval)
 		device_printf (sc->ndis_dev, "set ssid failed: %d\n", rval);
 
-	if (vap->iv_state == IEEE80211_S_AUTH)
-		ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
-
 	return;
 }
 
@@ -3304,13 +3260,18 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From zec at FreeBSD.org  Tue May  5 12:03:34 2009
From: zec at FreeBSD.org (Marko Zec)
Date: Tue May  5 12:03:42 2009
Subject: PERFORCE change 161614 for review
Message-ID: <200905051203.n45C3CPS039594@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161614

Change 161614 by zec@zec_tpx32 on 2009/05/05 12:03:05

	Unbreak GENERIC builds (VIMAGE still broken).

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#87 edit
.. //depot/projects/vimage/src/sys/kern/uipc_socket.c#33 edit
.. //depot/projects/vimage/src/sys/net/if_var.h#36 edit
.. //depot/projects/vimage/src/sys/sys/vimage.h#91 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#87 (text+ko) ====


==== //depot/projects/vimage/src/sys/kern/uipc_socket.c#33 (text+ko) ====

@@ -2065,7 +2065,7 @@
 soshutdown(struct socket *so, int how)
 {
 	struct protosw *pr = so->so_proto;
-	int error;
+	int error = 0;
 
 	if (!(how == SHUT_RD || how == SHUT_WR || how == SHUT_RDWR))
 		return (EINVAL);
@@ -2075,13 +2075,11 @@
 	if (how != SHUT_WR)
 		sorflush(so);
 	if (how != SHUT_RD) {
-		int error;
 		CURVNET_SET(so->so_vnet);
 		error = (*pr->pr_usrreqs->pru_shutdown)(so);
 		CURVNET_RESTORE();
-		return (error);
 	}
-	return (0);
+	return (error);
 }
 
 void

==== //depot/projects/vimage/src/sys/net/if_var.h#36 (text+ko) ====

@@ -172,7 +172,6 @@
 		(struct ifnet *, struct mbuf *);
 	void	(*if_reassign)		/* reassign to vnet routine */
 		(struct ifnet *, struct vnet *, char *);
-	struct	vnet *if_vnet;		/* network stack instance */
 	struct	vnet *if_home_vnet;	/* where this ifnet originates from */
 	struct	ifaddr	*if_addr;	/* pointer to link-level address */
 	void	*if_llsoftc;		/* link layer softc */

==== //depot/projects/vimage/src/sys/sys/vimage.h#91 (text+ko) ====

@@ -34,15 +34,8 @@
 #define	_SYS_VIMAGE_H_
 
 #include 
-#include 
-#include 
-#include 
-#include 
+#include 
 
-#ifdef INVARIANTS
-#define VNET_DEBUG
-#endif
-
 #if defined(VIMAGE) && defined(VIMAGE_GLOBALS)
 #error "You cannot have both option VIMAGE and option VIMAGE_GLOBALS!"
 #endif
@@ -54,31 +47,10 @@
 typedef int vnet_attach_fn(const void *);
 typedef int vnet_detach_fn(const void *);
 
-struct	vimage;
-struct	vprocg;
-struct	vnet;
-struct	vi_req;
-struct	kld_sym_lookup; 
+#ifndef VIMAGE_GLOBALS
 
-struct	ifnet;		/* XXX must go away */
-
-#ifdef VIMAGE_GLOBALS
-#define	VSYM(base, sym) (sym)
-#else
-#ifdef VIMAGE
-#define VSYM(base, sym) ((base)->_##sym)
-#else
-#define	VSYM(base, sym) (base ## _0._ ## sym)
-#endif
-#endif
+struct kld_sym_lookup;
 
-#ifdef VIMAGE
-#define curvnet curthread->td_vnet
-#else
-#define curvnet NULL
-#endif
-
-#ifndef VIMAGE_GLOBALS
 struct vnet_symmap {
 	char	*name;
 	size_t	 offset;
@@ -104,18 +76,6 @@
 	const char			*vml_iname;
 };
 
-#ifdef VIMAGE
-#define	VNET_SYMMAP(mod, name)						\
-	{ #name, offsetof(struct vnet_ ## mod, _ ## name),		\
-	sizeof(((struct vnet_ ## mod *) curthread)->_ ## name) }
-#else
-#define	VNET_SYMMAP(mod, name)						\
-	{ #name, (size_t) &(vnet_ ## mod ## _0._ ## name),		\
-	sizeof(vnet_ ## mod ## _0._ ## name) }
-#endif
-
-#define	VNET_SYMMAP_END		{ NULL, 0 }
-
 /* Stateful modules. */
 #define	VNET_MOD_NET		 0	/* MUST be 0 - implicit dependency */
 #define	VNET_MOD_NETGRAPH	 1
@@ -162,35 +122,17 @@
 #define	V_MOD_vnet_gif		VNET_MOD_GIF
 #define	V_MOD_vnet_ipsec	VNET_MOD_IPSEC
 
-#define basevnet thread0.td_ucred->cr_vimage->v_net
-#define basevprocg thread0.td_ucred->cr_vimage->v_procg
-#define basevcpu thread0.td_ucred->cr_vimage->v_cpu
-
-#define	V_GLOBAL	0
-#define	V_NET		1
-#define	V_PROCG		2
-#define	V_CPU		3
-
-#define V_MOD_vprocg		0
-#define V_MOD_vcpu		0
+int	vi_symlookup(struct kld_sym_lookup *, char *);
+void	vnet_mod_register(const struct vnet_modinfo *);
+void	vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *);
+void	vnet_mod_deregister(const struct vnet_modinfo *);
+void	vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *);
 
-#ifdef VIMAGE
-struct vnet {
-	void	*mod_data[VNET_MOD_MAX];
-
-	u_int	vnet_ref;		/* reference count */
-	LIST_ENTRY(vnet) vnet_le;	/* all vnets list */
-	u_int	vnet_id;		/* ID num */
-
-	u_int	ifccnt;
-	u_int	sockcnt;
-
-	u_int	vnet_magic_n;
-};
-#endif /* VIMAGE */
 #endif /* !VIMAGE_GLOBALS */
 
-#define VNET_MAGIC_N 0x3e0d8f29
+#ifdef VIMAGE_GLOBALS
+#define	VSYM(base, sym) (sym)
+#else
 #ifdef VIMAGE
 #define	VSYM(base, sym) ((base)->_ ## sym)
 #else
@@ -225,6 +167,16 @@
 };
 #endif
 
+struct vprocg {
+	LIST_ENTRY(vprocg) vprocg_le;
+	u_int		vprocg_ref;	/* reference count */
+	u_int		vprocg_id;	/* ID num */
+	u_int		nprocs;
+	char		_hostname[MAXHOSTNAMELEN];
+	char		_domainname[MAXHOSTNAMELEN];
+	int		_morphing_symlinks;
+};
+
 #ifdef VIMAGE
 #define curvnet curthread->td_vnet
 #else
@@ -285,62 +237,37 @@
 
 #ifdef VIMAGE
 #ifdef VNET_DEBUG
- 
-#define INIT_FROM_VNET(vnet, modindex, modtype, sym)			\
-	if (vnet != curvnet) 						\
+#define	INIT_FROM_VNET(vnet, modindex, modtype, sym)			\
+	if (vnet == NULL || vnet != curvnet)				\
 		panic("in %s:%d %s()\n vnet=%p curvnet=%p",		\
 		    __FILE__, __LINE__, __FUNCTION__,			\
 		    vnet, curvnet);					\
 	modtype *sym = (vnet)->mod_data[modindex];
 #else /* !VNET_DEBUG */
-#define VNET_ASSERT(condition)
-
-#define CURVNET_SET(arg)						\
-	struct vnet *saved_vnet = curvnet;				\
-	curvnet = arg;	
- 
-#define CURVNET_SET_VERBOSE(arg)	CURVNET_SET(arg)
-#define CURVNET_SET_QUIET(arg)		CURVNET_SET(arg)
- 
-#define CURVNET_RESTORE()						\
-	curvnet = saved_vnet;
- 
-#define INIT_FROM_VNET(vnet, modindex, modtype, sym)			\
+#define	INIT_FROM_VNET(vnet, modindex, modtype, sym)			\
 	modtype *sym = (vnet)->mod_data[modindex];
 #endif /* !VNET_DEBUG */
+#else /* !VIMAGE */
+#define	INIT_FROM_VNET(vnet, modindex, modtype, sym)
+#endif
 
-#define VNET_ITERATOR_DECL(arg)	struct vnet *arg;
-#define VNET_FOREACH(arg) LIST_FOREACH(arg, &vnet_head, vnet_le)
+#ifdef VIMAGE
+LIST_HEAD(vnet_list_head, vnet);
+extern struct vnet_list_head vnet_head;
+#define	VNET_ITERATOR_DECL(arg) struct vnet *arg;
+#define	VNET_FOREACH(arg) LIST_FOREACH(arg, &vnet_head, vnet_le)
+#else
+#define	VNET_ITERATOR_DECL(arg)
+#define	VNET_FOREACH(arg)
+#endif
 
-#define INIT_VPROCG(arg)	struct vprocg *vprocg = (arg);
-
-#define VPROCG_ITERLOOP_BEGIN()						\
-	struct vprocg *vprocg_iter;					\
-	LIST_FOREACH(vprocg_iter, &vprocg_head, vprocg_le) {		\
-
-#define VPROCG_ITERLOOP_END()						\
-	}								\
-
-#define INIT_VCPU(arg)		struct vcpu *vcpu = (arg);
-
-#define TD_TO_VIMAGE(td)	(td)->td_ucred->cr_vimage
-#define TD_TO_VNET(td)		(td)->td_ucred->cr_vimage->v_net
-#define TD_TO_VPROCG(td)	(td)->td_ucred->cr_vimage->v_procg
-#define TD_TO_VCPU(td)		(td)->td_ucred->cr_vimage->v_cpu
-#define P_TO_VIMAGE(p)		(p)->p_ucred->cr_vimage
-#define P_TO_VNET(p)		(p)->p_ucred->cr_vimage->v_net
-#define P_TO_VPROCG(p)		(p)->p_ucred->cr_vimage->v_procg
-#define P_TO_VCPU(p)		(p)->p_ucred->cr_vimage->v_cpu
+#define	TD_TO_VNET(td)	(td)->td_ucred->cr_vnet
 
-#else /* !VIMAGE */
-
 /* Non-VIMAGE null-macros */
 #define	IS_DEFAULT_VNET(arg) 1
 #define	VNET_LIST_RLOCK()
 #define	VNET_LIST_RUNLOCK()
 #define	INIT_VPROCG(arg)
-#define	VPROCG_ITERLOOP_BEGIN()
-#define	VPROCG_ITERLOOP_END()
 #define	INIT_VCPU(arg)
 #define	TD_TO_VIMAGE(td)
 #define	TD_TO_VPROCG(td)
@@ -350,160 +277,13 @@
 #define	P_TO_VPROCG(p)
 #define	P_TO_VCPU(p)
 
-#endif /* !VIMAGE */
-
 /* XXX those defines bellow should probably go into vprocg.h and vcpu.h */
-#define	VPROCG(sym)		VSYM(vprocg, sym)
-#define	VCPU(sym)		VSYM(vcpu, sym)
+#define	VPROCG(sym)		(sym)
+#define	VCPU(sym)		(sym)
 
-#define V_hostname		VPROCG(hostname)
-#ifdef VIMAGE
-#define G_hostname		VSYM(basevprocg, hostname) /* global hostname */
-#else
-#define G_hostname		VSYM(vprocg, hostname) /* global hostname */
-#endif
-#define V_domainname		VPROCG(domainname)
-#define V_morphing_symlinks	VPROCG(morphing_symlinks)
-
-#define V_acc_statcalls		VCPU(acc_statcalls)
-#define V_avg1_fixp		VCPU(avg1_fixp)
-#define V_avg2_fixp		VCPU(avg2_fixp)
-
-#ifndef VIMAGE_GLOBALS
-void vnet_mod_register(const struct vnet_modinfo *);
-void vnet_mod_deregister(const struct vnet_modinfo *);
-void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *);
-void vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *);
-int vi_symlookup(struct kld_sym_lookup *, char *);
-#endif
-
-#ifdef VIMAGE
-int	vi_td_ioctl(u_long, struct vi_req *, struct thread *);
-int	vi_if_move(struct vi_req *, struct ifnet *, struct vimage *);
-void	if_reassign_common(struct ifnet *, struct vnet *, const char *);
-
-struct	vimage *vnet2vimage(struct vnet *);
-struct	vimage *vimage_by_name(struct vimage *, char *);
-char	*vnet_name(struct vnet *);
-int	vi_child_of(struct vimage *, struct vimage *);
-
-LIST_HEAD(vimage_list_head, vimage);
-extern struct vimage_list_head vimage_head;
-
-LIST_HEAD(vprocg_list_head, vprocg);
-extern struct vprocg_list_head vprocg_head;
-
-LIST_HEAD(vcpu_list_head, vcpu);
-extern struct vcpu_list_head vcpu_head;
-
-LIST_HEAD(vnet_list_head, vnet);
-extern struct vnet_list_head vnet_head;
-extern int vnet_list_refc;
-extern struct mtx vnet_list_refc_mtx;
-extern struct cv vnet_list_condvar;
-extern struct mtx vcpu_list_mtx;
-
-#define VNET_LIST_RLOCK() do {						\
-	mtx_lock(&vnet_list_refc_mtx);					\
-	vnet_list_refc++;						\
-	mtx_unlock(&vnet_list_refc_mtx);				\
-} while (0)
-
-#define VNET_LIST_RUNLOCK() do {					\
-	mtx_lock(&vnet_list_refc_mtx);					\
-	vnet_list_refc--;						\
-	mtx_unlock(&vnet_list_refc_mtx);				\
-	cv_signal(&vnet_list_condvar);					\
-} while (0)
-
-#define IS_DEFAULT_VIMAGE(arg)		((arg)->vi_id == 0)
-#define IS_DEFAULT_VNET(arg)		((arg)->vnet_id == 0)
-
-struct vimage {
-	LIST_ENTRY(vimage) vi_le;	/* all vimage list */
-	LIST_ENTRY(vimage) vi_sibling;	/* vimages with same parent */
-	LIST_HEAD(, vimage) vi_child_head;	/* direct offspring list */
-	struct	vimage *vi_parent;	/* ptr to parent vimage */
-	u_int	vi_id;			/* ID num */
-	u_int	vi_ucredrefc;		/* refc of ucreds pointing to us */
-
-	char	vi_name[MAXHOSTNAMELEN]; /* assigned by parent */
-
-	struct	vprocg *v_procg;
-	struct	vcpu *v_cpu;
-	struct	vnet *v_net;
-};
-
-#endif /* VIMAGE */
-
-struct vprocg {
-	LIST_ENTRY(vprocg) vprocg_le;
-	u_int	vprocg_ref;		/* reference count */
-	u_int	vprocg_id;		/* ID num */
-
-	u_int	nprocs;	
-
-	char	_hostname[MAXHOSTNAMELEN];
-	char	_domainname[MAXHOSTNAMELEN];
-
-	int	_morphing_symlinks;
-};
-
-struct vcpu {
-	LIST_ENTRY(vcpu) vcpu_le;
-	u_int	vcpu_ref;		/* reference count */
-	u_int	vcpu_id;		/* ID num */
-
-	u_int	_acc_statcalls;		/* statclocks since last avg update*/
-	u_int	_avg1_fixp;		/* "fast" avg in 16:16 bit fixedpoint */
-	u_int	_avg2_fixp;		/* "slow" avg in 16:16 bit fixedpoint */
-};
-
-#ifndef VIMAGE_GLOBALS
-#ifndef VIMAGE
-extern struct vprocg vprocg_0;
-#endif
-#endif
-
-struct vi_req {
-	int	req_action;		/* What to do with this reqest? */
-	u_int	vi_cpu_min;		/* Guaranteed CPU share */
-	u_int	vi_cpu_max;		/* Maximum average CPU usage */
-	u_int	vi_cpu_weight;		/* Prop. share scheduling priority */
-	int	vi_intr_limit;		/* Limit on CPU usage in intr ctx */
-	int	vi_maxsockets;
-	u_short vi_proc_limit;		/* max. number of processes */
-	u_short vi_proc_count;		/* current number of processes */
-	u_short vi_child_limit;		/* max. number of child vnets */
-	u_short vi_child_count;		/* current number of child vnets */
-	int	vi_if_count;		/* current number network interfaces */
-	int	vi_sock_count;
-	char	vi_name[MAXPATHLEN];
-	char	vi_chroot[MAXPATHLEN];
-	char	vi_if_xname[MAXPATHLEN]; /* XXX should be IFNAMSIZ */
-	u_int	cp_time_avg;
-	struct	loadavg averunnable;
-};
-
-#define VI_CREATE		0x00000001
-#define VI_DESTROY		0x00000002
-#define VI_MODIFY		0x00000004
-#define VI_SWITCHTO		0x00000008
-#define VI_IFACE		0x00000010
-
-#define VI_GET			0x00000100
-#define VI_GETNEXT		0x00000200
-#define VI_GETNEXT_RECURSE	0x00000300
-
-#define VI_SET_CPU_MIN		0x00001000
-#define VI_SET_CPU_MAX		0x00002000
-#define VI_SET_CPU_WEIGHT	0x00004000
-#define VI_SET_INTR_LIMIT	0x00008000
-#define VI_SET_PROC_LIMIT	0x00010000
-#define VI_SET_CHILD_LIMIT	0x00020000
-#define VI_SET_SOCK_LIMIT	0x00040000
-#define VI_SET_NAME		0x00100000
-#define VI_SET_CHROOT		0x00200000
+#define	V_hostname		VPROCG(hostname)
+#define	G_hostname		VPROCG(hostname) /* global hostname */
+#define	V_domainname		VPROCG(domainname)
 
 /*
  * Size-guards for the vimage structures.
From hselasky at FreeBSD.org  Tue May  5 12:47:59 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue May  5 12:48:05 2009
Subject: PERFORCE change 161615 for review
Message-ID: <200905051247.n45Clv8P052914@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161615

Change 161615 by hselasky@hselasky_laptop001 on 2009/05/05 12:47:20

	
	USB controller: UHCI fix: Make sure the frame list base address
	is re-programmed after stopping the USB schedule, in case
	the hardware clears the frame list base address.
	
	Patch done by:		HPS
	Issue reported by:	Chao Shin

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#14 (text+ko) ====

@@ -132,6 +132,7 @@
 extern struct usb2_pipe_methods uhci_device_intr_methods;
 extern struct usb2_pipe_methods uhci_device_isoc_methods;
 
+static uint8_t	uhci_restart(uhci_softc_t *sc);
 static void	uhci_do_poll(struct usb2_bus *);
 static void	uhci_device_done(struct usb2_xfer *, usb2_error_t);
 static void	uhci_transfer_intr_enqueue(struct usb2_xfer *);
@@ -246,10 +247,51 @@
 	ml->buf_offset += td->len;
 }
 
+/*
+ * Return values:
+ * 0: Success
+ * Else: Failure
+ */
+static uint8_t
+uhci_restart(uhci_softc_t *sc)
+{
+	struct usb2_page_search buf_res;
+
+	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
+
+  	if (UREAD2(sc, UHCI_CMD) & UHCI_CMD_RS) {
+		DPRINTFN(2, "Already started\n");
+		return (0);
+	}
+
+	DPRINTFN(2, "Restarting\n");
+
+	usb2_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
+
+	/* Reload fresh base address */
+	UWRITE4(sc, UHCI_FLBASEADDR, buf_res.physaddr);
+
+	/*
+	 * Assume 64 byte packets at frame end and start HC controller:
+	 */
+	UHCICMD(sc, (UHCI_CMD_MAXP | UHCI_CMD_RS));
+
+	/* wait 10 milliseconds */
+
+	usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
+
+	/* check that controller has started */
+
+	if (UREAD2(sc, UHCI_STS) & UHCI_STS_HCH) {
+		DPRINTFN(2, "Failed\n");
+		return (1);
+	}
+	return (0);
+}
+
 void
 uhci_reset(uhci_softc_t *sc)
 {
-	struct usb2_page_search buf_res;
 	uint16_t n;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
@@ -309,8 +351,6 @@
 done_2:
 
 	/* reload the configuration */
-	usb2_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
-	UWRITE4(sc, UHCI_FLBASEADDR, buf_res.physaddr);
 	UWRITE2(sc, UHCI_FRNUM, sc->sc_saved_frnum);
 	UWRITE1(sc, UHCI_SOF, sc->sc_saved_sof);
 
@@ -337,30 +377,11 @@
 	    UHCI_INTR_IOCE |
 	    UHCI_INTR_SPIE));
 
-	/*
-	 * assume 64 byte packets at frame end and start HC controller
-	 */
-
-	UHCICMD(sc, (UHCI_CMD_MAXP | UHCI_CMD_RS));
-
-	uint8_t n = 10;
-
-	while (n--) {
-		/* wait one millisecond */
-
-		usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
-
-		/* check that controller has started */
-
-		if (!(UREAD2(sc, UHCI_STS) & UHCI_STS_HCH)) {
-			goto done;
-		}
+	if (uhci_restart(sc)) {
+		device_printf(sc->sc_bus.bdev,
+		    "cannot start HC controller\n");
 	}
 
-	device_printf(sc->sc_bus.bdev,
-	    "cannot start HC controller\n");
-
-done:
 	/* start root interrupt */
 	uhci_root_intr(sc);
 }
@@ -2389,16 +2410,8 @@
 	 * Before we do anything, turn on SOF messages on the USB
 	 * BUS. Some USB devices do not cope without them!
 	 */
-  	if (!(UREAD2(sc, UHCI_CMD) & UHCI_CMD_RS)) {
-
-		DPRINTF("Activating SOFs!\n");
-
-		UHCICMD(sc, (UHCI_CMD_MAXP | UHCI_CMD_RS));
+	uhci_restart(sc);
 
-		/* wait a little bit */
-		usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
-	}
-
 	x = URWMASK(UREAD2(sc, port));
 	UWRITE2(sc, port, x | UHCI_PORTSC_PR);
 
@@ -3194,11 +3207,11 @@
 	    USB_HW_POWER_INTERRUPT |
 	    USB_HW_POWER_ISOC)) {
 		DPRINTF("Some USB transfer is "
-		    "active on %u.\n",
+		    "active on unit %u.\n",
 		    device_get_unit(sc->sc_bus.bdev));
-		UHCICMD(sc, (UHCI_CMD_MAXP | UHCI_CMD_RS));
+		uhci_restart(sc);
 	} else {
-		DPRINTF("Power save on %u.\n",
+		DPRINTF("Power save on unit %u.\n",
 		    device_get_unit(sc->sc_bus.bdev));
 		UHCICMD(sc, UHCI_CMD_MAXP);
 	}
From pgj at FreeBSD.org  Tue May  5 16:25:43 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Tue May  5 16:25:53 2009
Subject: PERFORCE change 161623 for review
Message-ID: <200905051625.n45GPgWh074709@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=161623

Change 161623 by pgj@beehive on 2009/05/05 16:24:51

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#27 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#21 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#21 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/snb.key#1 branch
.. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#6 integrate
.. //depot/projects/docproj_hu/www/en/about.sgml#2 integrate
.. //depot/projects/docproj_hu/www/en/cgi/man.cgi#13 integrate
.. //depot/projects/docproj_hu/www/en/developers.sgml#23 integrate
.. //depot/projects/docproj_hu/www/en/releases/7.2R/announce.sgml#3 integrate
.. //depot/projects/docproj_hu/www/en/releases/7.2R/errata.html#3 integrate
.. //depot/projects/docproj_hu/www/en/releng/index.sgml#24 integrate
.. //depot/projects/docproj_hu/www/hu/security/security.sgml#9 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#53 integrate
.. //depot/projects/docproj_hu/www/share/sgml/press.xml#16 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#27 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.476 2009/04/05 17:51:17 rmacklem Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.477 2009/05/05 09:13:27 snb Exp $
 -->
 
 aaron@FreeBSD.org">
@@ -1004,6 +1004,8 @@
 
 smpatel@FreeBSD.org">
 
+snb@FreeBSD.org">
+
 sobomax@FreeBSD.org">
 
 sos@FreeBSD.org">

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#21 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
     
@@ -59,6 +59,11 @@
       &pgpkey.jhb;
     
 
+    
+      &a.snb;
+      &pgpkey.snb;
+    
+
     
       &a.barner;
       &pgpkey.barner;

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#21 (text+ko) ====

@@ -1,5 +1,5 @@
 
-
+
 
 
 
@@ -266,6 +266,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#6 (text+ko) ====

@@ -37,7 +37,7 @@
     The &os; Project
     
 
-    $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.12 2009/05/03 21:21:17 hrs Exp $
+    $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.13 2009/05/04 19:00:25 hrs Exp $
 
     
       2008
@@ -167,19 +167,28 @@
       bootable and fall through to booting off the next boot device.
       All affected machines did see the other discs as bootable.  As a
       workaround, you can boot using the bootonly or livefs CDROM and
-      then swap in disc1 once sysinstall starts.
+      then swap in disc1 once &man.sysinstall.8; starts.
 
     [20090504] A lock handling error has been found in
       interaction between &man.malloc.3; implementation and threading
       library.  When a multi-threaded process calls the &man.fork.2;
       system call in a thread and the &man.malloc.3; function in
       another thread, it can cause a deadlock in the child process.
-      An Errata Notice to fix this problem is planned for this problem
-      after the release.
+      An Errata Notice to fix this problem is planned after the
+      release.
+
+    [20090505] A bug was found in the &man.bce.4; driver.  This
+      prevents it from working with the &man.lagg.4; driver in the
+      LACP (IEEE 802.3ad Link Aggregation Control Protocol) mode.  An
+      Errata Notice to fix this problem is planned after the
+      release.
 
   
     Late-Breaking News and Corrections
 
-    No news.
+    [20090504] A patch to solve the locking issue in the
+      &man.malloc.3; implementation and threading library has been
+      committed to the RELENG_7 branch for public
+      testing.
   
 

==== //depot/projects/docproj_hu/www/en/about.sgml#2 (text+ko) ====

@@ -1,5 +1,5 @@
 
+
 
 
 ]>
@@ -55,7 +55,7 @@
 		      
Run a huge number of
 			  applications

 
-		      With over 17,000 ported libraries and With over 20,000 ported libraries and applications,
 			FreeBSD supports applications for desktop, server,
 			appliance, and embedded environments.

==== //depot/projects/docproj_hu/www/en/cgi/man.cgi#13 (text+ko) ====

@@ -34,7 +34,7 @@
 # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995
 #
 # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $
-# $FreeBSD: www/en/cgi/man.cgi,v 1.231 2009/05/02 21:40:43 wosch Exp $
+# $FreeBSD: www/en/cgi/man.cgi,v 1.232 2009/05/04 07:32:07 wosch Exp $
 
 ############################################################################
 # !!! man.cgi is stale perl4 code !!!
@@ -160,18 +160,19 @@
 );
 
 $manLocalDir    = '/usr/local/www/bsddoc/man';
-$manPathDefault = 'FreeBSD 7.1-RELEASE';
+$manPathDefault = 'FreeBSD 7.2-RELEASE';
 
 %manPath = (
-    'FreeBSD 7.1-RELEASE and Ports',
-"$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
+    'FreeBSD 7.2-RELEASE and Ports',
+"$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
     'FreeBSD 6.4-RELEASE and Ports',
 "$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
 
     'FreeBSD Ports', "$manLocalDir/FreeBSD-ports",
     'FreeBSD 8-current', "$manLocalDir/FreeBSD-8-current/man:$manLocalDir/FreeBSD-8-current/openssl/man",
 
-    'FreeBSD 7.1-stable', "$manLocalDir/FreeBSD-7.1-stable",
+    'FreeBSD 7.2-stable', "$manLocalDir/FreeBSD-7.2-stable",
+    'FreeBSD 7.2-RELEASE', "$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man",
     'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man",
     'FreeBSD Ports 7.1-RELEASE', "$manLocalDir/FreeBSD-ports-7.1-RELEASE",
 
@@ -470,15 +471,15 @@
 
 # keywords must be in lower cases.
 %manPathAliases = (
-    'freebsd',         'FreeBSD 7.1-RELEASE',
-    'freebsd-release', 'FreeBSD 7.1-RELEASE',
+    'freebsd',         'FreeBSD 7.2-RELEASE',
+    'freebsd-release', 'FreeBSD 7.2-RELEASE',
 
-    'freebsd-stable',  'FreeBSD 7.1-stable',
-    'freebsd-stable7', 'FreeBSD 7.1-stable',
+    'freebsd-stable',  'FreeBSD 7.2-stable',
+    'freebsd-stable7', 'FreeBSD 7.2-stable',
     'freebsd-stable6', 'FreeBSD 6.4-stable',
 
     'freebsd-current',       'FreeBSD 8-current',
-    'freebsd-release-ports', 'FreeBSD 7.1-RELEASE and Ports',
+    'freebsd-release-ports', 'FreeBSD 7.2-RELEASE and Ports',
 
     'slackware',  'Linux Slackware 3.1',
     'redhat',     'Red Hat Linux/i386 9',
@@ -1383,7 +1384,7 @@
     }
 
     local $id =
-      '$FreeBSD: www/en/cgi/man.cgi,v 1.231 2009/05/02 21:40:43 wosch Exp $';
+      '$FreeBSD: www/en/cgi/man.cgi,v 1.232 2009/05/04 07:32:07 wosch Exp $';
     return qq{\
  Copyright (c) 1996-2008 Wolfram Schneider

==== //depot/projects/docproj_hu/www/en/developers.sgml#23 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.218 2009/04/05 18:06:29 rmacklem Exp $
+$FreeBSD: www/en/developers.sgml,v 1.219 2009/05/05 09:23:45 snb Exp $
 
 -->
 
@@ -502,6 +502,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_hu/www/en/releases/7.2R/announce.sgml#3 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -32,16 +32,16 @@
     see the online release notes and errata list, available at:
 
   
-    http://www.FreeBSD.org/releases/7.2R/relnotes.html
+    http://www.FreeBSD.org/releases/7.2R/relnotes.html
 
-    http://www.FreeBSD.org/releases/7.2R/errata.html
+    http://www.FreeBSD.org/releases/7.2R/errata.html
   
 
   For more information about FreeBSD release engineering
     activities, please see:
 
   
-    http://www.FreeBSD.org/releng/
+    http://www.FreeBSD.org/releng/
   
 
   Availability
@@ -105,8 +105,8 @@
     7.2-based products is:
 
   
-    FreeBSD Mall, Inc. http://www.freebsdmall.com/
+    FreeBSD Mall, Inc. http://www.freebsdmall.com/
   
 
   BitTorrent
@@ -115,8 +115,8 @@
     torrent files to download the images is available at:
 
   
-    http://torrents.FreeBSD.org:8080/
+    http://torrents.FreeBSD.org:8080/
   
 
   FTP
@@ -125,30 +125,30 @@
     FreeBSD 7.2-RELEASE available.
 
   
-    ftp://ftp.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp1.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp5.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp10.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp12.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp13.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp14.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp.dk.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp.gr.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp1.ru.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp.tw.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp4.tw.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp.uk.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp3.us.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp7.us.FreeBSD.org/pub/FreeBSD/
-    ftp://ftp10.us.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp1.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp5.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp10.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp12.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp13.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp14.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.dk.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.gr.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp1.ru.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.tw.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp4.tw.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp.uk.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp3.us.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp7.us.FreeBSD.org/pub/FreeBSD/
+    ftp://ftp10.us.FreeBSD.org/pub/FreeBSD/
   
 
   However before trying these sites please check your regional
     mirror(s) first by going to:
 
   
-    ftp://ftp.<yourdomain>.FreeBSD.org/pub/FreeBSD
+    ftp://ftp.<yourdomain>.FreeBSD.org/pub/FreeBSD
   
 
   Any additional mirror sites will be labeled
@@ -157,8 +157,8 @@
   
More information about FreeBSD mirror sites can be found at:
 
   
-    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html
   
 
   For instructions on installing FreeBSD, please see Chapter 2 of
@@ -167,8 +167,8 @@
     at:
 
   
-    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html
   
 
   Updates from Source
@@ -177,11 +177,11 @@
     FreeBSD Handbook:
 
   
-    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/synching.html
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/synching.html
 
-    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
+    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
   
 
   The branch tag to use for updating the source is RELENG_7_2.
@@ -224,8 +224,8 @@
     FreeBSD Update, see:
 
   
-    http://www.daemonology.net/blog/2007-11-11-freebsd-major-version-upgrade.html
+    http://www.daemonology.net/blog/2007-11-11-freebsd-major-version-upgrade.html
   
 
   Support
@@ -235,8 +235,8 @@
     Team and their support of the various FreeBSD branches see:
 
   
-    http://www.FreeBSD.org/security/
+    http://www.FreeBSD.org/security/
   
 
   Acknowledgments

==== //depot/projects/docproj_hu/www/en/releases/7.2R/errata.html#3 (text+ko) ====

@@ -19,7 +19,7 @@
 Copyright © 2008, 2009 The FreeBSD Documentation Project
 
 $FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml
-191769 2009-05-03 21:21:17Z hrs $

+191791 2009-05-04 19:00:25Z hrs $

 
 
 
@@ -97,7 +97,10 @@
 [20090501] Some machines do not recognize the i386 disc1 as bootable and fall through
 to booting off the next boot device. All affected machines did see the other discs as
 bootable. As a workaround, you can boot using the bootonly or livefs CDROM and then swap
-in disc1 once sysinstall starts.
+in disc1 once 
+sysinstall(8)
+starts.
 
 [20090504] A lock handling error has been found in interaction between 
@@ -109,7 +112,16 @@
 href="http://www.FreeBSD.org/cgi/man.cgi?query=malloc&sektion=3&manpath=FreeBSD+7.2-stable">
 malloc(3)
 function in another thread, it can cause a deadlock in the child process. An Errata
-Notice to fix this problem is planned for this problem after the release.
+Notice to fix this problem is planned after the release.
+
+[20090505] A bug was found in the bce(4) driver. This
+prevents it from working with the 
+lagg(4) driver
+in the LACP (IEEE 802.3ad Link Aggregation Control Protocol) mode. An Errata Notice to
+fix this problem is planned after the release.
 
 
 
@@ -117,7 +129,11 @@
 4 Late-Breaking News and
 Corrections
 
-No news.
+[20090504] A patch to solve the locking issue in the 
+malloc(3)
+implementation and threading library has been committed to the RELENG_7 branch for public testing.
 
 

Versie & platform		Distributie	ISO	Release notes	Uitgave notities	Hardware notities	Installatie notities	Errata
FreeBSD &rel.current;-RELEASE		&os; &rel.current;-RELEASE				[Bekijk]	[Bekijk]	[Bekijk]
FreeBSD &rel2.current;-RELEASE		&os; &rel2.current;-RELEASE				[Bekijk]	[Bekijk]
FreeBSD &betarel.current;-&betarel.vers;		&os; &betarel.current;-&betarel.vers;				[Bekijk]	[Bekijk]
Versie & platform		Distributie	ISO	ISO	Uitgave notities	Hardware notities	Installatie notities
&os; &rel.current;-RELEASE				[Bekijk]	[Bekijk]	[Bekijk]	[Bekijk]	[Bekijk]	[Bekijk]	[Bekijk]	[Bekijk]
	alpha	[Distributie]	[ISO]	[Bekijk]	[Bekijk]	[Bekijk]
	amd64	[Distributie]	[ISO]	[Bekijk]	[Bekijk]	[Bekijk]
	i386	[Distributie]	[ISO]	[Bekijk]	[Bekijk]	[Bekijk]
	ia64	[Distributie]	[ISO]	[Bekijk]	[Bekijk]	[Bekijk]
	pc98	[Distributie]	[ISO]	[Bekijk]	[Bekijk]	[Bekijk]
	ppc	[N/A]	[ISO]	[N/A]	[N/A]	[N/A]						powerpc	[Distributie]	[ISO]
	sparc64	[Distributie]	[ISO]	[Bekijk]	[Bekijk]	[Bekijk]
&os; &rel2.current;-RELEASE		[Bekijk]	[Bekijk]	[Bekijk]	[Bekijk]	[Bekijk]

	amd64	[Distributie]	[ISO]	[Bekijk]			[Bekijk]	[Bekijk]
	i386	[Distributie]	[ISO]	[Bekijk]	[Bekijk]
	ia64	[Distributie]	[ISO]	[Bekijk]	[Bekijk]		[Bekijk]
	pc98	[Distributie]	[ISO]	[Bekijk]	[Bekijk]		[Bekijk]
	sparc64	[Distributie]	[ISO]	[Bekijk]	[Bekijk]		[Bekijk]

Versie & platform		Distributie	ISO	ISO	Schema	TODO lijst
&os; &betarel.current;-&betarel.vers;				[Bekijk]	[Bekijk]
	alpha	[Distributie]	[ISO]	[Bekijk]

	ppc	[Distributie]	[ISO]		powerpc	[Distributie]	[ISO]

Ken Smith <kensmith@FreeBSD.org>	Release Engineering, + amd64, i386, sparc64 Release Building, + Mirror Site Coordination
Robert Watson <rwatson@FreeBSD.org>	Release Engineering, Security
Konstantin Belousov <kib@FreeBSD.org>	Release Engineering
Marc Fonvieille <blackend@FreeBSD.org>	Release Engineering, Documentation
George Neville-Neil <gnn@FreeBSD.org>	Release Engineering
Hiroki Sato <hrs@FreeBSD.org>	Release Engineering, Documentation
Marcel Moolenaar <marcel@FreeBSD.org>	ia64, powerpc Release Building
Takahashi Yoshihiro <nyan@FreeBSD.org>	PC98 Release Building
Kris Kennaway <kris@FreeBSD.org>	Package Building
Joe Marcus Clarke <marcus@FreeBSD.org>	Package Building
Erwin Lansing <erwin@FreeBSD.org>	Package Building
Mark Linimon <linimon@FreeBSD.org>	Package Building
Pav Lucistnik <pav@FreeBSD.org>	Package Building
Colin Percival <cperciva@FreeBSD.org>	Security Officer

Availability

BitTorrent

FTP

Updates from Source

FreeBSD Update

Support

Acknowledgments

Trademark

ISO Image Checksums

Availability

BitTorrent

FTP

Updates from Source

FreeBSD Update

Support

Acknowledgments

Trademark

ISO Image Checksums

Run a huge number of applications

Availability

BitTorrent

FTP

Updates from Source

Support

Acknowledgments

- Gebaseerd op BSD UNIX® + Gebaseerd op BSD &unix;

LAATSTE RELEASES

Mirror

FreeBSD kopen

&os; kopen

FreeBSD downloaden

&os; downloaden

Help met de volgende FreeBSD release

Help met de volgende &os;-uitgaven

&os; kopen

&os; downloaden

Help met de volgende &os;-uitgaven

Help met de volgende &os;-uitgave

Distributies van &os;-afgeleide besturingssystemen

Header en Logo

Aanvullende koppelingen

&header2.word.search;

Sectienavigatie

Sectienavigatie

Sectienavigatie

Sectienavigatie

Sectienavigatie

Sectienavigatie

Sectienavigatie

Sectienavigatie

Regio's:

Huidige/komende evenementen:

Voorbije evenementen:

`Run a huge number of applications`