From owner-svn-src-stable-7@FreeBSD.ORG Sun Mar 7 02:03:26 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D7B4106564A; Sun, 7 Mar 2010 02:03:26 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2B0268FC13; Sun, 7 Mar 2010 02:03:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2723QvA003838; Sun, 7 Mar 2010 02:03:26 GMT (envelope-from gshapiro@svn.freebsd.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2723Q4U003836; Sun, 7 Mar 2010 02:03:26 GMT (envelope-from gshapiro@svn.freebsd.org) Message-Id: <201003070203.o2723Q4U003836@svn.freebsd.org> From: Gregory Neil Shapiro Date: Sun, 7 Mar 2010 02:03:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204816 - stable/7/lib/libsm X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2010 02:03:26 -0000 Author: gshapiro Date: Sun Mar 7 02:03:25 2010 New Revision: 204816 URL: http://svn.freebsd.org/changeset/base/204816 Log: MFC: Enable the use of nanosleep() instead of using pause() and signals. This Makefile change can be removed when the next version of sendmail is imported as it will have this built in to the FreeBSD conf.h section. Modified: stable/7/lib/libsm/Makefile Directory Properties: stable/7/lib/libsm/ (props changed) Modified: stable/7/lib/libsm/Makefile ============================================================================== --- stable/7/lib/libsm/Makefile Sun Mar 7 02:02:07 2010 (r204815) +++ stable/7/lib/libsm/Makefile Sun Mar 7 02:03:25 2010 (r204816) @@ -7,6 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/se CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL +CFLAGS+=-DHAVE_NANOSLEEP .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DNETINET6 From owner-svn-src-stable-7@FreeBSD.ORG Sun Mar 7 20:06:07 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CB5A1065674; Sun, 7 Mar 2010 20:06:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E53F68FC20; Sun, 7 Mar 2010 20:06:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o27K66Mk048972; Sun, 7 Mar 2010 20:06:06 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o27K66gH048969; Sun, 7 Mar 2010 20:06:06 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201003072006.o27K66gH048969@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 7 Mar 2010 20:06:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204843 - stable/7/sys/net X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2010 20:06:07 -0000 Author: kib Date: Sun Mar 7 20:06:06 2010 New Revision: 204843 URL: http://svn.freebsd.org/changeset/base/204843 Log: MFC r204464: Several fixes for miscellaneous clone handlers in if_tun and if_tap. Tested by: Mikolaj Golub Modified: stable/7/sys/net/if_tap.c stable/7/sys/net/if_tun.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/net/if_tap.c ============================================================================== --- stable/7/sys/net/if_tap.c Sun Mar 7 18:43:29 2010 (r204842) +++ stable/7/sys/net/if_tap.c Sun Mar 7 20:06:06 2010 (r204843) @@ -192,10 +192,6 @@ tap_clone_create(struct if_clone *ifc, i if (i) { dev = make_dev(&tap_cdevsw, unit2minor(unit | extra), UID_ROOT, GID_WHEEL, 0600, "%s%d", ifc->ifc_name, unit); - if (dev != NULL) { - dev_ref(dev); - dev->si_flags |= SI_CHEAPCLONE; - } } tapcreate(dev); @@ -300,6 +296,7 @@ tapmodevent(module_t mod, int type, void EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); if_clone_detach(&tap_cloner); if_clone_detach(&vmnet_cloner); + drain_dev_clone_events(); mtx_lock(&tapmtx); while ((tp = SLIST_FIRST(&taphead)) != NULL) { @@ -381,12 +378,9 @@ tapclone(void *arg, struct ucred *cred, name = devname; } - *dev = make_dev(&tap_cdevsw, unit2minor(unit | extra), - UID_ROOT, GID_WHEEL, 0600, "%s", name); - if (*dev != NULL) { - dev_ref(*dev); - (*dev)->si_flags |= SI_CHEAPCLONE; - } + *dev = make_dev_credf(MAKEDEV_REF, &tap_cdevsw, + unit2minor(unit | extra), + cred, UID_ROOT, GID_WHEEL, 0600, "%s", name); } if_clone_create(name, namelen, NULL); Modified: stable/7/sys/net/if_tun.c ============================================================================== --- stable/7/sys/net/if_tun.c Sun Mar 7 18:43:29 2010 (r204842) +++ stable/7/sys/net/if_tun.c Sun Mar 7 20:06:06 2010 (r204843) @@ -185,10 +185,6 @@ tun_clone_create(struct if_clone *ifc, i /* No preexisting struct cdev *, create one */ dev = make_dev(&tun_cdevsw, unit2minor(unit), UID_UUCP, GID_DIALER, 0600, "%s%d", ifc->ifc_name, unit); - if (dev != NULL) { - dev_ref(dev); - dev->si_flags |= SI_CHEAPCLONE; - } } tuncreate(ifc->ifc_name, dev); @@ -233,12 +229,8 @@ tunclone(void *arg, struct ucred *cred, name = devname; } /* No preexisting struct cdev *, create one */ - *dev = make_dev(&tun_cdevsw, unit2minor(u), - UID_UUCP, GID_DIALER, 0600, "%s", name); - if (*dev != NULL) { - dev_ref(*dev); - (*dev)->si_flags |= SI_CHEAPCLONE; - } + *dev = make_dev_credf(MAKEDEV_REF, &tun_cdevsw, unit2minor(u), + cred, UID_UUCP, GID_DIALER, 0600, "%s", name); } if_clone_create(name, namelen, NULL); @@ -292,6 +284,7 @@ tunmodevent(module_t mod, int type, void case MOD_UNLOAD: if_clone_detach(&tun_cloner); EVENTHANDLER_DEREGISTER(dev_clone, tag); + drain_dev_clone_events(); mtx_lock(&tunmtx); while ((tp = TAILQ_FIRST(&tunhead)) != NULL) { From owner-svn-src-stable-7@FreeBSD.ORG Mon Mar 8 08:05:02 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA705106566B; Mon, 8 Mar 2010 08:05:02 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7E30C8FC18; Mon, 8 Mar 2010 08:05:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o28852On026429; Mon, 8 Mar 2010 08:05:02 GMT (envelope-from fabient@svn.freebsd.org) Received: (from fabient@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o28852MM026425; Mon, 8 Mar 2010 08:05:02 GMT (envelope-from fabient@svn.freebsd.org) Message-Id: <201003080805.o28852MM026425@svn.freebsd.org> From: Fabien Thomas Date: Mon, 8 Mar 2010 08:05:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204860 - stable/7/usr.sbin/pmcstat X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2010 08:05:02 -0000 Author: fabient Date: Mon Mar 8 08:05:02 2010 New Revision: 204860 URL: http://svn.freebsd.org/changeset/base/204860 Log: MFC r204783: Bug fixed: - no display on serial terminal in top mode. - display alignment for continuation string. - correct invalid value used for display limit. Modified: stable/7/usr.sbin/pmcstat/pmcpl_callgraph.c stable/7/usr.sbin/pmcstat/pmcpl_calltree.c stable/7/usr.sbin/pmcstat/pmcstat.c Directory Properties: stable/7/usr.sbin/pmcstat/ (props changed) Modified: stable/7/usr.sbin/pmcstat/pmcpl_callgraph.c ============================================================================== --- stable/7/usr.sbin/pmcstat/pmcpl_callgraph.c Mon Mar 8 07:53:44 2010 (r204859) +++ stable/7/usr.sbin/pmcstat/pmcpl_callgraph.c Mon Mar 8 08:05:02 2010 (r204860) @@ -550,7 +550,7 @@ pmcstat_cgnode_topprint(struct pmcstat_c len = ns_len + vs_len + 1; if (width - len < 0) { - PMCSTAT_PRINTW("..."); + PMCSTAT_PRINTW(" ..."); break; } width -= len; Modified: stable/7/usr.sbin/pmcstat/pmcpl_calltree.c ============================================================================== --- stable/7/usr.sbin/pmcstat/pmcpl_calltree.c Mon Mar 8 07:53:44 2010 (r204859) +++ stable/7/usr.sbin/pmcstat/pmcpl_calltree.c Mon Mar 8 08:05:02 2010 (r204860) @@ -387,7 +387,7 @@ pmcpl_ct_node_dumptop(int pmcin, struct if (ct->pct_narc == 0) { pmcpl_ct_topscreen[x+1][*y] = NULL; if (*y >= PMCPL_CT_MAXLINE || - *y >= pmcstat_displaywidth) + *y >= pmcstat_displayheight) return 1; *y = *y + 1; for (i=0; i < x; i++) Modified: stable/7/usr.sbin/pmcstat/pmcstat.c ============================================================================== --- stable/7/usr.sbin/pmcstat/pmcstat.c Mon Mar 8 07:53:44 2010 (r204859) +++ stable/7/usr.sbin/pmcstat/pmcstat.c Mon Mar 8 08:05:02 2010 (r204860) @@ -1311,6 +1311,9 @@ main(int argc, char **argv) intrflush(stdscr, FALSE); keypad(stdscr, TRUE); clear(); + /* Get terminal width / height with ncurses. */ + getmaxyx(stdscr, pmcstat_displayheight, pmcstat_displaywidth); + pmcstat_displayheight--; pmcstat_displaywidth--; atexit(pmcstat_topexit); } } From owner-svn-src-stable-7@FreeBSD.ORG Mon Mar 8 21:29:06 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E5D1106566B; Mon, 8 Mar 2010 21:29:06 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 356A78FC08; Mon, 8 Mar 2010 21:29:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o28LT6HP013039; Mon, 8 Mar 2010 21:29:06 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o28LT6Br013035; Mon, 8 Mar 2010 21:29:06 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201003082129.o28LT6Br013035@svn.freebsd.org> From: Edwin Groothuis Date: Mon, 8 Mar 2010 21:29:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204891 - stable/7/share/zoneinfo X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2010 21:29:06 -0000 Author: edwin Date: Mon Mar 8 21:29:05 2010 New Revision: 204891 URL: http://svn.freebsd.org/changeset/base/204891 Log: MFC of tzdata2010e, r204887 - Adjust beginning / end of DST in Bangladesh (minimal impact) - Fiji ends DST one month earlier to last Sunday of March - Samoa changes - Chile extends DST until 3 April this year. Modified: stable/7/share/zoneinfo/asia stable/7/share/zoneinfo/australasia stable/7/share/zoneinfo/southamerica Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/asia ============================================================================== --- stable/7/share/zoneinfo/asia Mon Mar 8 21:29:00 2010 (r204890) +++ stable/7/share/zoneinfo/asia Mon Mar 8 21:29:05 2010 (r204891) @@ -1,4 +1,4 @@ -# @(#)asia 8.50 +# @(#)asia 8.55 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -225,11 +225,31 @@ Zone Asia/Bahrain 3:22:20 - LMT 1920 # # until further notice." I take that last sentence as the # establishment of a rule. -# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Dhaka 2009 only - Jun 29 23:00 1 S -Rule Dhaka 2010 only - Jan 1 0:00 - - -Rule Dhaka 2010 max - Mar 31 23:00 1 S -Rule Dhaka 2010 max - Nov 1 0:00 - - +# From Nobutomo Nakano (2010-02-19): +# We received a report from Bangladesh saying that the start/end of +# Bangladesh DST is incorrect. Currently we have only the Bengali version +# of the official mail from BTRC which describes the following: +# +# "From 2010 each year when local standard time is about to reach +# March 31 at 10:59:00 PM clocks are turned forward 1 hour (11:59:00 PM) +# and when local daylight time is about to October 31 at 11:59:00 PM +# clocks are turned backward 1 hour (10:59:00 PM)." +# +# So, DST will start/end 1 minute earlier. + +# From Arthur David Olson (2010-03-03): +# The file +# +# http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf +# +# is in Bengali; it does contain two "31"s as well as two "11.59"s and a "10.59" +# which is consistent with the information provided by Nobutomo Nakano. + +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Dhaka 2009 only - Jun 19 23:00 1:00 S +Rule Dhaka 2009 only - Dec 31 23:59 0 - +Rule Dhaka 2010 max - Mar 31 22:59 1:00 S +Rule Dhaka 2010 max - Oct 31 23:59 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Dhaka 6:01:40 - LMT 1890 Modified: stable/7/share/zoneinfo/australasia ============================================================================== --- stable/7/share/zoneinfo/australasia Mon Mar 8 21:29:00 2010 (r204890) +++ stable/7/share/zoneinfo/australasia Mon Mar 8 21:29:05 2010 (r204891) @@ -1,5 +1,5 @@ # 
-# @(#)australasia	8.15
+# @(#)australasia	8.16
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -267,11 +267,30 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # 
 # http://www.fiji.gov.fj/publish/page_16198.shtml
 # 
+
+# From Steffen Thorsen (2010-03-03):
+# The Cabinet in Fiji has decided to end DST about a month early, on
+# 2010-03-28 at 03:00.
+# The plan is to observe DST again, from 2010-10-24 to sometime in March
+# 2011 (last Sunday a good guess?).
+#
+# Official source:
+# 
+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=1096:3310-cabinet-approves-change-in-daylight-savings-dates&catid=49:cabinet-releases&Itemid=166
+# 
+#
+# A bit more background info here:
+# 
+# http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
-Rule	Fiji	2010	only	-	Apr	25	3:00	0	-
+Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
+Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
+Rule	Fiji	2011	only	-	Mar	lastSun 3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time
@@ -449,70 +468,30 @@ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1
 
 # Samoa
 
-# From Alexander Krivenyshev (2008-12-06):
-# The Samoa government (Western Samoa) may implement DST on the first Sunday of 
-# October 2009 (October 4, 2009) until the last Sunday of March 2010 (March 28, 
-# 2010). 
-# 
-# "Selected Committee reports to Cabinet on Daylight Saving Time",
-# Government of Samoa:
-# 
-# http://www.govt.ws/pr_article.cfm?pr_id=560
-# 
-# or
-# 
-# http://www.worldtimezone.com/dst_news/dst_news_samoa01.html
-# 
-
-# From Steffen Thorsen (2009-08-27):
-# Samoa's parliament passed the Daylight Saving Bill 2009, and will start 
-# daylight saving time on the first Sunday of October 2009 and end on the 
-# last Sunday of March 2010. We hope that the full text will be published 
-# soon, but we believe that the bill is only valid for 2009-2010. Samoa's 
-# Daylight Saving Act 2009 will be enforced as soon as the Head of State 
-# executes a proclamation publicizing this Act.
+# From Steffen Thorsen (2009-10-16):
+# We have been in contact with the government of Samoa again, and received
+# the following info:
+#
+# "Cabinet has now approved Daylight Saving to be effected next year
+# commencing from the last Sunday of September 2010 and conclude first
+# Sunday of April 2011."
 #
-# Some background information here, which will be updated once we have 
-# more details:
+# Background info:
 # 
 # http://www.timeanddate.com/news/time/samoa-dst-plan-2009.html
 # 
-
-# From Alexander Krivenyshev (2009-10-03):
-# First, my deepest condolences to people of Samoa islands and all families and
-# loved ones around the world who lost their lives in the earthquake and tsunami.
-#
-# Considering the recent devastation on Samoa by earthquake and tsunami and that
-# many government offices/ ministers are closed- not sure if "Daylight Saving
-# Bill 2009" will be implemented in next few days- on October 4, 2009.
-#
-# Here is reply from Consulate-General of Samoa in New Zealand
-# ---------------------------
-# Consul General
-# consulgeneral@samoaconsulate.org.nz
-#
-# Talofa Alexander,
-#
-# Thank you for your sympathy for our country but at this time we have not
-# been informed about the Daylight Savings Time Change.  Most Ministries in
-# Apia are closed or relocating due to weather concerns.
-#
-# When we do find out if they are still proceeding with the time change we
-# will advise you soonest.
-#
-# Kind Regards,
-# Lana
-# for: Consul General
-
-# From Steffen Thorsen (2009-10-05):
-# We have called a hotel in Samoa and asked about local time there - they 
-# are still on standard time.
+#
+# Samoa's Daylight Saving Time Act 2009 is available here, but does not
+# contain any dates:
+# 
+# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf
+# 
 
 Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
 			-11:26:56 -	LMT	1911
 			-11:30	-	SAMT	1950		# Samoa Time
-			-11:00	-	WST	2009 Oct 4
-			-11:00	1:00	WSDT	2010 Mar 28
+			-11:00	-	WST	2010 Oct 24
+			-11:00	1:00	WSDT	2011 Apr 3
 			-11:00	-	WST
 
 # Solomon Is

Modified: stable/7/share/zoneinfo/southamerica
==============================================================================
--- stable/7/share/zoneinfo/southamerica	Mon Mar  8 21:29:00 2010	(r204890)
+++ stable/7/share/zoneinfo/southamerica	Mon Mar  8 21:29:05 2010	(r204891)
@@ -1,5 +1,5 @@
 # 
-# @(#)southamerica	8.41
+# @(#)southamerica	8.43
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1121,6 +1121,18 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1
 # http://www.shoa.cl/noticias/2008/04hora/hora.htm
 # .
 
+# From Angel Chiang (2010-03-04):
+# Subject: DST in Chile exceptionally extended to 3 April due to earthquake
+# 
+# http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098
+# 
+# (in Spanish, last paragraph).
+#
+# This is breaking news. There should be more information available later.
+
+# From Arthur Daivd Olson (2010-03-06):
+# Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1155,7 +1167,9 @@ Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	
 # N.B.: the end of March 29 in Chile is March 30 in Universal time,
 # which is used below in specifying the transition.
 Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-Rule	Chile	2009	max	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
+Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1380,7 +1394,7 @@ Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	
 # and that on the first Sunday of the month of October, it is to be set
 # forward 60 minutes, in all the territory of the Paraguayan Republic.
 # ...
-Rule	Para	2010	max	-	Oct	Sun<=7	0:00	1:00	S
+Rule	Para	2010	max	-	Oct	Sun>=1	0:00	1:00	S
 Rule	Para	2010	max	-	Apr	Sun>=8	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

From owner-svn-src-stable-7@FreeBSD.ORG  Mon Mar  8 21:42:19 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 621E8106566B;
	Mon,  8 Mar 2010 21:42:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 505318FC16;
	Mon,  8 Mar 2010 21:42:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o28LgJK2016116;
	Mon, 8 Mar 2010 21:42:19 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o28LgJC9016113;
	Mon, 8 Mar 2010 21:42:19 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201003082142.o28LgJC9016113@svn.freebsd.org>
From: John Baldwin 
Date: Mon, 8 Mar 2010 21:42:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204895 - in stable/7/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Mon, 08 Mar 2010 21:42:19 -0000

Author: jhb
Date: Mon Mar  8 21:42:19 2010
New Revision: 204895
URL: http://svn.freebsd.org/changeset/base/204895

Log:
  MFC 204518:
  Print the contents of the miscellaneous (MISC) register to the console if
  it is valid along with the other register values when a machine check is
  encountered.

Modified:
  stable/7/sys/amd64/amd64/mca.c
  stable/7/sys/i386/i386/mca.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/amd64/mca.c
==============================================================================
--- stable/7/sys/amd64/amd64/mca.c	Mon Mar  8 21:36:20 2010	(r204894)
+++ stable/7/sys/amd64/amd64/mca.c	Mon Mar  8 21:42:19 2010	(r204895)
@@ -288,6 +288,8 @@ mca_log(const struct mca_record *rec)
 	printf("\n");
 	if (rec->mr_status & MC_STATUS_ADDRV)
 		printf("MCA: Address 0x%llx\n", (long long)rec->mr_addr);
+	if (rec->mr_status & MC_STATUS_MISCV)
+		printf("MCA: Misc 0x%llx\n", (long long)rec->mr_misc);
 }
 
 static int __nonnull(2)

Modified: stable/7/sys/i386/i386/mca.c
==============================================================================
--- stable/7/sys/i386/i386/mca.c	Mon Mar  8 21:36:20 2010	(r204894)
+++ stable/7/sys/i386/i386/mca.c	Mon Mar  8 21:42:19 2010	(r204895)
@@ -288,6 +288,8 @@ mca_log(const struct mca_record *rec)
 	printf("\n");
 	if (rec->mr_status & MC_STATUS_ADDRV)
 		printf("MCA: Address 0x%llx\n", (long long)rec->mr_addr);
+	if (rec->mr_status & MC_STATUS_MISCV)
+		printf("MCA: Misc 0x%llx\n", (long long)rec->mr_misc);
 }
 
 static int __nonnull(2)

From owner-svn-src-stable-7@FreeBSD.ORG  Tue Mar  9 13:08:58 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 24BDC1065675;
	Tue,  9 Mar 2010 13:08:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 13DEB8FC1B;
	Tue,  9 Mar 2010 13:08:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o29D8vZA023179;
	Tue, 9 Mar 2010 13:08:57 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o29D8vF3023176;
	Tue, 9 Mar 2010 13:08:57 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201003091308.o29D8vF3023176@svn.freebsd.org>
From: John Baldwin 
Date: Tue, 9 Mar 2010 13:08:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204910 - in stable/7/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Tue, 09 Mar 2010 13:08:58 -0000

Author: jhb
Date: Tue Mar  9 13:08:57 2010
New Revision: 204910
URL: http://svn.freebsd.org/changeset/base/204910

Log:
  Don't include disabled CPUs in the topology map.  ULE assumes that all CPUs
  in the topology map were present and enabled.  Booting a system with
  hyperthreading and at least one CPU would cause ULE to attempt to use a
  disabled CPU when rebalancing load resulting in a panic.  This is a direct
  commit to 7 as the topology code is different in 8 and later.

Modified:
  stable/7/sys/amd64/amd64/mp_machdep.c
  stable/7/sys/i386/i386/mp_machdep.c

Modified: stable/7/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- stable/7/sys/amd64/amd64/mp_machdep.c	Tue Mar  9 10:31:03 2010	(r204909)
+++ stable/7/sys/amd64/amd64/mp_machdep.c	Tue Mar  9 13:08:57 2010	(r204910)
@@ -200,7 +200,8 @@ mp_topology(void)
 	group = &mp_groups[0];
 	groups = 1;
 	for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) {
-		if (!cpu_info[apic_id].cpu_present)
+		if (!cpu_info[apic_id].cpu_present ||
+		    cpu_info[apic_id].cpu_disabled)
 			continue;
 		/*
 		 * If the current group has members and we're not a logical

Modified: stable/7/sys/i386/i386/mp_machdep.c
==============================================================================
--- stable/7/sys/i386/i386/mp_machdep.c	Tue Mar  9 10:31:03 2010	(r204909)
+++ stable/7/sys/i386/i386/mp_machdep.c	Tue Mar  9 13:08:57 2010	(r204910)
@@ -255,7 +255,8 @@ mp_topology(void)
 	group = &mp_groups[0];
 	groups = 1;
 	for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) {
-		if (!cpu_info[apic_id].cpu_present)
+		if (!cpu_info[apic_id].cpu_present ||
+		    cpu_info[apic_id].cpu_disabled)
 			continue;
 		/*
 		 * If the current group has members and we're not a logical

From owner-svn-src-stable-7@FreeBSD.ORG  Tue Mar  9 13:41:34 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 195EF106564A;
	Tue,  9 Mar 2010 13:41:34 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 090B48FC1C;
	Tue,  9 Mar 2010 13:41:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o29DfXK0030431;
	Tue, 9 Mar 2010 13:41:33 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o29DfXJj030428;
	Tue, 9 Mar 2010 13:41:33 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201003091341.o29DfXJj030428@svn.freebsd.org>
From: Konstantin Belousov 
Date: Tue, 9 Mar 2010 13:41:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204912 - stable/7/sys/dev/mfi
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Tue, 09 Mar 2010 13:41:34 -0000

Author: kib
Date: Tue Mar  9 13:41:33 2010
New Revision: 204912
URL: http://svn.freebsd.org/changeset/base/204912

Log:
  MFC r204590:
  Correct mfip module dependency on mfi. This allows mfip to be loaded as
  module when mfi is a module itself.

Modified:
  stable/7/sys/dev/mfi/mfi_cam.c
  stable/7/sys/dev/mfi/mfi_pci.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mfi/mfi_cam.c
==============================================================================
--- stable/7/sys/dev/mfi/mfi_cam.c	Tue Mar  9 13:32:50 2010	(r204911)
+++ stable/7/sys/dev/mfi/mfi_cam.c	Tue Mar  9 13:41:33 2010	(r204912)
@@ -95,6 +95,7 @@ static driver_t mfip_driver = {
 };
 DRIVER_MODULE(mfip, mfi, mfip_driver, mfip_devclass, 0, 0);
 MODULE_DEPEND(mfip, cam, 1, 1, 1);
+MODULE_DEPEND(mfip, mfi, 1, 1, 1);
 
 #define ccb_mfip_ptr sim_priv.entries[0].ptr
 

Modified: stable/7/sys/dev/mfi/mfi_pci.c
==============================================================================
--- stable/7/sys/dev/mfi/mfi_pci.c	Tue Mar  9 13:32:50 2010	(r204911)
+++ stable/7/sys/dev/mfi/mfi_pci.c	Tue Mar  9 13:41:33 2010	(r204912)
@@ -105,6 +105,7 @@ static driver_t mfi_pci_driver = {
 
 static devclass_t	mfi_devclass;
 DRIVER_MODULE(mfi, pci, mfi_pci_driver, mfi_devclass, 0, 0);
+MODULE_VERSION(mfi, 1);
 
 struct mfi_ident {
 	uint16_t	vendor;

From owner-svn-src-stable-7@FreeBSD.ORG  Tue Mar  9 22:10:12 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2D031106566B;
	Tue,  9 Mar 2010 22:10:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A8258FC15;
	Tue,  9 Mar 2010 22:10:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o29MACqr044259;
	Tue, 9 Mar 2010 22:10:12 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o29MABkU044256;
	Tue, 9 Mar 2010 22:10:11 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201003092210.o29MABkU044256@svn.freebsd.org>
From: John Baldwin 
Date: Tue, 9 Mar 2010 22:10:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204931 - in stable/7/sys: amd64/include i386/include
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Tue, 09 Mar 2010 22:10:12 -0000

Author: jhb
Date: Tue Mar  9 22:10:11 2010
New Revision: 204931
URL: http://svn.freebsd.org/changeset/base/204931

Log:
  MFC 183525: Bump MAXCPU to 32 now that 32 CPU x86 systems exist.

Modified:
  stable/7/sys/amd64/include/param.h
  stable/7/sys/i386/include/param.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/include/param.h
==============================================================================
--- stable/7/sys/amd64/include/param.h	Tue Mar  9 21:16:36 2010	(r204930)
+++ stable/7/sys/amd64/include/param.h	Tue Mar  9 22:10:11 2010	(r204931)
@@ -71,7 +71,7 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
-#define MAXCPU		16
+#define MAXCPU		32
 #else
 #define MAXCPU		1
 #endif

Modified: stable/7/sys/i386/include/param.h
==============================================================================
--- stable/7/sys/i386/include/param.h	Tue Mar  9 21:16:36 2010	(r204930)
+++ stable/7/sys/i386/include/param.h	Tue Mar  9 22:10:11 2010	(r204931)
@@ -66,7 +66,7 @@
 #define MID_MACHINE	MID_I386
 
 #if defined(SMP) || defined(KLD_MODULE)
-#define MAXCPU		16
+#define MAXCPU		32
 #else
 #define MAXCPU		1
 #endif /* SMP */

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 00:27:07 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 47F111065670;
	Wed, 10 Mar 2010 00:27:07 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FBDD8FC08;
	Wed, 10 Mar 2010 00:27:07 +0000 (UTC)
Received: from fledge.watson.org (fledge.watson.org [65.122.17.41])
	by cyrus.watson.org (Postfix) with ESMTPS id 9870D46B2C;
	Tue,  9 Mar 2010 19:27:06 -0500 (EST)
Date: Wed, 10 Mar 2010 00:27:06 +0000 (GMT)
From: Robert Watson 
X-X-Sender: robert@fledge.watson.org
To: John Baldwin 
In-Reply-To: <201003092210.o29MABkU044256@svn.freebsd.org>
Message-ID: 
References: <201003092210.o29MABkU044256@svn.freebsd.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-7@freebsd.org
Subject: Re: svn commit: r204931 - in stable/7/sys: amd64/include
 i386/include
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 00:27:07 -0000


On Tue, 9 Mar 2010, John Baldwin wrote:

> Log:
>  MFC 183525: Bump MAXCPU to 32 now that 32 CPU x86 systems exist.

Hmmm.  I'd be a bit surprised if this doesn't cause ABI issues for 
management/crashdump analysis tools, and KBI problems for kernel modules, 
although it being 12:30am I'm having trouble thinking of specific instances 
currently.

Robert N M Watson
Computer Laboratory
University of Cambridge

>
> Modified:
>  stable/7/sys/amd64/include/param.h
>  stable/7/sys/i386/include/param.h
> Directory Properties:
>  stable/7/sys/   (props changed)
>  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
>  stable/7/sys/contrib/dev/acpica/   (props changed)
>  stable/7/sys/contrib/pf/   (props changed)
>
> Modified: stable/7/sys/amd64/include/param.h
> ==============================================================================
> --- stable/7/sys/amd64/include/param.h	Tue Mar  9 21:16:36 2010	(r204930)
> +++ stable/7/sys/amd64/include/param.h	Tue Mar  9 22:10:11 2010	(r204931)
> @@ -71,7 +71,7 @@
> #endif
>
> #if defined(SMP) || defined(KLD_MODULE)
> -#define MAXCPU		16
> +#define MAXCPU		32
> #else
> #define MAXCPU		1
> #endif
>
> Modified: stable/7/sys/i386/include/param.h
> ==============================================================================
> --- stable/7/sys/i386/include/param.h	Tue Mar  9 21:16:36 2010	(r204930)
> +++ stable/7/sys/i386/include/param.h	Tue Mar  9 22:10:11 2010	(r204931)
> @@ -66,7 +66,7 @@
> #define MID_MACHINE	MID_I386
>
> #if defined(SMP) || defined(KLD_MODULE)
> -#define MAXCPU		16
> +#define MAXCPU		32
> #else
> #define MAXCPU		1
> #endif /* SMP */
>

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 13:42:38 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 226F71065670;
	Wed, 10 Mar 2010 13:42:38 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 115548FC0A;
	Wed, 10 Mar 2010 13:42:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2ADgbqP052982;
	Wed, 10 Mar 2010 13:42:37 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2ADgb6h052979;
	Wed, 10 Mar 2010 13:42:37 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201003101342.o2ADgb6h052979@svn.freebsd.org>
From: Gavin Atkinson 
Date: Wed, 10 Mar 2010 13:42:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204952 - stable/7/usr.bin/hexdump
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 13:42:38 -0000

Author: gavin
Date: Wed Mar 10 13:42:37 2010
New Revision: 204952
URL: http://svn.freebsd.org/changeset/base/204952

Log:
  Merge r204053 from head:
  
    The correct value of DEL is 0x7f, not 0xff.  This is purely a documentation
    issue - od(1) and hexdump(1) behave as expected.
  
  PR:		docs/143869
  Submitted by:	gcooper

Modified:
  stable/7/usr.bin/hexdump/hexdump.1
  stable/7/usr.bin/hexdump/od.1
Directory Properties:
  stable/7/usr.bin/hexdump/   (props changed)

Modified: stable/7/usr.bin/hexdump/hexdump.1
==============================================================================
--- stable/7/usr.bin/hexdump/hexdump.1	Wed Mar 10 13:40:37 2010	(r204951)
+++ stable/7/usr.bin/hexdump/hexdump.1	Wed Mar 10 13:42:37 2010	(r204952)
@@ -32,7 +32,7 @@
 .\"	@(#)hexdump.1	8.2 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd July 10, 2004
+.Dd February 18, 2010
 .Dt HEXDUMP 1
 .Os
 .Sh NAME
@@ -258,7 +258,7 @@ strings.
 .It "\&00C\ FF\t00D\ CR\t00E\ SO\t00F\ SI\t010\ DLE\t011\ DC1
 .It "\&012\ DC2\t013\ DC3\t014\ DC4\t015\ NAK\t016\ SYN\t017\ ETB
 .It "\&018\ CAN\t019\ EM\t01A\ SUB\t01B\ ESC\t01C\ FS\t01D\ GS
-.It "\&01E\ RS\t01F\ US\t0FF\ DEL
+.It "\&01E\ RS\t01F\ US\t07F\ DEL
 .El
 .El
 .Pp

Modified: stable/7/usr.bin/hexdump/od.1
==============================================================================
--- stable/7/usr.bin/hexdump/od.1	Wed Mar 10 13:40:37 2010	(r204951)
+++ stable/7/usr.bin/hexdump/od.1	Wed Mar 10 13:42:37 2010	(r204952)
@@ -32,7 +32,7 @@
 .\"	@(#)od.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd December 24, 2006
+.Dd February 18, 2010
 .Os
 .Dt OD 1
 .Sh NAME
@@ -155,7 +155,7 @@ Control characters are displayed using t
 .It "00c FF	00d CR	00e SO	00f SI	010 DLE	011 DC1"
 .It "012 DC2	013 DC3	014 DC4	015 NAK	016 SYN	017 ETB"
 .It "018 CAN	019 EM	01a SUB	01b ESC	01c FS	01d GS"
-.It "01e RS	01f US	020 SP	0ff DEL"
+.It "01e RS	01f US	020 SP	07f DEL"
 .El
 .It Cm c
 Characters in the default character set.

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 13:49:34 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1997A106564A;
	Wed, 10 Mar 2010 13:49:34 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id DEEAD8FC15;
	Wed, 10 Mar 2010 13:49:33 +0000 (UTC)
Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net
	[66.111.2.69])
	by cyrus.watson.org (Postfix) with ESMTPSA id 9642D46B7F;
	Wed, 10 Mar 2010 08:49:33 -0500 (EST)
Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9])
	by bigwig.baldwin.cx (Postfix) with ESMTPA id DC16B8A027;
	Wed, 10 Mar 2010 08:49:32 -0500 (EST)
From: John Baldwin 
To: Robert Watson 
Date: Wed, 10 Mar 2010 08:15:40 -0500
User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; )
References: <201003092210.o29MABkU044256@svn.freebsd.org>
	
In-Reply-To: 
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201003100815.40537.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1
	(bigwig.baldwin.cx); Wed, 10 Mar 2010 08:49:32 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-1.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-7@freebsd.org
Subject: Re: svn commit: r204931 - in stable/7/sys: amd64/include
	i386/include
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 13:49:34 -0000

On Tuesday 09 March 2010 7:27:06 pm Robert Watson wrote:
> 
> On Tue, 9 Mar 2010, John Baldwin wrote:
> 
> > Log:
> >  MFC 183525: Bump MAXCPU to 32 now that 32 CPU x86 systems exist.
> 
> Hmmm.  I'd be a bit surprised if this doesn't cause ABI issues for 
> management/crashdump analysis tools, and KBI problems for kernel modules, 
> although it being 12:30am I'm having trouble thinking of specific instances 
> currently.

That did occur to me.  I could revert it.  The public KBI for modules is that 
they should be using mp_maxid and not MAXCPU.  Generally MAXCPU is only used 
for sizing static arrays for early boot before malloc() is available, and that 
code cannot be run from a KLD anyway (even kld's loaded via the loader don't 
start running SYSINITs until after SI_SUB_KLD).  I think other uses of MAXCPU 
are most likely broken and that MAXCPU should not be part of the public KBI, 
but only for use in the kernel image itself.  DPCPU in 8.0 makes this process 
even easier for modules that need per-CPU data relative to 7 perhaps.

-- 
John Baldwin

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 13:54:13 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AE71A1065672;
	Wed, 10 Mar 2010 13:54:13 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D75A8FC08;
	Wed, 10 Mar 2010 13:54:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2ADsDEf055568;
	Wed, 10 Mar 2010 13:54:13 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2ADsDdT055566;
	Wed, 10 Mar 2010 13:54:13 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201003101354.o2ADsDdT055566@svn.freebsd.org>
From: Gavin Atkinson 
Date: Wed, 10 Mar 2010 13:54:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204953 - stable/7/sys/dev/ae
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 13:54:13 -0000

Author: gavin
Date: Wed Mar 10 13:54:13 2010
New Revision: 204953
URL: http://svn.freebsd.org/changeset/base/204953

Log:
  Merge r202000 from head:
  
    Don't panic on attach if we can't allocate ifp

Modified:
  stable/7/sys/dev/ae/if_ae.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/ae/if_ae.c
==============================================================================
--- stable/7/sys/dev/ae/if_ae.c	Wed Mar 10 13:42:37 2010	(r204952)
+++ stable/7/sys/dev/ae/if_ae.c	Wed Mar 10 13:54:13 2010	(r204953)
@@ -367,6 +367,7 @@ ae_attach(device_t dev)
 	if (ifp == NULL) {
 		device_printf(dev, "could not allocate ifnet structure.\n");
 		error = ENXIO;
+		goto fail;
 	}
 
 	ifp->if_softc = sc;

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 13:56:22 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C05D6106566C;
	Wed, 10 Mar 2010 13:56:22 +0000 (UTC)
	(envelope-from rwatson@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 991528FC1C;
	Wed, 10 Mar 2010 13:56:22 +0000 (UTC)
Received: from lemongrass.sec.cl.cam.ac.uk (lemongrass.sec.cl.cam.ac.uk
	[128.232.18.47])
	by cyrus.watson.org (Postfix) with ESMTPSA id 8CB2D46B51;
	Wed, 10 Mar 2010 08:56:21 -0500 (EST)
Mime-Version: 1.0 (Apple Message framework v1077)
Content-Type: text/plain; charset=us-ascii
From: "Robert N. M. Watson" 
In-Reply-To: <201003100815.40537.jhb@freebsd.org>
Date: Wed, 10 Mar 2010 13:56:15 +0000
Content-Transfer-Encoding: quoted-printable
Message-Id: <2F464F17-5C54-4815-A1EE-0BC92B1A8C2E@freebsd.org>
References: <201003092210.o29MABkU044256@svn.freebsd.org>
	
	<201003100815.40537.jhb@freebsd.org>
To: John Baldwin 
X-Mailer: Apple Mail (2.1077)
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-7@freebsd.org
Subject: Re: svn commit: r204931 - in stable/7/sys: amd64/include
	i386/include
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 13:56:22 -0000


On Mar 10, 2010, at 1:15 PM, John Baldwin wrote:

> On Tuesday 09 March 2010 7:27:06 pm Robert Watson wrote:
>>=20
>> On Tue, 9 Mar 2010, John Baldwin wrote:
>>=20
>>> Log:
>>> MFC 183525: Bump MAXCPU to 32 now that 32 CPU x86 systems exist.
>>=20
>> Hmmm.  I'd be a bit surprised if this doesn't cause ABI issues for=20
>> management/crashdump analysis tools, and KBI problems for kernel =
modules,=20
>> although it being 12:30am I'm having trouble thinking of specific =
instances=20
>> currently.
>=20
> That did occur to me.  I could revert it.  The public KBI for modules =
is that=20
> they should be using mp_maxid and not MAXCPU.  Generally MAXCPU is =
only used=20
> for sizing static arrays for early boot before malloc() is available, =
and that=20
> code cannot be run from a KLD anyway (even kld's loaded via the loader =
don't=20
> start running SYSINITs until after SI_SUB_KLD).  I think other uses of =
MAXCPU=20
> are most likely broken and that MAXCPU should not be part of the =
public KBI,=20
> but only for use in the kernel image itself.  DPCPU in 8.0 makes this =
process=20
> even easier for modules that need per-CPU data relative to 7 perhaps.

My worry was that code might size an array in a module using the old =
MAXCPU, and assume that mp_maxid is always < MAXCPU, or that curcpu (or =
similar) is always < MAXCPU.  I agree that breakage in this area is =
likely a bug but I'm not sure whether it's a theoretical bug or one that =
real code will see. It's probably worth looking at what code that knows =
about CPU workers (such as the cxgb driver, perhaps some crypto stuff, a =
geom module or two) DTRT before reverting, and checking to make sure =
things like vmstat -m/-z don't blow up too much.

Robert=

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 14:40:25 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 969B3106564A;
	Wed, 10 Mar 2010 14:40:25 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 654898FC16;
	Wed, 10 Mar 2010 14:40:25 +0000 (UTC)
Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net
	[66.111.2.69])
	by cyrus.watson.org (Postfix) with ESMTPSA id 177AC46B92;
	Wed, 10 Mar 2010 09:40:25 -0500 (EST)
Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9])
	by bigwig.baldwin.cx (Postfix) with ESMTPA id 604F48A025;
	Wed, 10 Mar 2010 09:40:24 -0500 (EST)
From: John Baldwin 
To: "Robert N. M. Watson" 
Date: Wed, 10 Mar 2010 09:38:35 -0500
User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; )
References: <201003092210.o29MABkU044256@svn.freebsd.org>
	<201003100815.40537.jhb@freebsd.org>
	<2F464F17-5C54-4815-A1EE-0BC92B1A8C2E@freebsd.org>
In-Reply-To: <2F464F17-5C54-4815-A1EE-0BC92B1A8C2E@freebsd.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201003100938.35279.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1
	(bigwig.baldwin.cx); Wed, 10 Mar 2010 09:40:24 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-1.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-7@freebsd.org
Subject: Re: svn commit: r204931 - in stable/7/sys: amd64/include
	i386/include
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 14:40:25 -0000

On Wednesday 10 March 2010 8:56:15 am Robert N. M. Watson wrote:
> 
> On Mar 10, 2010, at 1:15 PM, John Baldwin wrote:
> 
> > On Tuesday 09 March 2010 7:27:06 pm Robert Watson wrote:
> >> 
> >> On Tue, 9 Mar 2010, John Baldwin wrote:
> >> 
> >>> Log:
> >>> MFC 183525: Bump MAXCPU to 32 now that 32 CPU x86 systems exist.
> >> 
> >> Hmmm.  I'd be a bit surprised if this doesn't cause ABI issues for 
> >> management/crashdump analysis tools, and KBI problems for kernel modules, 
> >> although it being 12:30am I'm having trouble thinking of specific instances 
> >> currently.
> > 
> > That did occur to me.  I could revert it.  The public KBI for modules is that 
> > they should be using mp_maxid and not MAXCPU.  Generally MAXCPU is only used 
> > for sizing static arrays for early boot before malloc() is available, and that 
> > code cannot be run from a KLD anyway (even kld's loaded via the loader don't 
> > start running SYSINITs until after SI_SUB_KLD).  I think other uses of MAXCPU 
> > are most likely broken and that MAXCPU should not be part of the public KBI, 
> > but only for use in the kernel image itself.  DPCPU in 8.0 makes this process 
> > even easier for modules that need per-CPU data relative to 7 perhaps.
> 
> My worry was that code might size an array in a module using the old MAXCPU, and assume that mp_maxid is always < MAXCPU, or that curcpu (or similar) 
is always < MAXCPU.  I agree that breakage in this area is likely a bug but I'm not sure whether it's a theoretical bug or one that real code will see. 
It's probably worth looking at what code that knows about CPU workers (such as the cxgb driver, perhaps some crypto stuff, a geom module or two) DTRT 
before reverting, and checking to make sure things like vmstat -m/-z don't blow up too much.

Grr, it looks like some opensolaris and dtrace code uses MAXCPU, so I will
revert.

-- 
John Baldwin

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 15:47:34 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A1541065675;
	Wed, 10 Mar 2010 15:47:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 38A7D8FC18;
	Wed, 10 Mar 2010 15:47:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2AFlYc6080723;
	Wed, 10 Mar 2010 15:47:34 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2AFlYgt080720;
	Wed, 10 Mar 2010 15:47:34 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201003101547.o2AFlYgt080720@svn.freebsd.org>
From: John Baldwin 
Date: Wed, 10 Mar 2010 15:47:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204956 - in stable/7/sys: amd64/include i386/include
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 15:47:34 -0000

Author: jhb
Date: Wed Mar 10 15:47:33 2010
New Revision: 204956
URL: http://svn.freebsd.org/changeset/base/204956

Log:
  Revert the change to increase MAXCPU to 32 on amd64 and i386.  MAXCPU is
  part of the de facto KBI currently.

Modified:
  stable/7/sys/amd64/include/param.h
  stable/7/sys/i386/include/param.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/include/param.h
==============================================================================
--- stable/7/sys/amd64/include/param.h	Wed Mar 10 15:22:26 2010	(r204955)
+++ stable/7/sys/amd64/include/param.h	Wed Mar 10 15:47:33 2010	(r204956)
@@ -71,7 +71,7 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
-#define MAXCPU		32
+#define MAXCPU		16
 #else
 #define MAXCPU		1
 #endif

Modified: stable/7/sys/i386/include/param.h
==============================================================================
--- stable/7/sys/i386/include/param.h	Wed Mar 10 15:22:26 2010	(r204955)
+++ stable/7/sys/i386/include/param.h	Wed Mar 10 15:47:33 2010	(r204956)
@@ -66,7 +66,7 @@
 #define MID_MACHINE	MID_I386
 
 #if defined(SMP) || defined(KLD_MODULE)
-#define MAXCPU		32
+#define MAXCPU		16
 #else
 #define MAXCPU		1
 #endif /* SMP */

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 18:02:47 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1297A106564A;
	Wed, 10 Mar 2010 18:02:47 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from out-0.mx.aerioconnect.net (out-0-7.mx.aerioconnect.net
	[216.240.47.67])
	by mx1.freebsd.org (Postfix) with ESMTP id E3B2B8FC1B;
	Wed, 10 Mar 2010 18:02:46 +0000 (UTC)
Received: from idiom.com (postfix@mx0.idiom.com [216.240.32.160])
	by out-0.mx.aerioconnect.net (8.13.8/8.13.8) with ESMTP id
	o2AHhmVY018988; Wed, 10 Mar 2010 09:43:48 -0800
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
X-Client-Authorized: MaGic Cook1e
Received: from julian-mac.elischer.org
	(h-67-100-89-137.snfccasy.static.covad.net [67.100.89.137])
	by idiom.com (Postfix) with ESMTP id 38F8A2D6010;
	Wed, 10 Mar 2010 09:43:47 -0800 (PST)
Message-ID: <4B97DA52.6020808@elischer.org>
Date: Wed, 10 Mar 2010 09:43:46 -0800
From: Julian Elischer 
User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812)
MIME-Version: 1.0
To: Robert Watson 
References: <201003092210.o29MABkU044256@svn.freebsd.org>
	
In-Reply-To: 
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Scanned-By: MIMEDefang 2.67 on 216.240.47.51
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-7@freebsd.org,
	John Baldwin 
Subject: Re: svn commit: r204931 - in stable/7/sys: amd64/include
	i386/include
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 18:02:47 -0000

Robert Watson wrote:
> 
> On Tue, 9 Mar 2010, John Baldwin wrote:
> 
>> Log:
>>  MFC 183525: Bump MAXCPU to 32 now that 32 CPU x86 systems exist.

So in two months or so (according to the trade rags)
intel brings out a system with 1024 'cpus'
(8 cpu chips, x 8 cpus per chip x 16 threads per cpu).

We need to do a bit of quick thinking to work out how we handle this..
I think the only systems that can run on this well are Virtualization
micro kernels (e.g. ESX) with the idea of running multiple kernels on
different cpu chips.

> 
> Hmmm.  I'd be a bit surprised if this doesn't cause ABI issues for 
> management/crashdump analysis tools, and KBI problems for kernel 
> modules, although it being 12:30am I'm having trouble thinking of 
> specific instances currently.
> 
> Robert N M Watson
> Computer Laboratory
> University of Cambridge
> 
>>
>> Modified:
>>  stable/7/sys/amd64/include/param.h
>>  stable/7/sys/i386/include/param.h
>> Directory Properties:
>>  stable/7/sys/   (props changed)
>>  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
>>  stable/7/sys/contrib/dev/acpica/   (props changed)
>>  stable/7/sys/contrib/pf/   (props changed)
>>
>> Modified: stable/7/sys/amd64/include/param.h
>> ============================================================================== 
>>
>> --- stable/7/sys/amd64/include/param.h    Tue Mar  9 21:16:36 2010    
>> (r204930)
>> +++ stable/7/sys/amd64/include/param.h    Tue Mar  9 22:10:11 2010    
>> (r204931)
>> @@ -71,7 +71,7 @@
>> #endif
>>
>> #if defined(SMP) || defined(KLD_MODULE)
>> -#define MAXCPU        16
>> +#define MAXCPU        32
>> #else
>> #define MAXCPU        1
>> #endif
>>
>> Modified: stable/7/sys/i386/include/param.h
>> ============================================================================== 
>>
>> --- stable/7/sys/i386/include/param.h    Tue Mar  9 21:16:36 2010    
>> (r204930)
>> +++ stable/7/sys/i386/include/param.h    Tue Mar  9 22:10:11 2010    
>> (r204931)
>> @@ -66,7 +66,7 @@
>> #define MID_MACHINE    MID_I386
>>
>> #if defined(SMP) || defined(KLD_MODULE)
>> -#define MAXCPU        16
>> +#define MAXCPU        32
>> #else
>> #define MAXCPU        1
>> #endif /* SMP */
>>


From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 18:13:18 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3FCC5106566C;
	Wed, 10 Mar 2010 18:13:18 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DF088FC24;
	Wed, 10 Mar 2010 18:13:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2AIDI4j020119;
	Wed, 10 Mar 2010 18:13:18 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2AIDIlr020117;
	Wed, 10 Mar 2010 18:13:18 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201003101813.o2AIDIlr020117@svn.freebsd.org>
From: Jung-uk Kim 
Date: Wed, 10 Mar 2010 18:13:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204964 - stable/7/sys/dev/acpica
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 18:13:18 -0000

Author: jkim
Date: Wed Mar 10 18:13:17 2010
New Revision: 204964
URL: http://svn.freebsd.org/changeset/base/204964

Log:
  MFC:	r197438, r203810, r203813, r203935, r203936
  
  Sync acpi_video(4) with HEAD.
  
  r197438:
  Uninline an instance of STAILQ_FOREACH_SAFE().
  
  r203810:
  Implement LCD brightness control notify handler.
  
  r203813:
  Make sanity check slightly more useful and tweak an error message.
  
  r203935:
  Add support for `cycle' and `zero' events for LCD brightness control.
  
  r203936:
  Rename some macros to clarify their intentions and fix style nits.

Modified:
  stable/7/sys/dev/acpica/acpi_video.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/acpica/acpi_video.c
==============================================================================
--- stable/7/sys/dev/acpica/acpi_video.c	Wed Mar 10 17:58:32 2010	(r204963)
+++ stable/7/sys/dev/acpica/acpi_video.c	Wed Mar 10 18:13:17 2010	(r204964)
@@ -82,6 +82,7 @@ static struct acpi_video_output *acpi_vi
 static void	acpi_video_vo_bind(struct acpi_video_output *, ACPI_HANDLE);
 static void	acpi_video_vo_destroy(struct acpi_video_output *);
 static int	acpi_video_vo_check_level(struct acpi_video_output *, int);
+static void	acpi_video_vo_notify_handler(ACPI_HANDLE, UINT32, void *);
 static int	acpi_video_vo_active_sysctl(SYSCTL_HANDLER_ARGS);
 static int	acpi_video_vo_bright_sysctl(SYSCTL_HANDLER_ARGS);
 static int	acpi_video_vo_presets_sysctl(SYSCTL_HANDLER_ARGS);
@@ -92,56 +93,61 @@ static void	vid_set_switch_policy(ACPI_H
 static int	vid_enum_outputs(ACPI_HANDLE,
 		    void(*)(ACPI_HANDLE, UINT32, void *), void *);
 static int	vo_get_brightness_levels(ACPI_HANDLE, int **);
+static int	vo_get_brightness(ACPI_HANDLE);
 static void	vo_set_brightness(ACPI_HANDLE, int);
 static UINT32	vo_get_device_status(ACPI_HANDLE);
 static UINT32	vo_get_graphics_state(ACPI_HANDLE);
 static void	vo_set_device_state(ACPI_HANDLE, UINT32);
 
 /* events */
-#define VID_NOTIFY_SWITCHED	0x80
-#define VID_NOTIFY_REPROBE	0x81
+#define	VID_NOTIFY_SWITCHED	0x80
+#define	VID_NOTIFY_REPROBE	0x81
+#define	VID_NOTIFY_CYCLE_BRN	0x85
+#define	VID_NOTIFY_INC_BRN	0x86
+#define	VID_NOTIFY_DEC_BRN	0x87
+#define	VID_NOTIFY_ZERO_BRN	0x88
 
 /* _DOS (Enable/Disable Output Switching) argument bits */
-#define DOS_SWITCH_MASK		3
-#define DOS_SWITCH_BY_OSPM	0
-#define DOS_SWITCH_BY_BIOS	1
-#define DOS_SWITCH_LOCKED	2
-#define DOS_BRIGHTNESS_BY_BIOS	(1 << 2)
+#define	DOS_SWITCH_MASK		3
+#define	DOS_SWITCH_BY_OSPM	0
+#define	DOS_SWITCH_BY_BIOS	1
+#define	DOS_SWITCH_LOCKED	2
+#define	DOS_BRIGHTNESS_BY_OSPM	(1 << 2)
 
 /* _DOD and subdev's _ADR */
-#define DOD_DEVID_MASK		0x0f00
-#define DOD_DEVID_MASK_FULL	0xffff
-#define DOD_DEVID_MASK_DISPIDX	0x000f
-#define DOD_DEVID_MASK_DISPPORT	0x00f0
-#define DOD_DEVID_MONITOR	0x0100
-#define DOD_DEVID_LCD		0x0110
-#define DOD_DEVID_TV		0x0200
-#define DOD_DEVID_EXT		0x0300
-#define DOD_DEVID_INTDFP	0x0400
-#define DOD_BIOS		(1 << 16)
-#define DOD_NONVGA		(1 << 17)
-#define DOD_HEAD_ID_SHIFT	18
-#define DOD_HEAD_ID_BITS	3
-#define DOD_HEAD_ID_MASK \
+#define	DOD_DEVID_MASK		0x0f00
+#define	DOD_DEVID_MASK_FULL	0xffff
+#define	DOD_DEVID_MASK_DISPIDX	0x000f
+#define	DOD_DEVID_MASK_DISPPORT	0x00f0
+#define	DOD_DEVID_MONITOR	0x0100
+#define	DOD_DEVID_LCD		0x0110
+#define	DOD_DEVID_TV		0x0200
+#define	DOD_DEVID_EXT		0x0300
+#define	DOD_DEVID_INTDFP	0x0400
+#define	DOD_BIOS		(1 << 16)
+#define	DOD_NONVGA		(1 << 17)
+#define	DOD_HEAD_ID_SHIFT	18
+#define	DOD_HEAD_ID_BITS	3
+#define	DOD_HEAD_ID_MASK \
 		(((1 << DOD_HEAD_ID_BITS) - 1) << DOD_HEAD_ID_SHIFT)
-#define DOD_DEVID_SCHEME_STD	(1 << 31)
+#define	DOD_DEVID_SCHEME_STD	(1 << 31)
 
 /* _BCL related constants */
-#define BCL_FULLPOWER		0
-#define BCL_ECONOMY		1
+#define	BCL_FULLPOWER		0
+#define	BCL_ECONOMY		1
 
 /* _DCS (Device Currrent Status) value bits and masks. */
-#define DCS_EXISTS		(1 << 0)
-#define DCS_ACTIVE		(1 << 1)
-#define DCS_READY		(1 << 2)
-#define DCS_FUNCTIONAL		(1 << 3)
-#define DCS_ATTACHED		(1 << 4)
+#define	DCS_EXISTS		(1 << 0)
+#define	DCS_ACTIVE		(1 << 1)
+#define	DCS_READY		(1 << 2)
+#define	DCS_FUNCTIONAL		(1 << 3)
+#define	DCS_ATTACHED		(1 << 4)
 
 /* _DSS (Device Set Status) argument bits and masks. */
-#define DSS_INACTIVE		0
-#define DSS_ACTIVE		(1 << 0)
-#define DSS_SETNEXT		(1 << 30)
-#define DSS_COMMIT		(1 << 31)
+#define	DSS_INACTIVE		0
+#define	DSS_ACTIVE		(1 << 0)
+#define	DSS_SETNEXT		(1 << 30)
+#define	DSS_COMMIT		(1 << 31)
 
 static device_method_t acpi_video_methods[] = {
 	DEVMETHOD(device_identify, acpi_video_identify),
@@ -268,7 +274,7 @@ acpi_video_attach(device_t dev)
 	 * brightness levels.
 	 */
 	vid_set_switch_policy(sc->handle, DOS_SWITCH_BY_OSPM |
-	    DOS_BRIGHTNESS_BY_BIOS);
+	    DOS_BRIGHTNESS_BY_OSPM);
 
 	acpi_video_power_profile(sc);
 
@@ -289,8 +295,7 @@ acpi_video_detach(device_t dev)
 				acpi_video_notify_handler);
 
 	ACPI_SERIAL_BEGIN(video);
-	for (vo = STAILQ_FIRST(&sc->vid_outputs); vo != NULL; vo = vn) {
-		vn = STAILQ_NEXT(vo, vo_next);
+	STAILQ_FOREACH_SAFE(vo, &sc->vid_outputs, vo_next, vn) {
 		acpi_video_vo_destroy(vo);
 	}
 	ACPI_SERIAL_END(video);
@@ -577,6 +582,9 @@ acpi_video_vo_bind(struct acpi_video_out
 			/* XXX - see above. */
 			vo->vo_economy = vo->vo_levels[BCL_ECONOMY];
 	}
+	if (vo->vo_levels != NULL)
+	    AcpiInstallNotifyHandler(handle, ACPI_DEVICE_NOTIFY,
+		acpi_video_vo_notify_handler, vo);
 	ACPI_SERIAL_END(video_output);
 }
 
@@ -590,8 +598,11 @@ acpi_video_vo_destroy(struct acpi_video_
 		vo->vo_sysctl_tree = NULL;
 		sysctl_ctx_free(&vo->vo_sysctl_ctx);
 	}
-	if (vo->vo_levels != NULL)
+	if (vo->vo_levels != NULL) {
+		AcpiRemoveNotifyHandler(vo->handle, ACPI_DEVICE_NOTIFY,
+		    acpi_video_vo_notify_handler);
 		AcpiOsFree(vo->vo_levels);
+	}
 
 	switch (vo->adr & DOD_DEVID_MASK) {
 	case DOD_DEVID_MONITOR:
@@ -627,6 +638,79 @@ acpi_video_vo_check_level(struct acpi_vi
 	return (EINVAL);
 }
 
+static void
+acpi_video_vo_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
+{
+	struct acpi_video_output *vo;
+	int i, j, level, new_level;
+
+	vo = context;
+	ACPI_SERIAL_BEGIN(video_output);
+	if (vo->handle != handle)
+		goto out;
+
+	switch (notify) {
+	case VID_NOTIFY_CYCLE_BRN:
+		if (vo->vo_numlevels <= 3)
+			goto out;
+		/* FALLTHROUGH */
+	case VID_NOTIFY_INC_BRN:
+	case VID_NOTIFY_DEC_BRN:
+	case VID_NOTIFY_ZERO_BRN:
+		if (vo->vo_levels == NULL)
+			goto out;
+		level = vo_get_brightness(handle);
+		if (level < 0)
+			goto out;
+		break;
+	default:
+		printf("unknown notify event 0x%x from %s\n",
+		    notify, acpi_name(handle));
+		goto out;
+	}
+
+	new_level = level;
+	switch (notify) {
+	case VID_NOTIFY_CYCLE_BRN:
+		for (i = 2; i < vo->vo_numlevels; i++)
+			if (vo->vo_levels[i] == level) {
+				new_level = vo->vo_numlevels > i + 1 ?
+				     vo->vo_levels[i + 1] : vo->vo_levels[2];
+				break;
+			}
+		break;
+	case VID_NOTIFY_INC_BRN:
+	case VID_NOTIFY_DEC_BRN:
+		for (i = 0; i < vo->vo_numlevels; i++) {
+			j = vo->vo_levels[i];
+			if (notify == VID_NOTIFY_INC_BRN) {
+				if (j > level &&
+				    (j < new_level || level == new_level))
+					new_level = j;
+			} else {
+				if (j < level &&
+				    (j > new_level || level == new_level))
+					new_level = j;
+			}
+		}
+		break;
+	case VID_NOTIFY_ZERO_BRN:
+		for (i = 0; i < vo->vo_numlevels; i++)
+			if (vo->vo_levels[i] == 0) {
+				new_level = 0;
+				break;
+			}
+		break;
+	}
+	if (new_level != level) {
+		vo_set_brightness(handle, new_level);
+		vo->vo_brightness = new_level;
+	}
+
+out:
+	ACPI_SERIAL_END(video_output);
+}
+
 /* ARGSUSED */
 static int
 acpi_video_vo_active_sysctl(SYSCTL_HANDLER_ARGS)
@@ -900,6 +984,25 @@ out:
 	return (num);
 }
 
+static int
+vo_get_brightness(ACPI_HANDLE handle)
+{
+	UINT32 level;
+	ACPI_STATUS status;
+
+	ACPI_SERIAL_ASSERT(video_output);
+	status = acpi_GetInteger(handle, "_BQC", &level);
+	if (ACPI_FAILURE(status)) {
+		printf("can't evaluate %s._BQC - %s\n", acpi_name(handle),
+		    AcpiFormatException(status));
+		return (-1);
+	}
+	if (level > 100)
+		return (-1);
+
+	return (level);
+}
+
 static void
 vo_set_brightness(ACPI_HANDLE handle, int level)
 {

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 19:00:33 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8EB5B1065670;
	Wed, 10 Mar 2010 19:00:33 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D6A18FC19;
	Wed, 10 Mar 2010 19:00:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2AJ0Xh4033697;
	Wed, 10 Mar 2010 19:00:33 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2AJ0XAb033695;
	Wed, 10 Mar 2010 19:00:33 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <201003101900.o2AJ0XAb033695@svn.freebsd.org>
From: Ken Smith 
Date: Wed, 10 Mar 2010 19:00:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204967 - stable/7/release/scripts
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 19:00:33 -0000

Author: kensmith
Date: Wed Mar 10 19:00:33 2010
New Revision: 204967
URL: http://svn.freebsd.org/changeset/base/204967

Log:
  Package set for 7.3-RELEASE.
  
  Reviewed by:	portmgr@, re@

Modified:
  stable/7/release/scripts/package-split.py

Modified: stable/7/release/scripts/package-split.py
==============================================================================
--- stable/7/release/scripts/package-split.py	Wed Mar 10 18:51:13 2010	(r204966)
+++ stable/7/release/scripts/package-split.py	Wed Mar 10 19:00:33 2010	(r204967)
@@ -26,7 +26,7 @@ else:
 # List of packages for disc1.  This just includes packages sysinstall can
 # install as a distribution
 def disc1_packages():
-    pkgs = ['lang/perl5.8']
+    pkgs = ['lang/perl5.10']
     pkgs.extend(['x11/xorg',
 		 'x11-drivers/xorg-drivers',
 		 'x11-fonts/xorg-fonts',
@@ -47,13 +47,8 @@ def disc2_packages():
 		'x11/kde-lite']
     else:
 	pkgs = ['x11/gnome2',
-		'x11/kdebase4',
 		'x11/kdelibs4',
-		'games/kdegames4',
-		'graphics/kdegraphics4',
-		'misc/kdeutils4',
-		'multimedia/kdemultimedia4',
-		'net/kdenetwork4']
+		'games/kdegames4']
     return pkgs
 
 def disc3_packages():
@@ -84,21 +79,21 @@ def disc3_packages():
             'misc/compat6x',
             'net/cvsup-without-gui',
             'net/rsync',
+            'net/mpd5',
             'net/samba3',
             'news/slrn',
             'news/tin',
+            'ports-mgmt/portmaster',
             'ports-mgmt/portupgrade',
             'print/a2ps-letter',
-            'print/apsfilter',
             'print/ghostscript7-nox11',
             'print/gv',
             'print/psutils-letter',
-            'print/teTeX',
             'shells/bash',
             'shells/pdksh',
             'shells/zsh',
             'security/sudo',
-            'textproc/docproj-jadetex',
+            'sysutils/screen',
             'www/apache13',
             'www/apache13-modssl',
             'www/apache22',

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 19:49:33 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8601F1065670;
	Wed, 10 Mar 2010 19:49:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 752898FC26;
	Wed, 10 Mar 2010 19:49:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2AJnXiv044638;
	Wed, 10 Mar 2010 19:49:33 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2AJnXHR044636;
	Wed, 10 Mar 2010 19:49:33 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201003101949.o2AJnXHR044636@svn.freebsd.org>
From: John Baldwin 
Date: Wed, 10 Mar 2010 19:49:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204971 - stable/7/sys/kern
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 19:49:33 -0000

Author: jhb
Date: Wed Mar 10 19:49:33 2010
New Revision: 204971
URL: http://svn.freebsd.org/changeset/base/204971

Log:
  MFC 204638:
  Allow lseek(SEEK_END) to work on disk devices by using the DIOCGMEDIASIZE
  to determine the media size.

Modified:
  stable/7/sys/kern/vfs_syscalls.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/7/sys/kern/vfs_syscalls.c	Wed Mar 10 19:47:05 2010	(r204970)
+++ stable/7/sys/kern/vfs_syscalls.c	Wed Mar 10 19:49:33 2010	(r204971)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1762,7 +1763,7 @@ lseek(td, uap)
 	struct file *fp;
 	struct vnode *vp;
 	struct vattr vattr;
-	off_t offset;
+	off_t offset, size;
 	int error, noneg;
 	int vfslocked;
 
@@ -1792,6 +1793,15 @@ lseek(td, uap)
 		VOP_UNLOCK(vp, 0, td);
 		if (error)
 			break;
+
+		/*
+		 * If the file references a disk device, then fetch
+		 * the media size and use that to determine the ending
+		 * offset.
+		 */
+		if (vattr.va_size == 0 && vp->v_type == VCHR &&
+		    fo_ioctl(fp, DIOCGMEDIASIZE, &size, cred, td) == 0)
+			vattr.va_size = size;
 		if (noneg &&
 		    (vattr.va_size > OFF_MAX ||
 		    (offset > 0 && vattr.va_size > OFF_MAX - offset))) {

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Mar 10 22:23:55 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA60E106566B;
	Wed, 10 Mar 2010 22:23:55 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C95D08FC14;
	Wed, 10 Mar 2010 22:23:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2AMNtHc079787;
	Wed, 10 Mar 2010 22:23:55 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2AMNtjP079785;
	Wed, 10 Mar 2010 22:23:55 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201003102223.o2AMNtjP079785@svn.freebsd.org>
From: Pyun YongHyeon 
Date: Wed, 10 Mar 2010 22:23:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204986 - stable/7/sys/dev/mii
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 10 Mar 2010 22:23:56 -0000

Author: yongari
Date: Wed Mar 10 22:23:55 2010
New Revision: 204986
URL: http://svn.freebsd.org/changeset/base/204986

Log:
  MFC r204647:
    Remove programming LED register and enable 25MHz TX clock for
    88E1149 PHY. This will fix intermittent watchdog timeouts as well
    as very slow network performance on 88E8072 Yukon Extreme.
  
    PR:	kern/144148

Modified:
  stable/7/sys/dev/mii/e1000phy.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/e1000phy.c	Wed Mar 10 22:21:07 2010	(r204985)
+++ stable/7/sys/dev/mii/e1000phy.c	Wed Mar 10 22:23:55 2010	(r204986)
@@ -275,7 +275,6 @@ e1000phy_reset(struct mii_softc *sc)
 	case MII_MODEL_MARVELL_E1118:
 		break;
 	case MII_MODEL_MARVELL_E1116:
-	case MII_MODEL_MARVELL_E1149:
 		page = PHY_READ(sc, E1000_EADR);
 		/* Select page 3, LED control register. */
 		PHY_WRITE(sc, E1000_EADR, 3);

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Mar 11 07:38:27 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CE0D1106564A;
	Thu, 11 Mar 2010 07:38:27 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BC89B8FC16;
	Thu, 11 Mar 2010 07:38:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2B7cR28002706;
	Thu, 11 Mar 2010 07:38:27 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2B7cRUn002703;
	Thu, 11 Mar 2010 07:38:27 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201003110738.o2B7cRUn002703@svn.freebsd.org>
From: Fabien Thomas 
Date: Thu, 11 Mar 2010 07:38:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205000 - in stable/7/sys: dev/hwpmc sys
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 11 Mar 2010 07:38:27 -0000

Author: fabient
Date: Thu Mar 11 07:38:27 2010
New Revision: 205000
URL: http://svn.freebsd.org/changeset/base/205000

Log:
  MFC r204878:
   Change the way shutdown is handled for log file.
  
   pmc_flush_logfile is now non-blocking and just ask the kernel
   to shutdown the file. From that point, no more data is
   accepted by the log thread and when the last buffer is flushed
   the file is closed.
  
   This will remove a deadlock between pmcstat asking for
   flush while it cannot flush the pipe itself.

Modified:
  stable/7/sys/dev/hwpmc/hwpmc_logging.c
  stable/7/sys/sys/pmc.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/hwpmc/hwpmc_logging.c
==============================================================================
--- stable/7/sys/dev/hwpmc/hwpmc_logging.c	Thu Mar 11 07:36:45 2010	(r204999)
+++ stable/7/sys/dev/hwpmc/hwpmc_logging.c	Thu Mar 11 07:38:27 2010	(r205000)
@@ -237,7 +237,7 @@ pmclog_get_buffer(struct pmc_owner *po)
 static void
 pmclog_loop(void *arg)
 {
-	int error;
+	int error, last_buffer;
 	struct pmc_owner *po;
 	struct pmclog_buffer *lb;
 	struct proc *p;
@@ -252,6 +252,7 @@ pmclog_loop(void *arg)
 	p = po->po_owner;
 	td = curthread;
 	mycred = td->td_ucred;
+	last_buffer = 0;
 
 	PROC_LOCK(p);
 	ownercred = crhold(p->p_ucred);
@@ -284,27 +285,20 @@ pmclog_loop(void *arg)
 			if ((lb = TAILQ_FIRST(&po->po_logbuffers)) == NULL) {
 				mtx_unlock_spin(&po->po_mtx);
 
-				/*
-				 * Wakeup the thread waiting for the
-				 * PMC_OP_FLUSHLOG request to
-				 * complete.
-				 */
-				if (po->po_flags & PMC_PO_IN_FLUSH) {
-					po->po_flags &= ~PMC_PO_IN_FLUSH;
-					wakeup_one(po->po_kthread);
-				}
-
 				(void) msleep(po, &pmc_kthread_mtx, PWAIT,
 				    "pmcloop", 0);
 				continue;
 			}
 
 			TAILQ_REMOVE(&po->po_logbuffers, lb, plb_next);
+			if (po->po_flags & PMC_PO_SHUTDOWN)
+				last_buffer = TAILQ_EMPTY(&po->po_logbuffers);
 			mtx_unlock_spin(&po->po_mtx);
 		}
 
 		mtx_unlock(&pmc_kthread_mtx);
 
+sigpipe_retry:
 		/* process the request */
 		PMCDBG(LOG,WRI,2, "po=%p base=%p ptr=%p", po,
 		    lb->plb_base, lb->plb_ptr);
@@ -328,7 +322,8 @@ pmclog_loop(void *arg)
 
 		if (error) {
 			/* XXX some errors are recoverable */
-			/* XXX also check for SIGPIPE if a socket */
+			if (error == EPIPE)
+				goto sigpipe_retry;
 
 			/* send a SIGIO to the owner and exit */
 			PROC_LOCK(p);
@@ -344,6 +339,14 @@ pmclog_loop(void *arg)
 			break;
 		}
 
+		if (last_buffer) {
+			/*
+			 * Close the file to get PMCLOG_EOF error
+			 * in pmclog(3).
+			 */
+			fo_close(po->po_file, curthread);
+		}
+
 		mtx_lock(&pmc_kthread_mtx);
 
 		/* put the used buffer back into the global pool */
@@ -425,6 +428,12 @@ pmclog_reserve(struct pmc_owner *po, int
 
 	mtx_lock_spin(&po->po_mtx);
 
+	/* No more data when shutdown in progress. */
+	if (po->po_flags & PMC_PO_SHUTDOWN) {
+		mtx_unlock_spin(&po->po_mtx);
+		return (NULL);
+	}
+
 	if (po->po_curbuf == NULL)
 		if (pmclog_get_buffer(po) != 0) {
 			mtx_unlock_spin(&po->po_mtx);
@@ -686,7 +695,7 @@ pmclog_deconfigure_log(struct pmc_owner 
 int
 pmclog_flush(struct pmc_owner *po)
 {
-	int error, has_pending_buffers;
+	int error;
 
 	PMCDBG(LOG,FLS,1, "po=%p", po);
 
@@ -714,16 +723,13 @@ pmclog_flush(struct pmc_owner *po)
 	mtx_lock_spin(&po->po_mtx);
 	if (po->po_curbuf)
 		pmclog_schedule_io(po);
-	has_pending_buffers = !TAILQ_EMPTY(&po->po_logbuffers);
 	mtx_unlock_spin(&po->po_mtx);
 
-	if (has_pending_buffers) {
-		po->po_flags |= PMC_PO_IN_FLUSH; /* ask for a wakeup */
-		error = msleep(po->po_kthread, &pmc_kthread_mtx, PWAIT,
-		    "pmcflush", 0);
-		if (error == 0)
-			error = po->po_error;
-	}
+	/*
+	 * Initiate shutdown: no new data queued,
+	 * thread will close file on last block.
+	 */
+	po->po_flags |= PMC_PO_SHUTDOWN;
 
  error:
 	mtx_unlock(&pmc_kthread_mtx);

Modified: stable/7/sys/sys/pmc.h
==============================================================================
--- stable/7/sys/sys/pmc.h	Thu Mar 11 07:36:45 2010	(r204999)
+++ stable/7/sys/sys/pmc.h	Thu Mar 11 07:38:27 2010	(r205000)
@@ -760,7 +760,7 @@ struct pmc_owner  {
 };
 
 #define	PMC_PO_OWNS_LOGFILE		0x00000001 /* has a log file */
-#define	PMC_PO_IN_FLUSH			0x00000010 /* in the middle of a flush */
+#define	PMC_PO_SHUTDOWN			0x00000010 /* in the process of shutdown */
 #define	PMC_PO_INITIAL_MAPPINGS_DONE	0x00000020
 
 /*

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Mar 11 07:39:37 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28C341065672;
	Thu, 11 Mar 2010 07:39:37 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1793D8FC13;
	Thu, 11 Mar 2010 07:39:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2B7daiL003020;
	Thu, 11 Mar 2010 07:39:36 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2B7daIk003018;
	Thu, 11 Mar 2010 07:39:36 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201003110739.o2B7daIk003018@svn.freebsd.org>
From: Fabien Thomas 
Date: Thu, 11 Mar 2010 07:39:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205001 - stable/7/usr.sbin/pmcstat
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 11 Mar 2010 07:39:37 -0000

Author: fabient
Date: Thu Mar 11 07:39:36 2010
New Revision: 205001
URL: http://svn.freebsd.org/changeset/base/205001

Log:
  MFC r204878:
   Change the way shutdown is handled for log file.
  
   pmc_flush_logfile is now non-blocking and just ask the kernel
   to shutdown the file. From that point, no more data is
   accepted by the log thread and when the last buffer is flushed
   the file is closed.
  
   This will remove a deadlock between pmcstat asking for
   flush while it cannot flush the pipe itself.

Modified:
  stable/7/usr.sbin/pmcstat/pmcstat_log.c
Directory Properties:
  stable/7/usr.sbin/pmcstat/   (props changed)

Modified: stable/7/usr.sbin/pmcstat/pmcstat_log.c
==============================================================================
--- stable/7/usr.sbin/pmcstat/pmcstat_log.c	Thu Mar 11 07:38:27 2010	(r205000)
+++ stable/7/usr.sbin/pmcstat/pmcstat_log.c	Thu Mar 11 07:39:36 2010	(r205001)
@@ -1670,10 +1670,8 @@ pmcstat_print_log(void)
 int
 pmcstat_close_log(void)
 {
-	if (pmc_flush_logfile() < 0 ||
-	    pmc_configure_logfile(-1) < 0)
+	if (pmc_flush_logfile() < 0)
 		err(EX_OSERR, "ERROR: logging failed");
-	args.pa_flags &= ~(FLAG_HAS_OUTPUT_LOGFILE | FLAG_HAS_PIPE);
 	return (args.pa_flags & FLAG_HAS_PIPE ? PMCSTAT_EXITING :
 	    PMCSTAT_FINISHED);
 }

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 12 00:51:25 2010
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E910A106566B;
	Fri, 12 Mar 2010 00:51:25 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BC0ED8FC23;
	Fri, 12 Mar 2010 00:51:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2C0pPjj040811;
	Fri, 12 Mar 2010 00:51:25 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2C0pP1W040809;
	Fri, 12 Mar 2010 00:51:25 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201003120051.o2C0pP1W040809@svn.freebsd.org>
From: Xin LI 
Date: Fri, 12 Mar 2010 00:51:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205057 - stable/7/games/grdc
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 12 Mar 2010 00:51:26 -0000

Author: delphij
Date: Fri Mar 12 00:51:25 2010
New Revision: 205057
URL: http://svn.freebsd.org/changeset/base/205057

Log:
  MFC r203760: Improve time precision for grdc(6):
  
  Traditionally, grdc would obtain time through time(3) which in turn gets
  only the second part of clock (CLOCK_SECOND), and sleep for 1 second after
  each screen refresh.
  
  This approach would have two problems.  First, we are not guaranteed to
  be waken up at the beginning of a whole second, which will typically
  exhibit as a "lag" on second number.  Second, because we sleep for whole
  second, and the refresh process would take some time, the error would
  accumulate from time to time, making the lag variable.
  
  Make grdc(6) to use time(3) to get time only at the beginning, and sample
  time in CLOCK_REALTIME_FAST granularity after refreshing, and use the
  nanosecond part to caculate how much time we want to sleep.
  
  PR:		bin/120813

Modified:
  stable/7/games/grdc/grdc.c
Directory Properties:
  stable/7/games/grdc/   (props changed)

Modified: stable/7/games/grdc/grdc.c
==============================================================================
--- stable/7/games/grdc/grdc.c	Fri Mar 12 00:51:13 2010	(r205056)
+++ stable/7/games/grdc/grdc.c	Fri Mar 12 00:51:25 2010	(r205057)
@@ -59,6 +59,7 @@ main(argc, argv)
 int argc;
 char **argv;
 {
+struct timespec ts;
 long t, a;
 int i, j, s, k;
 int n;
@@ -136,9 +137,9 @@ int t12;
 
 		attrset(COLOR_PAIR(2));
 	}
+	time(&now);
 	do {
 		mask = 0;
-		time(&now);
 		tm = localtime(&now);
 		set(tm->tm_sec%10, 0);
 		set(tm->tm_sec/10, 4);
@@ -193,7 +194,19 @@ int t12;
 		}
 		movto(6, 0);
 		refresh();
-		sleep(1);
+		clock_gettime(CLOCK_REALTIME_FAST, &ts);
+		if (ts.tv_sec == now) {
+			if (ts.tv_nsec > 0) {
+				ts.tv_sec = 0;
+				ts.tv_nsec = 1000000000 - ts.tv_nsec;
+			} else {
+				ts.tv_sec = 1;
+				ts.tv_nsec = 0;
+			}
+			nanosleep(&ts, NULL);
+			now = ts.tv_sec + 1;
+		} else
+			now = ts.tv_sec;
 		if (sigtermed) {
 			standend();
 			clear();