svn commit: r267466 - head/sys/dev/iwn

2014-06-14 Thread Adrian Chadd
Author: adrian
Date: Sat Jun 14 06:54:03 2014
New Revision: 267466
URL: http://svnweb.freebsd.org/changeset/base/267466

Log:
  Shadow RAM support is apparently not at all working on the Intel 5300 Wifi.
  
  Tested:
  
  * Intel 5300 3x3 wifi
  * Intel 5100

Modified:
  head/sys/dev/iwn/if_iwn_chip_cfg.h

Modified: head/sys/dev/iwn/if_iwn_chip_cfg.h
==
--- head/sys/dev/iwn/if_iwn_chip_cfg.h  Sat Jun 14 02:57:40 2014
(r267465)
+++ head/sys/dev/iwn/if_iwn_chip_cfg.h  Sat Jun 14 06:54:03 2014
(r267466)
@@ -116,7 +116,7 @@ struct iwn_base_params {
 static const struct iwn_base_params iwn5000_base_params = {
.pll_cfg_val = IWN_ANA_PLL_INIT,/* pll_cfg_val; */
.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x00,  /* max_ll_items */
-   .shadow_ram_support = true, /* shadow_ram_support */
+   .shadow_ram_support = false,/* shadow_ram_support */
.shadow_reg_enable = false, /* shadow_reg_enable */
.bt_session_2 = false,  /* bt_session_2 */
.bt_sco_disable = true, /* bt_sco_disable */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267470 - stable/10/lib/clang

2014-06-14 Thread Dimitry Andric
Author: dim
Date: Sat Jun 14 11:20:41 2014
New Revision: 267470
URL: http://svnweb.freebsd.org/changeset/base/267470

Log:
  MFC r267335:
  
  In some scenarios, when generating llvm/clang .inc.h files, multiple
  source files could be passed to tblgen or clang-tblgen, leading to a
  Too many positional arguments specified error message.  Fix this by
  replacing the too-generic ${.ALLSRC} sources with explicit paths.
  
  Reported by:  ryst...@gmail.com, rodrigc

Modified:
  stable/10/lib/clang/clang.build.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/clang/clang.build.mk
==
--- stable/10/lib/clang/clang.build.mk  Sat Jun 14 11:13:02 2014
(r267469)
+++ stable/10/lib/clang/clang.build.mk  Sat Jun 14 11:20:41 2014
(r267470)
@@ -70,149 +70,160 @@ ${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM
 Attrs.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-classes \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrDump.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-dump \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrIdentifierArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-identifier-arg-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-impl \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrLateParsed.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-late-parsed-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrParsedAttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-impl \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrParsedAttrKinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-kinds \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrParsedAttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrPCHRead.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-pch-read \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrPCHWrite.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-pch-write \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrSpellings.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-spelling-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrSpellingListIndex.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-spelling-index \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrTemplateInstantiate.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-template-instantiate \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrTypeArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-type-arg-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-

svn commit: r267471 - vendor/tzdata/dist

2014-06-14 Thread Edwin Groothuis
Author: edwin
Date: Sat Jun 14 11:30:25 2014
New Revision: 267471
URL: http://svnweb.freebsd.org/changeset/base/267471

Log:
  Update to tzdata2014e:
  
  Fix historical data for Egypt.
  Better prediction for future Egypt / Morocco changes.
  Update to Cocos / Cook islands.
  Fix historical data for Russia.
  
  Obtained from:ftp://ftp.iana.org/tz/releases/

Modified:
  vendor/tzdata/dist/africa
  vendor/tzdata/dist/australasia
  vendor/tzdata/dist/europe
  vendor/tzdata/dist/northamerica

Modified: vendor/tzdata/dist/africa
==
--- vendor/tzdata/dist/africa   Sat Jun 14 11:20:41 2014(r267470)
+++ vendor/tzdata/dist/africa   Sat Jun 14 11:30:25 2014(r267471)
@@ -239,13 +239,13 @@ Rule  Egypt   19901994-   May  1  
1:001:00
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
 # /a
 Rule   Egypt   19952010-   Apr lastFri  0:00s  1:00S
-Rule   Egypt   19952005-   Sep lastThu 23:00s  0   -
+Rule   Egypt   19952005-   Sep lastThu 24:00   0   -
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule   Egypt   2006only-   Sep 21  23:00s  0   -
+Rule   Egypt   2006only-   Sep 21  24:00   0   -
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ RuleEgypt   2006only-   Sep 21  
23:00s  0   -
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # 
http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm
-Rule   Egypt   2007only-   Sep Thu=1  23:00s  0   -
+Rule   Egypt   2007only-   Sep Thu=1  24:00   0   -
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,46 +342,77 @@ Rule  Egypt   2007only-   Sep Thu=1  
23:00s
 # From Gunther Vermier (2015-05-13):
 # our Egypt office confirms that the change will be at 15 May midnight 
(24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally located a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014.  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # 
http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule   Egypt   2008only-   Aug lastThu 23:00s  0   -
-Rule   Egypt   2009only-   Aug 20  23:00s  0   -
-Rule   Egypt   2010only-   Aug 11  0:000   -
-Rule   Egypt   2010only-   Sep 10  0:001:00S
-Rule   Egypt   2010

svn commit: r267472 - vendor/tzdata/tzdata2014e

2014-06-14 Thread Edwin Groothuis
Author: edwin
Date: Sat Jun 14 11:31:31 2014
New Revision: 267472
URL: http://svnweb.freebsd.org/changeset/base/267472

Log:
  Tag of tzdata2014e sources

Added:
  vendor/tzdata/tzdata2014e/
 - copied from r267471, vendor/tzdata/dist/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267473 - head/contrib/tzdata

2014-06-14 Thread Edwin Groothuis
Author: edwin
Date: Sat Jun 14 11:34:39 2014
New Revision: 267473
URL: http://svnweb.freebsd.org/changeset/base/267473

Log:
  MFV of 267471, tzdata2014e
  
  Fix historical data for Egypt.
  Better prediction for future Egypt / Morocco changes.
  Update to Cocos / Cook islands.
  Fix historical data for Russia.

Modified:
  head/contrib/tzdata/africa
  head/contrib/tzdata/australasia
  head/contrib/tzdata/europe
  head/contrib/tzdata/northamerica
Directory Properties:
  head/contrib/tzdata/   (props changed)

Modified: head/contrib/tzdata/africa
==
--- head/contrib/tzdata/africa  Sat Jun 14 11:31:31 2014(r267472)
+++ head/contrib/tzdata/africa  Sat Jun 14 11:34:39 2014(r267473)
@@ -239,13 +239,13 @@ Rule  Egypt   19901994-   May  1  
1:001:00
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
 # /a
 Rule   Egypt   19952010-   Apr lastFri  0:00s  1:00S
-Rule   Egypt   19952005-   Sep lastThu 23:00s  0   -
+Rule   Egypt   19952005-   Sep lastThu 24:00   0   -
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule   Egypt   2006only-   Sep 21  23:00s  0   -
+Rule   Egypt   2006only-   Sep 21  24:00   0   -
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ RuleEgypt   2006only-   Sep 21  
23:00s  0   -
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # 
http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm
-Rule   Egypt   2007only-   Sep Thu=1  23:00s  0   -
+Rule   Egypt   2007only-   Sep Thu=1  24:00   0   -
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,46 +342,77 @@ Rule  Egypt   2007only-   Sep Thu=1  
23:00s
 # From Gunther Vermier (2015-05-13):
 # our Egypt office confirms that the change will be at 15 May midnight 
(24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally located a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014.  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # 
http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule   Egypt   2008only-   Aug lastThu 23:00s  0   -
-Rule   Egypt   2009only-   Aug 20  23:00s  0   -
-Rule   Egypt   2010only-   Aug 11  0:000   -
-Rule   Egypt   2010only-   Sep 10  0:001:00S
-Rule   Egypt 

svn commit: r267474 - stable/6/share/zoneinfo

2014-06-14 Thread Edwin Groothuis
Author: edwin
Date: Sat Jun 14 11:36:29 2014
New Revision: 267474
URL: http://svnweb.freebsd.org/changeset/base/267474

Log:
  MFC of i267473,tzdata2013b
  
  Fix historical data for Egypt.
  Better prediction for future Egypt / Morocco changes.
  Update to Cocos / Cook islands.
  Fix historical data for Russia.

Modified:
  stable/6/share/zoneinfo/africa
  stable/6/share/zoneinfo/australasia
  stable/6/share/zoneinfo/europe
  stable/6/share/zoneinfo/northamerica
Directory Properties:
  stable/6/share/zoneinfo/   (props changed)

Modified: stable/6/share/zoneinfo/africa
==
--- stable/6/share/zoneinfo/africa  Sat Jun 14 11:34:39 2014
(r267473)
+++ stable/6/share/zoneinfo/africa  Sat Jun 14 11:36:29 2014
(r267474)
@@ -239,13 +239,13 @@ Rule  Egypt   19901994-   May  1  
1:001:00
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
 # /a
 Rule   Egypt   19952010-   Apr lastFri  0:00s  1:00S
-Rule   Egypt   19952005-   Sep lastThu 23:00s  0   -
+Rule   Egypt   19952005-   Sep lastThu 24:00   0   -
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule   Egypt   2006only-   Sep 21  23:00s  0   -
+Rule   Egypt   2006only-   Sep 21  24:00   0   -
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ RuleEgypt   2006only-   Sep 21  
23:00s  0   -
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # 
http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm
-Rule   Egypt   2007only-   Sep Thu=1  23:00s  0   -
+Rule   Egypt   2007only-   Sep Thu=1  24:00   0   -
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,46 +342,77 @@ Rule  Egypt   2007only-   Sep Thu=1  
23:00s
 # From Gunther Vermier (2015-05-13):
 # our Egypt office confirms that the change will be at 15 May midnight 
(24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally located a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014.  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # 
http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule   Egypt   2008only-   Aug lastThu 23:00s  0   -
-Rule   Egypt   2009only-   Aug 20  23:00s  0   -
-Rule   Egypt   2010only-   Aug 11  0:000   -
-Rule   Egypt   2010only-   Sep   

svn commit: r267475 - stable/7/share/zoneinfo

2014-06-14 Thread Edwin Groothuis
Author: edwin
Date: Sat Jun 14 11:37:01 2014
New Revision: 267475
URL: http://svnweb.freebsd.org/changeset/base/267475

Log:
  MFC of i267473,tzdata2013b
  
  Fix historical data for Egypt.
  Better prediction for future Egypt / Morocco changes.
  Update to Cocos / Cook islands.
  Fix historical data for Russia.

Modified:
  stable/7/share/zoneinfo/africa
  stable/7/share/zoneinfo/australasia
  stable/7/share/zoneinfo/europe
  stable/7/share/zoneinfo/northamerica
Directory Properties:
  stable/7/share/zoneinfo/   (props changed)

Modified: stable/7/share/zoneinfo/africa
==
--- stable/7/share/zoneinfo/africa  Sat Jun 14 11:36:29 2014
(r267474)
+++ stable/7/share/zoneinfo/africa  Sat Jun 14 11:37:01 2014
(r267475)
@@ -239,13 +239,13 @@ Rule  Egypt   19901994-   May  1  
1:001:00
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
 # /a
 Rule   Egypt   19952010-   Apr lastFri  0:00s  1:00S
-Rule   Egypt   19952005-   Sep lastThu 23:00s  0   -
+Rule   Egypt   19952005-   Sep lastThu 24:00   0   -
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule   Egypt   2006only-   Sep 21  23:00s  0   -
+Rule   Egypt   2006only-   Sep 21  24:00   0   -
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ RuleEgypt   2006only-   Sep 21  
23:00s  0   -
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # 
http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm
-Rule   Egypt   2007only-   Sep Thu=1  23:00s  0   -
+Rule   Egypt   2007only-   Sep Thu=1  24:00   0   -
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,46 +342,77 @@ Rule  Egypt   2007only-   Sep Thu=1  
23:00s
 # From Gunther Vermier (2015-05-13):
 # our Egypt office confirms that the change will be at 15 May midnight 
(24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally located a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014.  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # 
http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule   Egypt   2008only-   Aug lastThu 23:00s  0   -
-Rule   Egypt   2009only-   Aug 20  23:00s  0   -
-Rule   Egypt   2010only-   Aug 11  0:000   -
-Rule   Egypt   2010only-   Sep   

svn commit: r267476 - stable/8/share/zoneinfo

2014-06-14 Thread Edwin Groothuis
Author: edwin
Date: Sat Jun 14 11:37:53 2014
New Revision: 267476
URL: http://svnweb.freebsd.org/changeset/base/267476

Log:
  MFC of i267473,tzdata2014e
  
  Fix historical data for Egypt.
  Better prediction for future Egypt / Morocco changes.
  Update to Cocos / Cook islands.
  Fix historical data for Russia.

Modified:
  stable/8/share/zoneinfo/africa
  stable/8/share/zoneinfo/australasia
  stable/8/share/zoneinfo/europe
  stable/8/share/zoneinfo/northamerica
Directory Properties:
  stable/8/share/zoneinfo/   (props changed)

Modified: stable/8/share/zoneinfo/africa
==
--- stable/8/share/zoneinfo/africa  Sat Jun 14 11:37:01 2014
(r267475)
+++ stable/8/share/zoneinfo/africa  Sat Jun 14 11:37:53 2014
(r267476)
@@ -239,13 +239,13 @@ Rule  Egypt   19901994-   May  1  
1:001:00
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
 # /a
 Rule   Egypt   19952010-   Apr lastFri  0:00s  1:00S
-Rule   Egypt   19952005-   Sep lastThu 23:00s  0   -
+Rule   Egypt   19952005-   Sep lastThu 24:00   0   -
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule   Egypt   2006only-   Sep 21  23:00s  0   -
+Rule   Egypt   2006only-   Sep 21  24:00   0   -
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ RuleEgypt   2006only-   Sep 21  
23:00s  0   -
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # 
http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm
-Rule   Egypt   2007only-   Sep Thu=1  23:00s  0   -
+Rule   Egypt   2007only-   Sep Thu=1  24:00   0   -
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,46 +342,77 @@ Rule  Egypt   2007only-   Sep Thu=1  
23:00s
 # From Gunther Vermier (2015-05-13):
 # our Egypt office confirms that the change will be at 15 May midnight 
(24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally located a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014.  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # 
http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule   Egypt   2008only-   Aug lastThu 23:00s  0   -
-Rule   Egypt   2009only-   Aug 20  23:00s  0   -
-Rule   Egypt   2010only-   Aug 11  0:000   -
-Rule   Egypt   2010only-   Sep   

svn commit: r267477 - stable/10/contrib/tzdata

2014-06-14 Thread Edwin Groothuis
Author: edwin
Date: Sat Jun 14 11:46:22 2014
New Revision: 267477
URL: http://svnweb.freebsd.org/changeset/base/267477

Log:
  MFC of 267473,tzdata2014e
  
  Fix historical data for Egypt.
  Better prediction for future Egypt / Morocco changes.
  Update to Cocos / Cook islands.
  Fix historical data for Russia.

Modified:
  stable/10/contrib/tzdata/africa
  stable/10/contrib/tzdata/australasia
  stable/10/contrib/tzdata/europe
  stable/10/contrib/tzdata/northamerica
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/tzdata/africa
==
--- stable/10/contrib/tzdata/africa Sat Jun 14 11:37:53 2014
(r267476)
+++ stable/10/contrib/tzdata/africa Sat Jun 14 11:46:22 2014
(r267477)
@@ -239,13 +239,13 @@ Rule  Egypt   19901994-   May  1  
1:001:00
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
 # /a
 Rule   Egypt   19952010-   Apr lastFri  0:00s  1:00S
-Rule   Egypt   19952005-   Sep lastThu 23:00s  0   -
+Rule   Egypt   19952005-   Sep lastThu 24:00   0   -
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule   Egypt   2006only-   Sep 21  23:00s  0   -
+Rule   Egypt   2006only-   Sep 21  24:00   0   -
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ RuleEgypt   2006only-   Sep 21  
23:00s  0   -
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # 
http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm
-Rule   Egypt   2007only-   Sep Thu=1  23:00s  0   -
+Rule   Egypt   2007only-   Sep Thu=1  24:00   0   -
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,46 +342,77 @@ Rule  Egypt   2007only-   Sep Thu=1  
23:00s
 # From Gunther Vermier (2015-05-13):
 # our Egypt office confirms that the change will be at 15 May midnight 
(24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally located a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014.  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # 
http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule   Egypt   2008only-   Aug lastThu 23:00s  0   -
-Rule   Egypt   2009only-   Aug 20  23:00s  0   -
-Rule   Egypt   2010only-   Aug 11  0:000   -
-Rule   Egypt   2010only-   Sep 10  

svn commit: r267478 - head/contrib/openbsm/libbsm

2014-06-14 Thread Christian Brueffer
Author: brueffer
Date: Sat Jun 14 12:17:45 2014
New Revision: 267478
URL: http://svnweb.freebsd.org/changeset/base/267478

Log:
  MFp4: change 1191346
  
  In print_header32_tok(), correct printing in the XML case.  This lead to
  invalid XML files before.
  
  PR:   176259
  Submitted by: zi
  MFC after:3 days

Modified:
  head/contrib/openbsm/libbsm/bsm_io.c

Modified: head/contrib/openbsm/libbsm/bsm_io.c
==
--- head/contrib/openbsm/libbsm/bsm_io.cSat Jun 14 11:46:22 2014
(r267477)
+++ head/contrib/openbsm/libbsm/bsm_io.cSat Jun 14 12:17:45 2014
(r267478)
@@ -949,7 +949,7 @@ print_header32_tok(FILE *fp, tokenstr_t 
 {
 
print_tok_type(fp, tok-id, header, oflags);
-   if (oflags  AU_OFLAG_RAW) {
+   if (oflags  AU_OFLAG_XML) {
open_attr(fp, version);
print_1_byte(fp, tok-tt.hdr32.version, %u);
close_attr(fp);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267479 - head/sys/nfs

2014-06-14 Thread Alexander Motin
Author: mav
Date: Sat Jun 14 12:26:12 2014
New Revision: 267479
URL: http://svnweb.freebsd.org/changeset/base/267479

Log:
  Fix/improve fhe_stats sysctl output.
  
  MFC after:2 weeks

Modified:
  head/sys/nfs/nfs_fha.c

Modified: head/sys/nfs/nfs_fha.c
==
--- head/sys/nfs/nfs_fha.c  Sat Jun 14 12:17:45 2014(r267478)
+++ head/sys/nfs/nfs_fha.c  Sat Jun 14 12:26:12 2014(r267479)
@@ -468,14 +468,14 @@ fha_nd_complete(SVCTHREAD *thread, struc
 int
 fhe_stats_sysctl(SYSCTL_HANDLER_ARGS, struct fha_params *softc)
 {
-   int error, count, i;
+   int error, i;
struct sbuf sb;
struct fha_hash_entry *fhe;
-   bool_t first = TRUE;
+   bool_t first, hfirst;
SVCTHREAD *thread;
SVCPOOL *pool;
 
-   sbuf_new(sb, NULL, 4096, SBUF_FIXEDLEN);
+   sbuf_new(sb, NULL, 65536, SBUF_FIXEDLEN);
 
pool = NULL;
 
@@ -485,42 +485,44 @@ fhe_stats_sysctl(SYSCTL_HANDLER_ARGS, st
}
pool = *softc-pool;
 
-   count = 0;
for (i = 0; i  FHA_HASH_SIZE; i++)
if (!LIST_EMPTY(softc-fha_hash[i].list))
-   count++;
+   break;
 
-   if (count == 0) {
+   if (i == FHA_HASH_SIZE) {
sbuf_printf(sb, No file handle entries.\n);
goto out;
}
 
-   for (i = 0; i  FHA_HASH_SIZE; i++) {
+   hfirst = TRUE;
+   for (; i  FHA_HASH_SIZE; i++) {
mtx_lock(softc-fha_hash[i].mtx);
+   if (LIST_EMPTY(softc-fha_hash[i].list)) {
+   mtx_unlock(softc-fha_hash[i].mtx);
+   continue;
+   }
+   sbuf_printf(sb, %shash %d: {\n, hfirst ?  : , , i);
+   first = TRUE;
LIST_FOREACH(fhe, softc-fha_hash[i].list, link) {
-   sbuf_printf(sb, %sfhe %p: {\n, first ?  : , , 
fhe);
+   sbuf_printf(sb, %sfhe %p: {\n, first ?: , , 
fhe);
 
sbuf_printf(sb, fh: %ju\n, (uintmax_t) fhe-fh);
-   sbuf_printf(sb, num_rw: %d\n, fhe-num_rw);
-   sbuf_printf(sb, num_exclusive: %d\n, 
fhe-num_exclusive);
+   sbuf_printf(sb, num_rw/exclusive: %d/%d\n,
+   fhe-num_rw, fhe-num_exclusive);
sbuf_printf(sb, num_threads: %d\n, 
fhe-num_threads);
 
LIST_FOREACH(thread, fhe-threads, st_alink) {
-   sbuf_printf(sb, thread %p offset %ju 
-   (count %d)\n, thread,
+   sbuf_printf(sb,   thread %p offset %ju 
+   reqs %d\n, thread,
thread-st_p3, thread-st_p2);
}
 
-   sbuf_printf(sb, });
+   sbuf_printf(sb,   });
first = FALSE;
-
-   /* Limit the output. */
-   if (++count  128) {
-   sbuf_printf(sb, ...);
-   break;
-   }
}
+   sbuf_printf(sb, \n});
mtx_unlock(softc-fha_hash[i].mtx);
+   hfirst = FALSE;
}
 
  out:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


Re: svn commit: r267441 - in head: include tools/build/mk

2014-06-14 Thread Tijl Coosemans
On Fri, 13 Jun 2014 10:43:28 -0400 Benjamin Kaduk wrote:
 On Fri, Jun 13, 2014 at 6:08 AM, Tijl Coosemans t...@freebsd.org wrote:
 Author: tijl
 Date: Fri Jun 13 10:08:18 2014
 New Revision: 267441
 URL: http://svnweb.freebsd.org/changeset/base/267441

 Log:
   Don't install GSS-API headers when the GSSAPI option has been disabled.
   Some ports assume GSS-API is supported when they find the headers.
 
 I am somewhat surprised that MK_GSSAPI=no does not disable the installation
 of gssapi_krb5.h as well, which currently is controlled by MK_KERBEROS.
  Does the infrastructure require that we pick one or the other, or could we
 make it such that disabling either one disables the gssapi_krb5
 functionality?

The GSSAPI option controls the compilation of lib/libgssapi and
gssapi_krb5.h belongs to a different library under kerberos/.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267481 - head/sys/cam/ctl

2014-06-14 Thread Alexander Motin
Author: mav
Date: Sat Jun 14 17:47:44 2014
New Revision: 267481
URL: http://svnweb.freebsd.org/changeset/base/267481

Log:
  Implement small KPI to access LUN options instead doing it by hands.
  
  MFC after:2 weeks

Modified:
  head/sys/cam/ctl/ctl_backend.c
  head/sys/cam/ctl/ctl_backend.h
  head/sys/cam/ctl/ctl_backend_block.c
  head/sys/cam/ctl/ctl_backend_ramdisk.c
  head/sys/cam/ctl/ctl_frontend_iscsi.c

Modified: head/sys/cam/ctl/ctl_backend.c
==
--- head/sys/cam/ctl/ctl_backend.c  Sat Jun 14 12:56:07 2014
(r267480)
+++ head/sys/cam/ctl/ctl_backend.c  Sat Jun 14 17:47:44 2014
(r267481)
@@ -173,6 +173,45 @@ ctl_backend_find(char *backend_name)
return (NULL);
 }
 
-/*
- * vim: ts=8
- */
+void
+ctl_init_opts(struct ctl_be_lun *be_lun, struct ctl_lun_req *req)
+{
+   struct ctl_be_lun_option *opt;
+   int i;
+
+   STAILQ_INIT(be_lun-options);
+   for (i = 0; i  req-num_be_args; i++) {
+   opt = malloc(sizeof(*opt), M_CTL, M_WAITOK);
+   opt-name = malloc(strlen(req-kern_be_args[i].kname) + 1, 
M_CTL, M_WAITOK);
+   strcpy(opt-name, req-kern_be_args[i].kname);
+   opt-value = malloc(strlen(req-kern_be_args[i].kvalue) + 1, 
M_CTL, M_WAITOK);
+   strcpy(opt-value, req-kern_be_args[i].kvalue);
+   STAILQ_INSERT_TAIL(be_lun-options, opt, links);
+   }
+}
+
+void
+ctl_free_opts(struct ctl_be_lun *be_lun)
+{
+   struct ctl_be_lun_option *opt;
+
+   while ((opt = STAILQ_FIRST(be_lun-options)) != NULL) {
+   STAILQ_REMOVE_HEAD(be_lun-options, links);
+   free(opt-name, M_CTL);
+   free(opt-value, M_CTL);
+   free(opt, M_CTL);
+   }
+}
+
+char *
+ctl_get_opt(struct ctl_be_lun *be_lun, const char *name)
+{
+   struct ctl_be_lun_option *opt;
+
+   STAILQ_FOREACH(opt, be_lun-options, links) {
+   if (strcmp(opt-name, name) == 0) {
+   return (opt-value);
+   }
+   }
+   return (NULL);
+}

Modified: head/sys/cam/ctl/ctl_backend.h
==
--- head/sys/cam/ctl/ctl_backend.h  Sat Jun 14 12:56:07 2014
(r267480)
+++ head/sys/cam/ctl/ctl_backend.h  Sat Jun 14 17:47:44 2014
(r267481)
@@ -301,6 +301,14 @@ int ctl_lun_online(struct ctl_be_lun *be
  */
 void ctl_lun_capacity_changed(struct ctl_be_lun *be_lun);
 
+/*
+ * KPI to manipulate LUN options
+ */
+struct ctl_lun_req;
+void ctl_init_opts(struct ctl_be_lun *be_lun, struct ctl_lun_req *req);
+void ctl_free_opts(struct ctl_be_lun *be_lun);
+char * ctl_get_opt(struct ctl_be_lun *be_lun, const char *name);
+
 #endif /* _KERNEL */
 #endif /* _CTL_BACKEND_H_ */
 

Modified: head/sys/cam/ctl/ctl_backend_block.c
==
--- head/sys/cam/ctl/ctl_backend_block.cSat Jun 14 12:56:07 2014
(r267480)
+++ head/sys/cam/ctl/ctl_backend_block.cSat Jun 14 17:47:44 2014
(r267481)
@@ -1822,9 +1822,12 @@ ctl_be_block_create(struct ctl_be_block_
struct ctl_be_block_lun *be_lun;
struct ctl_lun_create_params *params;
struct ctl_be_arg *file_arg;
+   char num_thread_str[16];
char tmpstr[32];
+   char *value;
int retval, num_threads, unmap;
int i;
+   int tmp_num_threads;
 
params = req-reqdata.create;
retval = 0;
@@ -1839,9 +1842,9 @@ ctl_be_block_create(struct ctl_be_block_
STAILQ_INIT(be_lun-input_queue);
STAILQ_INIT(be_lun-config_write_queue);
STAILQ_INIT(be_lun-datamove_queue);
-   STAILQ_INIT(be_lun-ctl_be_lun.options);
sprintf(be_lun-lunname, cblk%d, softc-num_luns);
mtx_init(be_lun-lock, be_lun-lunname, NULL, MTX_DEF);
+   ctl_init_opts(be_lun-ctl_be_lun, req);
 
be_lun-lun_zone = uma_zcreate(be_lun-lunname, CTLBLK_MAX_SEG,
NULL, NULL, NULL, NULL, /*align*/ 0, /*flags*/0);
@@ -1914,50 +1917,27 @@ ctl_be_block_create(struct ctl_be_block_
 * XXX This searching loop might be refactored to be combined with
 * the loop above,
 */
-   unmap = 0;
-   for (i = 0; i  req-num_be_args; i++) {
-   if (strcmp(req-kern_be_args[i].kname, num_threads) == 0) {
-   struct ctl_be_arg *thread_arg;
-   char num_thread_str[16];
-   int tmp_num_threads;
-
-
-   thread_arg = req-kern_be_args[i];
-
-   strlcpy(num_thread_str, (char *)thread_arg-kvalue,
-   min(thread_arg-vallen,
-   sizeof(num_thread_str)));
-
-   tmp_num_threads = strtol(num_thread_str, NULL, 0);
-
-   /*
-* We don't let the user 

svn commit: r267482 - in head: share/man/man7 share/termcap sys/modules/svr4

2014-06-14 Thread Gavin Atkinson
Author: gavin
Date: Sat Jun 14 18:43:48 2014
New Revision: 267482
URL: http://svnweb.freebsd.org/changeset/base/267482

Log:
  Stop telling people to use send-pr; instead point them towards Bugzilla.
  
  Hat:  bugmeister@
  MFC after:3 days

Modified:
  head/share/man/man7/tests.7
  head/share/termcap/termcap.src
  head/sys/modules/svr4/README

Modified: head/share/man/man7/tests.7
==
--- head/share/man/man7/tests.7 Sat Jun 14 17:47:44 2014(r267481)
+++ head/share/man/man7/tests.7 Sat Jun 14 18:43:48 2014(r267482)
@@ -195,7 +195,7 @@ For more details please refer to:
 .It
 .Lk http://lists.freebsd.org/ FreeBSD Mailing Lists
 .It
-.Lk http://www.freebsd.org/send-pr.html Submit a FreeBSD Problem Report
+.Lk http://www.freebsd.org/support.html Problem Reporting
 .El
 .Sh FILES
 .Bl -tag -compact -width usrXlocalXetcXkyuaXkyuaXconfXX

Modified: head/share/termcap/termcap.src
==
--- head/share/termcap/termcap.src  Sat Jun 14 17:47:44 2014
(r267481)
+++ head/share/termcap/termcap.src  Sat Jun 14 18:43:48 2014
(r267482)
@@ -36,7 +36,7 @@
 #  John Kunze, Berkeley
 #  Craig Leres, Berkeley
 #
-# Please submit changes with send-pr(1).
+# Please submit changes via https://bugs.freebsd.org/submit/
 #
 #  EOH - after reordering, above header lines survive and this line dies 
 #

Modified: head/sys/modules/svr4/README
==
--- head/sys/modules/svr4/READMESat Jun 14 17:47:44 2014
(r267481)
+++ head/sys/modules/svr4/READMESat Jun 14 18:43:48 2014
(r267482)
@@ -30,7 +30,7 @@ To use it:
 It's early days yet, folks -- You'll probably have trouble getting 100%
 functionality out of most things (specifically, poll() on a socket doesn't
 look like it works at the moment, so Netscape doesn't work (among other
-things)).  Patches will be appreciated (use send-pr).
+things)).  Patches will be appreciated.
 
- Mark Newton
  new...@atdot.dotat.org
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267483 - in head: contrib/gcc gnu/usr.bin/binutils/libbfd

2014-06-14 Thread Gavin Atkinson
Author: gavin
Date: Sat Jun 14 18:45:40 2014
New Revision: 267483
URL: http://svnweb.freebsd.org/changeset/base/267483

Log:
  With the move away from GNATS, point end users to a better web page
  detailing how to report bugs.
  
  Hat:  bugmeister
  MFC after:3 days

Modified:
  head/contrib/gcc/version.c
  head/gnu/usr.bin/binutils/libbfd/Makefile

Modified: head/contrib/gcc/version.c
==
--- head/contrib/gcc/version.c  Sat Jun 14 18:43:48 2014(r267482)
+++ head/contrib/gcc/version.c  Sat Jun 14 18:45:40 2014(r267483)
@@ -18,7 +18,7 @@
forward us bugs reported to you, if you determine that they are
not bugs in your modifications.)  */
 
-const char bug_report_url[] = URL:http://www.freebsd.org/send-pr.html;
+const char bug_report_url[] = URL:http://www.freebsd.org/support.html;
 
 /* The complete version string, assembled from several pieces.
BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile.  */

Modified: head/gnu/usr.bin/binutils/libbfd/Makefile
==
--- head/gnu/usr.bin/binutils/libbfd/Makefile   Sat Jun 14 18:43:48 2014
(r267482)
+++ head/gnu/usr.bin/binutils/libbfd/Makefile   Sat Jun 14 18:45:40 2014
(r267483)
@@ -84,7 +84,7 @@ bfdver.h: Makefile
echo '#define BFD_VERSION   21750'   ${.TARGET}
echo '#define BFD_VERSION_DATE  20070703'${.TARGET}
echo '#define BFD_VERSION_STRING ${VERSION}' ${.TARGET}
-   echo '#define REPORT_BUGS_TO http://www.freebsd.org/send-pr.html' 
 ${.TARGET}
+   echo '#define REPORT_BUGS_TO http://www.freebsd.org/support.html' 
 ${.TARGET}
 
 targmatch.h: targmatch.sed config.bfd
sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd}  ${.TARGET}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267484 - stable/9/lib/clang

2014-06-14 Thread Dimitry Andric
Author: dim
Date: Sat Jun 14 18:48:12 2014
New Revision: 267484
URL: http://svnweb.freebsd.org/changeset/base/267484

Log:
  MFC r267335:
  
  In some scenarios, when generating llvm/clang .inc.h files, multiple
  source files could be passed to tblgen or clang-tblgen, leading to a
  Too many positional arguments specified error message.  Fix this by
  replacing the too-generic ${.ALLSRC} sources with explicit paths.
  
  Reported by:  ryst...@gmail.com, rodrigc
  Approved by:  re (gjb)

Modified:
  stable/9/lib/clang/clang.build.mk
Directory Properties:
  stable/9/lib/clang/   (props changed)

Modified: stable/9/lib/clang/clang.build.mk
==
--- stable/9/lib/clang/clang.build.mk   Sat Jun 14 18:45:40 2014
(r267483)
+++ stable/9/lib/clang/clang.build.mk   Sat Jun 14 18:48:12 2014
(r267484)
@@ -70,149 +70,160 @@ ${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM
 Attrs.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-classes \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrDump.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-dump \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrIdentifierArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-identifier-arg-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-impl \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrLateParsed.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-late-parsed-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrParsedAttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-impl \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrParsedAttrKinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-kinds \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrParsedAttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrPCHRead.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-pch-read \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrPCHWrite.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-pch-write \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrSpellings.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-spelling-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrSpellingListIndex.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-spelling-index \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrTemplateInstantiate.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-template-instantiate \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-   ${.ALLSRC}
+   ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrTypeArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-type-arg-list \
-I ${CLANG_SRCS}/include -d 

svn commit: r267485 - head/sys/cam/ctl

2014-06-14 Thread Alexander Motin
Author: mav
Date: Sat Jun 14 20:25:14 2014
New Revision: 267485
URL: http://svnweb.freebsd.org/changeset/base/267485

Log:
  Remove non-functional remnants of control LUN -- 18MB of RAM for nothing.

Modified:
  head/sys/cam/ctl/ctl.c
  head/sys/cam/ctl/ctl_private.h

Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c  Sat Jun 14 18:48:12 2014(r267484)
+++ head/sys/cam/ctl/ctl.c  Sat Jun 14 20:25:14 2014(r267485)
@@ -961,7 +961,6 @@ ctl_init(void)
struct ctl_softc *softc;
struct ctl_io_pool *internal_pool, *emergency_pool, *other_pool;
struct ctl_frontend *fe;
-   struct ctl_lun *lun;
 uint8_t sc_id =0;
int i, error, retval;
//int isc_retval;
@@ -1049,8 +1048,6 @@ ctl_init(void)
STAILQ_INIT(softc-be_list);
STAILQ_INIT(softc-io_pools);
 
-   lun = softc-lun;
-
/*
 * We don't bother calling these with ctl_lock held here, because,
 * in theory, no one else can try to do anything while we're in our
@@ -1085,16 +1082,6 @@ ctl_init(void)
softc-emergency_pool = emergency_pool;
softc-othersc_pool = other_pool;
 
-   /*
-* We used to allocate a processor LUN here.  The new scheme is to
-* just let the user allocate LUNs as he sees fit.
-*/
-#if 0
-   mtx_lock(softc-ctl_lock);
-   ctl_alloc_lun(softc, lun, /*be_lun*/NULL, /*target*/softc-target);
-   mtx_unlock(softc-ctl_lock);
-#endif
-
if (worker_threads  MAXCPU || worker_threads == 0) {
printf(invalid kern.cam.ctl.worker_threads value; 
setting to 1);
@@ -1116,9 +1103,6 @@ ctl_init(void)
softc-work_thread, NULL, 0, 0, ctl, work%d, i);
if (error != 0) {
printf(error creating CTL work thread!\n);
-   mtx_lock(softc-ctl_lock);
-   ctl_free_lun(lun);
-   mtx_unlock(softc-ctl_lock);
ctl_pool_free(internal_pool);
ctl_pool_free(emergency_pool);
ctl_pool_free(other_pool);

Modified: head/sys/cam/ctl/ctl_private.h
==
--- head/sys/cam/ctl/ctl_private.h  Sat Jun 14 18:48:12 2014
(r267484)
+++ head/sys/cam/ctl/ctl_private.h  Sat Jun 14 20:25:14 2014
(r267485)
@@ -426,7 +426,6 @@ struct ctl_softc {
struct sysctl_ctx_list sysctl_ctx;
struct sysctl_oid *sysctl_tree;
struct ctl_ioctl_info ioctl_info;
-   struct ctl_lun lun;
struct ctl_io_pool *internal_pool;
struct ctl_io_pool *emergency_pool;
struct ctl_io_pool *othersc_pool;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267486 - in head: . etc gnu/usr.bin gnu/usr.bin/send-pr share/man/man7

2014-06-14 Thread Gavin Atkinson
Author: gavin
Date: Sat Jun 14 20:36:32 2014
New Revision: 267486
URL: http://svnweb.freebsd.org/changeset/base/267486

Log:
  Remove send-pr, the supported interface to submit bugs is now via
  https://bugs.freebsd.org/submit/
  
  Removing send-pr also removes one more piece of non-BSD-licensed software.
  
  Hat:  bugmeister
  MFC after:3 days

Deleted:
  head/gnu/usr.bin/send-pr/
Modified:
  head/MAINTAINERS
  head/ObsoleteFiles.inc
  head/etc/Makefile
  head/gnu/usr.bin/Makefile
  head/share/man/man7/hier.7

Modified: head/MAINTAINERS
==
--- head/MAINTAINERSSat Jun 14 20:25:14 2014(r267485)
+++ head/MAINTAINERSSat Jun 14 20:36:32 2014(r267486)
@@ -108,7 +108,6 @@ lib/libbluetoothemaxPre-commit review 
 lib/libsdp emaxPre-commit review preferred.
 usr.bin/bluetooth  emaxPre-commit review preferred.
 usr.sbin/bluetooth emaxPre-commit review preferred.
-gnu/usr.bin/send-prbugmaster   Pre-commit review requested.
 *env(3)secteam Due to the problematic security history of this
code, please have patches reviewed by secteam.
 share/zoneinfo edwin   Heads-up appreciated, since our data is coming

Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc  Sat Jun 14 20:25:14 2014(r267485)
+++ head/ObsoleteFiles.inc  Sat Jun 14 20:36:32 2014(r267486)
@@ -38,6 +38,11 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140614: send-pr removal
+OLD_FILES+=usr/bin/send-pr
+OLD_FILES+=usr/share/man/man1/send-pr.1.gz
+OLD_FILES+=etc/gnats/freefall
+OLD_DIRS+=etc/gnats
 # 20140512: new clang import which bumps version from 3.4 to 3.4.1.
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_pclmul.h

Modified: head/etc/Makefile
==
--- head/etc/Makefile   Sat Jun 14 20:25:14 2014(r267485)
+++ head/etc/Makefile   Sat Jun 14 20:36:32 2014(r267486)
@@ -240,7 +240,6 @@ distribution:
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
-   ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install

Modified: head/gnu/usr.bin/Makefile
==
--- head/gnu/usr.bin/Makefile   Sat Jun 14 20:25:14 2014(r267485)
+++ head/gnu/usr.bin/Makefile   Sat Jun 14 20:36:32 2014(r267486)
@@ -14,7 +14,6 @@ SUBDIR= ${_binutils} \
${_groff} \
${_rcs} \
sdiff \
-   send-pr \
${_tests} \
${_texinfo}
 

Modified: head/share/man/man7/hier.7
==
--- head/share/man/man7/hier.7  Sat Jun 14 20:25:14 2014(r267485)
+++ head/share/man/man7/hier.7  Sat Jun 14 20:36:32 2014(r267486)
@@ -86,10 +86,6 @@ see
 .Xr rc 8
 .It Pa bluetooth/
 bluetooth configuration files
-.It Pa gnats/
-gnats configuration files;
-see
-.Xr send-pr 1
 .It Pa localtime
 local timezone information;
 see
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


Re: svn commit: r267486 - in head: . etc gnu/usr.bin gnu/usr.bin/send-pr share/man/man7

2014-06-14 Thread Steve Kargl
On Sat, Jun 14, 2014 at 08:36:33PM +, Gavin Atkinson wrote:
 Author: gavin
 Date: Sat Jun 14 20:36:32 2014
 New Revision: 267486
 URL: http://svnweb.freebsd.org/changeset/base/267486
 
 Log:
   Remove send-pr, the supported interface to submit bugs is now via
   https://bugs.freebsd.org/submit/
   
   Removing send-pr also removes one more piece of non-BSD-licensed software.
   
   Hat:bugmeister
   MFC after:  3 days
 
 Deleted:
   head/gnu/usr.bin/send-pr/

Given that send-pr(1) may be ingrained into peoples brains
and referenced in 3rd documentation or articles on the web,
perhaps, we should have a script point to bugzilla.

$ cat send-pr 
#! /bin/sh
echo 'send-pr(1) has been replaced by bugzilla.'
echo 'See http://bugs.freebsd.org/'

___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


Re: svn commit: r267486 - in head: . etc gnu/usr.bin gnu/usr.bin/send-pr share/man/man7

2014-06-14 Thread Gavin Atkinson
On Sat, 14 Jun 2014, Steve Kargl wrote:
 On Sat, Jun 14, 2014 at 08:36:33PM +, Gavin Atkinson wrote:
  Author: gavin
  Date: Sat Jun 14 20:36:32 2014
  New Revision: 267486
  URL: http://svnweb.freebsd.org/changeset/base/267486
  
  Log:
Remove send-pr, the supported interface to submit bugs is now via
https://bugs.freebsd.org/submit/

Removing send-pr also removes one more piece of non-BSD-licensed software.

Hat:  bugmeister
MFC after:3 days
  
  Deleted:
head/gnu/usr.bin/send-pr/
 
 Given that send-pr(1) may be ingrained into peoples brains
 and referenced in 3rd documentation or articles on the web,
 perhaps, we should have a script point to bugzilla.
 
 $ cat send-pr 
 #! /bin/sh
 echo 'send-pr(1) has been replaced by bugzilla.'
 echo 'See http://bugs.freebsd.org/'

This is likely a good idea, and one we have discussed already.  I meant to 
mention it in the commit log actually - I will likely commit such a script 
tomorrow, and it will be in place in time for the MFC.

Gavin
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267488 - head/sys/dev/vmware/vmxnet3

2014-06-14 Thread Bryan Venteicher
Author: bryanv
Date: Sat Jun 14 23:36:17 2014
New Revision: 267488
URL: http://svnweb.freebsd.org/changeset/base/267488

Log:
  Don't check the dma map address for a static DMA mapping against NULL
  to determine if the mapping is valid.
  
  Submitted by: jhb

Modified:
  head/sys/dev/vmware/vmxnet3/if_vmx.c

Modified: head/sys/dev/vmware/vmxnet3/if_vmx.c
==
--- head/sys/dev/vmware/vmxnet3/if_vmx.cSat Jun 14 22:47:25 2014
(r267487)
+++ head/sys/dev/vmware/vmxnet3/if_vmx.cSat Jun 14 23:36:17 2014
(r267488)
@@ -3886,7 +3886,7 @@ vmxnet3_dma_free(struct vmxnet3_softc *s
 {
 
if (dma-dma_tag != NULL) {
-   if (dma-dma_map != NULL) {
+   if (dma-dma_paddr != 0) {
bus_dmamap_sync(dma-dma_tag, dma-dma_map,
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(dma-dma_tag, dma-dma_map);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267489 - stable/9/contrib/tzdata

2014-06-14 Thread Edwin Groothuis
Author: edwin
Date: Sun Jun 15 00:53:24 2014
New Revision: 267489
URL: http://svnweb.freebsd.org/changeset/base/267489

Log:
  MFC of 267473,tzdata2014e
  
  Fix historical data for Egypt.
  Better prediction for future Egypt / Morocco changes.
  Update to Cocos / Cook islands.
  Fix historical data for Russia.
  
  Approved by:  re (gjb)

Modified:
  stable/9/contrib/tzdata/africa
  stable/9/contrib/tzdata/australasia
  stable/9/contrib/tzdata/europe
  stable/9/contrib/tzdata/northamerica
Directory Properties:
  stable/9/contrib/tzdata/   (props changed)

Modified: stable/9/contrib/tzdata/africa
==
--- stable/9/contrib/tzdata/africa  Sat Jun 14 23:36:17 2014
(r267488)
+++ stable/9/contrib/tzdata/africa  Sun Jun 15 00:53:24 2014
(r267489)
@@ -239,13 +239,13 @@ Rule  Egypt   19901994-   May  1  
1:001:00
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
 # /a
 Rule   Egypt   19952010-   Apr lastFri  0:00s  1:00S
-Rule   Egypt   19952005-   Sep lastThu 23:00s  0   -
+Rule   Egypt   19952005-   Sep lastThu 24:00   0   -
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule   Egypt   2006only-   Sep 21  23:00s  0   -
+Rule   Egypt   2006only-   Sep 21  24:00   0   -
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ RuleEgypt   2006only-   Sep 21  
23:00s  0   -
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # 
http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm
-Rule   Egypt   2007only-   Sep Thu=1  23:00s  0   -
+Rule   Egypt   2007only-   Sep Thu=1  24:00   0   -
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,46 +342,77 @@ Rule  Egypt   2007only-   Sep Thu=1  
23:00s
 # From Gunther Vermier (2015-05-13):
 # our Egypt office confirms that the change will be at 15 May midnight 
(24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally located a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014.  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # 
http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule   Egypt   2008only-   Aug lastThu 23:00s  0   -
-Rule   Egypt   2009only-   Aug 20  23:00s  0   -
-Rule   Egypt   2010only-   Aug 11  0:000   -
-Rule   Egypt   

svn commit: r267490 - head/usr.bin/patch

2014-06-14 Thread Pedro F. Giffuni
Author: pfg
Date: Sun Jun 15 03:54:23 2014
New Revision: 267490
URL: http://svnweb.freebsd.org/changeset/base/267490

Log:
  patch: unsign the line length to avoid overflows.
  
  Patch(1) uses a short int for the line length, which is usually
  sufficient for regular diffs, but makes no effort to signal
  when there is an overflow.
  
  Change the line length to an unsigned short int to better use
  the fact that a length is never negative.  The change is loosely
  inspired on a related change in DragonFly, but we avoid spending
  more memory than necessary.
  
  While here adjust the messages to be clearer on what is happening.
  
  MFC after:1 week

Modified:
  head/usr.bin/patch/patch.c
  head/usr.bin/patch/pch.c
  head/usr.bin/patch/pch.h

Modified: head/usr.bin/patch/patch.c
==
--- head/usr.bin/patch/patch.c  Sun Jun 15 00:53:24 2014(r267489)
+++ head/usr.bin/patch/patch.c  Sun Jun 15 03:54:23 2014(r267490)
@@ -742,14 +742,18 @@ abort_context_hunk(void)
 static void
 rej_line(int ch, LINENUM i)
 {
-   size_t len;
+   unsigned short len;
const char *line = pfetch(i);
 
-   len = strlen(line);
+   len = strnlen(line, USHRT_MAX);
 
fprintf(rejfp, %c%s, ch, line);
-   if (len == 0 || line[len-1] != '\n')
-   fprintf(rejfp, \n\\ No newline at end of file\n);
+   if (len == 0 || line[len-1] != '\n') {
+   if (len = USHRT_MAX)
+   fprintf(rejfp, \n\\ Line too long\n);
+   else
+   fprintf(rejfp, \n\\ No newline at end of line\n);
+   }
 }
 
 static void
@@ -1016,7 +1020,7 @@ patch_match(LINENUM base, LINENUM offset
LINENUM pat_lines = pch_ptrn_lines() - fuzz;
const char  *ilineptr;
const char  *plineptr;
-   short   plinelen;
+   unsigned short  plinelen;
 
for (iline = base + offset + fuzz; pline = pat_lines; pline++, 
iline++) {
ilineptr = ifetch(iline, offset = 0);

Modified: head/usr.bin/patch/pch.c
==
--- head/usr.bin/patch/pch.cSun Jun 15 00:53:24 2014(r267489)
+++ head/usr.bin/patch/pch.cSun Jun 15 03:54:23 2014(r267490)
@@ -56,7 +56,7 @@ static LINENUMp_max;  /* max allowed va
 static LINENUM p_context = 3;  /* # of context lines */
 static LINENUM p_input_line = 0;   /* current line # from patch file */
 static char**p_line = NULL;/* the text of the hunk */
-static short   *p_len = NULL;  /* length of each line */
+static unsigned short  *p_len = NULL; /* length of each line */
 static char*p_char = NULL; /* +, -, and ! */
 static int hunkmax = INITHUNKMAX;  /* size of above arrays to begin with */
 static int p_indent;   /* indent to patch */
@@ -134,7 +134,7 @@ set_hunkmax(void)
if (p_line == NULL)
p_line = malloc(hunkmax * sizeof(char *));
if (p_len == NULL)
-   p_len = malloc(hunkmax * sizeof(short));
+   p_len = malloc(hunkmax * sizeof(unsigned short));
if (p_char == NULL)
p_char = malloc(hunkmax * sizeof(char));
 }
@@ -151,7 +151,7 @@ grow_hunkmax(void)
fatal(Internal memory allocation error\n);
 
p_line = reallocf(p_line, new_hunkmax * sizeof(char *));
-   p_len = reallocf(p_len, new_hunkmax * sizeof(short));
+   p_len = reallocf(p_len, new_hunkmax * sizeof(unsigned short));
p_char = reallocf(p_char, new_hunkmax * sizeof(char));
 
if (p_line != NULL  p_len != NULL  p_char != NULL) {
@@ -1201,7 +1201,7 @@ bool
 pch_swap(void)
 {
char**tp_line;  /* the text of the hunk */
-   short   *tp_len;/* length of each line */
+   unsigned short  *tp_len;/* length of each line */
char*tp_char;   /* +, -, and ! */
LINENUM i;
LINENUM n;
@@ -1358,7 +1358,7 @@ pch_context(void)
 /*
  * Return the length of a particular patch line.
  */
-short
+unsigned short
 pch_line_len(LINENUM line)
 {
return p_len[line];

Modified: head/usr.bin/patch/pch.h
==
--- head/usr.bin/patch/pch.hSun Jun 15 00:53:24 2014(r267489)
+++ head/usr.bin/patch/pch.hSun Jun 15 03:54:23 2014(r267490)
@@ -44,7 +44,7 @@ bool  there_is_another_patch(void);
 bool   another_hunk(void);
 bool   pch_swap(void);
 char   *pfetch(LINENUM);
-short  pch_line_len(LINENUM);
+unsigned short pch_line_len(LINENUM);
 LINENUMpch_first(void);
 LINENUMpch_ptrn_lines(void);
 LINENUMpch_newfirst(void);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To 

svn commit: r267491 - head/sys/kern

2014-06-14 Thread Konstantin Belousov
Author: kib
Date: Sun Jun 15 04:51:53 2014
New Revision: 267491
URL: http://svnweb.freebsd.org/changeset/base/267491

Log:
  Use vn_io_fault for the writes from core dumping code.  Recursing into
  VM due to copyin(9) faulting while VFS locks are held is
  deadlock-prone there in the same way as for the write(2) syscall.
  
  Reported and tested by:   pho
  Sponsored by: The FreeBSD Foundation
  MFC after:2 weeks

Modified:
  head/sys/kern/vfs_vnops.c

Modified: head/sys/kern/vfs_vnops.c
==
--- head/sys/kern/vfs_vnops.c   Sun Jun 15 03:54:23 2014(r267490)
+++ head/sys/kern/vfs_vnops.c   Sun Jun 15 04:51:53 2014(r267491)
@@ -8,7 +8,7 @@
  * the permission of UNIX System Laboratories, Inc.
  *
  * Copyright (c) 2012 Konstantin Belousov k...@freebsd.org
- * Copyright (c) 2013 The FreeBSD Foundation
+ * Copyright (c) 2013, 2014 The FreeBSD Foundation
  *
  * Portions of this software were developed by Konstantin Belousov
  * under sponsorship from the FreeBSD Foundation.
@@ -106,6 +106,53 @@ struct fileops vnops = {
.fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE
 };
 
+static const int io_hold_cnt = 16;
+static int vn_io_fault_enable = 1;
+SYSCTL_INT(_debug, OID_AUTO, vn_io_fault_enable, CTLFLAG_RW,
+vn_io_fault_enable, 0, Enable vn_io_fault lock avoidance);
+static u_long vn_io_faults_cnt;
+SYSCTL_ULONG(_debug, OID_AUTO, vn_io_faults, CTLFLAG_RD,
+vn_io_faults_cnt, 0, Count of vn_io_fault lock avoidance triggers);
+
+/*
+ * Returns true if vn_io_fault mode of handling the i/o request should
+ * be used.
+ */
+static bool
+do_vn_io_fault(struct vnode *vp, struct uio *uio)
+{
+   struct mount *mp;
+
+   return (uio-uio_segflg == UIO_USERSPACE  vp-v_type == VREG 
+   (mp = vp-v_mount) != NULL 
+   (mp-mnt_kern_flag  MNTK_NO_IOPF) != 0  vn_io_fault_enable);
+}
+
+/*
+ * Structure used to pass arguments to vn_io_fault1(), to do either
+ * file- or vnode-based I/O calls.
+ */
+struct vn_io_fault_args {
+   enum {
+   VN_IO_FAULT_FOP,
+   VN_IO_FAULT_VOP
+   } kind;
+   struct ucred *cred;
+   int flags;
+   union {
+   struct fop_args_tag {
+   struct file *fp;
+   fo_rdwr_t *doio;
+   } fop_args;
+   struct vop_args_tag {
+   struct vnode *vp;
+   } vop_args;
+   } args;
+};
+
+static int vn_io_fault1(struct vnode *vp, struct uio *uio,
+struct vn_io_fault_args *args, struct thread *td);
+
 int
 vn_open(ndp, flagp, cmode, fp)
struct nameidata *ndp;
@@ -439,6 +486,7 @@ vn_rdwr(enum uio_rw rw, struct vnode *vp
struct mount *mp;
struct ucred *cred;
void *rl_cookie;
+   struct vn_io_fault_args args;
int error, lock_flags;
 
auio.uio_iov = aiov;
@@ -493,10 +541,17 @@ vn_rdwr(enum uio_rw rw, struct vnode *vp
cred = file_cred;
else
cred = active_cred;
-   if (rw == UIO_READ)
+   if (do_vn_io_fault(vp, auio)) {
+   args.kind = VN_IO_FAULT_VOP;
+   args.cred = cred;
+   args.flags = ioflg;
+   args.args.vop_args.vp = vp;
+   error = vn_io_fault1(vp, auio, args, td);
+   } else if (rw == UIO_READ) {
error = VOP_READ(vp, auio, ioflg, cred);
-   else
+   } else /* if (rw == UIO_WRITE) */ {
error = VOP_WRITE(vp, auio, ioflg, cred);
+   }
}
if (aresid)
*aresid = auio.uio_resid;
@@ -883,14 +938,6 @@ unlock:
return (error);
 }
 
-static const int io_hold_cnt = 16;
-static int vn_io_fault_enable = 1;
-SYSCTL_INT(_debug, OID_AUTO, vn_io_fault_enable, CTLFLAG_RW,
-vn_io_fault_enable, 0, Enable vn_io_fault lock avoidance);
-static u_long vn_io_faults_cnt;
-SYSCTL_ULONG(_debug, OID_AUTO, vn_io_faults, CTLFLAG_RD,
-vn_io_faults_cnt, 0, Count of vn_io_fault lock avoidance triggers);
-
 /*
  * The vn_io_fault() is a wrapper around vn_read() and vn_write() to
  * prevent the following deadlock:
@@ -924,38 +971,55 @@ SYSCTL_ULONG(_debug, OID_AUTO, vn_io_fau
  * make the current i/o request atomic with respect to other i/os and
  * truncations.
  */
+
+/*
+ * Decode vn_io_fault_args and perform the corresponding i/o.
+ */
 static int
-vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
-int flags, struct thread *td)
+vn_io_fault_doio(struct vn_io_fault_args *args, struct uio *uio,
+struct thread *td)
+{
+
+   switch (args-kind) {
+   case VN_IO_FAULT_FOP:
+   return ((args-args.fop_args.doio)(args-args.fop_args.fp,
+   uio, args-cred, args-flags, td));
+   case VN_IO_FAULT_VOP:
+   if 

svn commit: r267492 - head/sys/i386/i386

2014-06-14 Thread Konstantin Belousov
Author: kib
Date: Sun Jun 15 05:01:35 2014
New Revision: 267492
URL: http://svnweb.freebsd.org/changeset/base/267492

Log:
  Fix some cosmetic issues with the use of kmem_malloc() in the i386 LDT
  sysarch(2) code.
  
  Use M_ZERO instead of explicit bzero(9).  Do not check for failed
  allocation when M_WAITOK is specified (which is specified always).
  Use malloc(9) when allocating memory for the intermediate copy of the
  user-supplied buffer.
  
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week

Modified:
  head/sys/i386/i386/sys_machdep.c

Modified: head/sys/i386/i386/sys_machdep.c
==
--- head/sys/i386/i386/sys_machdep.cSun Jun 15 04:51:53 2014
(r267491)
+++ head/sys/i386/i386/sys_machdep.cSun Jun 15 05:01:35 2014
(r267492)
@@ -164,19 +164,14 @@ sysarch(td, uap)
break;
case I386_SET_LDT:
if (kargs.largs.descs != NULL) {
-   lp = (union descriptor *)kmem_malloc(kernel_arena,
+   lp = (union descriptor *)malloc(
kargs.largs.num * sizeof(union descriptor),
-   M_WAITOK);
-   if (lp == NULL) {
-   error = ENOMEM;
-   break;
-   }
+   M_TEMP, M_WAITOK);
error = copyin(kargs.largs.descs, lp,
kargs.largs.num * sizeof(union descriptor));
if (error == 0)
error = i386_set_ldt(td, kargs.largs, lp);
-   kmem_free(kernel_arena, (vm_offset_t)lp,
-   kargs.largs.num * sizeof(union descriptor));
+   free(lp, M_TEMP);
} else {
error = i386_set_ldt(td, kargs.largs, NULL);
}
@@ -300,10 +295,7 @@ i386_extend_pcb(struct thread *td)
};
 
ext = (struct pcb_ext *)kmem_malloc(kernel_arena, ctob(IOPAGES+1),
-   M_WAITOK);
-   if (ext == 0)
-   return (ENOMEM);
-   bzero(ext, sizeof(struct pcb_ext)); 
+   M_WAITOK | M_ZERO);
/* -16 is so we can convert a trapframe into vm86trapframe inplace */
ext-ext_tss.tss_esp0 = td-td_kstack + ctob(KSTACK_PAGES) -
sizeof(struct pcb) - 16;
@@ -474,12 +466,7 @@ user_ldt_alloc(struct mdproc *mdp, int l
  
 new_ldt-ldt_len = len = NEW_MAX_LD(len); 
 new_ldt-ldt_base = (caddr_t)kmem_malloc(kernel_arena, 
-round_page(len * sizeof(union descriptor)), M_WAITOK);
-if (new_ldt-ldt_base == NULL) { 
-free(new_ldt, M_SUBPROC);
-   mtx_lock_spin(dt_lock);
-return (NULL);
-} 
+   round_page(len * sizeof(union descriptor)), M_WAITOK);
 new_ldt-ldt_refcnt = 1; 
 new_ldt-ldt_active = 0; 
  
@@ -514,12 +501,7 @@ user_ldt_alloc(struct mdproc *mdp, int l
 
new_ldt-ldt_len = len = NEW_MAX_LD(len);
new_ldt-ldt_base = (caddr_t)kmem_malloc(kernel_arena,
-   len * sizeof(union descriptor), M_WAITOK);
-   if (new_ldt-ldt_base == NULL) {
-   free(new_ldt, M_SUBPROC);
-   mtx_lock_spin(dt_lock);
-   return (NULL);
-   }
+   len * sizeof(union descriptor), M_WAITOK);
new_ldt-ldt_refcnt = 1;
new_ldt-ldt_active = 0;
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267493 - head/usr.sbin/service

2014-06-14 Thread Xin LI
Author: delphij
Date: Sun Jun 15 05:07:01 2014
New Revision: 267493
URL: http://svnweb.freebsd.org/changeset/base/267493

Log:
  Fix two issues:
  
   - Check for rc.d directory's existence before traversing
 it;
   - Don't output * when rc.d directory is empty.
  
  PR:   conf/190665
  Submitted by: Oleg Ginzburg olevole olevole ru (with changes)
  MFC after:2 weeks

Modified:
  head/usr.sbin/service/service.sh

Modified: head/usr.sbin/service/service.sh
==
--- head/usr.sbin/service/service.shSun Jun 15 05:01:35 2014
(r267492)
+++ head/usr.sbin/service/service.shSun Jun 15 05:07:01 2014
(r267493)
@@ -109,7 +109,7 @@ fi
 if [ -n $LIST ]; then
for dir in /etc/rc.d $local_startup; do
[ -n $VERBOSE ]  echo From ${dir}:
-   cd $dir  for file in *; do echo $file; done
+   [ -d ${dir} ]  /bin/ls -1 ${dir}
done
exit 0
 fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267494 - in stable/10/sys: conf kern modules/ufs ufs/ffs

2014-06-14 Thread Konstantin Belousov
Author: kib
Date: Sun Jun 15 05:15:38 2014
New Revision: 267494
URL: http://svnweb.freebsd.org/changeset/base/267494

Log:
  MFC r267226:
  Initialize the pbuf counter for directio using SYSINIT.
  Mark ffs_rawread.c as requiring both ffs and directio options to be
  compiled into the kernel.  Add ffs_rawread.c to the list of ufs.ko
  module' sources.

Modified:
  stable/10/sys/conf/files
  stable/10/sys/kern/vfs_bio.c
  stable/10/sys/modules/ufs/Makefile
  stable/10/sys/ufs/ffs/ffs_rawread.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/files
==
--- stable/10/sys/conf/filesSun Jun 15 05:07:01 2014(r267493)
+++ stable/10/sys/conf/filesSun Jun 15 05:15:38 2014(r267494)
@@ -3910,7 +3910,7 @@ ufs/ffs/ffs_subr.coptional ffs
 ufs/ffs/ffs_tables.c   optional ffs
 ufs/ffs/ffs_vfsops.c   optional ffs
 ufs/ffs/ffs_vnops.coptional ffs
-ufs/ffs/ffs_rawread.c  optional directio
+ufs/ffs/ffs_rawread.c  optional ffs directio
 ufs/ffs/ffs_suspend.c  optional ffs
 ufs/ufs/ufs_acl.c  optional ffs
 ufs/ufs/ufs_bmap.c optional ffs

Modified: stable/10/sys/kern/vfs_bio.c
==
--- stable/10/sys/kern/vfs_bio.cSun Jun 15 05:07:01 2014
(r267493)
+++ stable/10/sys/kern/vfs_bio.cSun Jun 15 05:15:38 2014
(r267494)
@@ -77,7 +77,6 @@ __FBSDID($FreeBSD$);
 #include vm/vm_extern.h
 #include vm/vm_map.h
 #include opt_compat.h
-#include opt_directio.h
 #include opt_swap.h
 
 static MALLOC_DEFINE(M_BIOBUF, biobuf, BIO buffer);
@@ -351,10 +350,6 @@ sysctl_bufspace(SYSCTL_HANDLER_ARGS)
 }
 #endif
 
-#ifdef DIRECTIO
-extern void ffs_rawread_setup(void);
-#endif /* DIRECTIO */
-
 /*
  * bqlock:
  *
@@ -739,9 +734,6 @@ kern_vfs_bio_buffer_alloc(caddr_t v, lon
if (nswbuf  NSWBUF_MIN)
nswbuf = NSWBUF_MIN;
 #endif
-#ifdef DIRECTIO
-   ffs_rawread_setup();
-#endif
 
/*
 * Reserve space for the buffer cache buffers

Modified: stable/10/sys/modules/ufs/Makefile
==
--- stable/10/sys/modules/ufs/Makefile  Sun Jun 15 05:07:01 2014
(r267493)
+++ stable/10/sys/modules/ufs/Makefile  Sun Jun 15 05:15:38 2014
(r267494)
@@ -6,9 +6,9 @@ KMOD=   ufs
 SRCS=  opt_ddb.h opt_directio.h opt_ffs.h opt_quota.h opt_suiddir.h opt_ufs.h \
vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \
ufs_gjournal.c ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \
-   ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c \
-   ffs_softdep.c ffs_subr.c ffs_suspend.c ffs_tables.c ffs_vfsops.c \
-   ffs_vnops.c
+   ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_rawread.c \
+   ffs_snapshot.c ffs_softdep.c ffs_subr.c ffs_suspend.c ffs_tables.c \
+   ffs_vfsops.c ffs_vnops.c
 
 .if !defined(KERNBUILDDIR)
 CFLAGS+= -DSOFTUPDATES -DUFS_DIRHASH

Modified: stable/10/sys/ufs/ffs/ffs_rawread.c
==
--- stable/10/sys/ufs/ffs/ffs_rawread.c Sun Jun 15 05:07:01 2014
(r267493)
+++ stable/10/sys/ufs/ffs/ffs_rawread.c Sun Jun 15 05:15:38 2014
(r267494)
@@ -71,8 +71,6 @@ static int ffs_rawread_sync(struct vnode
 
 int ffs_rawread(struct vnode *vp, struct uio *uio, int *workdone);
 
-void ffs_rawread_setup(void);
-
 SYSCTL_DECL(_vfs_ffs);
 
 static int ffsrawbufcnt = 4;
@@ -87,13 +85,13 @@ static int rawreadahead = 1;
 SYSCTL_INT(_vfs_ffs, OID_AUTO, rawreadahead, CTLFLAG_RW, rawreadahead, 0,
   Flag to enable readahead for long raw reads);
 
-
-void
-ffs_rawread_setup(void)
+static void
+ffs_rawread_setup(void *arg __unused)
 {
+
ffsrawbufcnt = (nswbuf  100 ) ? (nswbuf - (nswbuf  4)) : nswbuf - 8;
 }
-
+SYSINIT(ffs_raw, SI_SUB_VM_CONF, SI_ORDER_ANY, ffs_rawread_setup, NULL);
 
 static int
 ffs_rawread_sync(struct vnode *vp)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


svn commit: r267495 - stable/10/sys/kern

2014-06-14 Thread Konstantin Belousov
Author: kib
Date: Sun Jun 15 05:17:40 2014
New Revision: 267495
URL: http://svnweb.freebsd.org/changeset/base/267495

Log:
  MFC r267227:
  Remove write-only local variable.

Modified:
  stable/10/sys/kern/sched_ule.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/sched_ule.c
==
--- stable/10/sys/kern/sched_ule.c  Sun Jun 15 05:15:38 2014
(r267494)
+++ stable/10/sys/kern/sched_ule.c  Sun Jun 15 05:17:40 2014
(r267495)
@@ -2691,7 +2691,6 @@ sched_throw(struct thread *td)
 void
 sched_fork_exit(struct thread *td)
 {
-   struct td_sched *ts;
struct tdq *tdq;
int cpuid;
 
@@ -2701,7 +2700,6 @@ sched_fork_exit(struct thread *td)
 */
cpuid = PCPU_GET(cpuid);
tdq = TDQ_CPU(cpuid);
-   ts = td-td_sched;
if (TD_IS_IDLETHREAD(td))
td-td_lock = TDQ_LOCKPTR(tdq);
MPASS(td-td_lock == TDQ_LOCKPTR(tdq));
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org