svn commit: r259061 - head/sys/dev/iwn
Author: adrian
Date: Sat Dec 7 08:03:10 2013
New Revision: 259061
URL: http://svnweb.freebsd.org/changeset/base/259061
Log:
Begin fleshing out some code to handle tracking PLCP error rates
in preparation for the scan based retune logic.
The linux iwlwifi driver does a rescan (onto a non-active channel)
to force an RF retune when the PLCP error rates exceed a certain threshold.
* Add code to track HT PLCP rate errors;
* Separate out the PLCP error count fetch and update so the delta
can be used when checking for PLCP error rates;
* Implement the PLCP error logic from iwlwifi;
* For now, just print out whenever the error rate exceeds the
threshold.
The actual scan based retune will take a bit more effort; the scan
command code right now assumes that a scan state is passed in.
This does need to change to be more flexible (both for this and
in preparation for scanning multiple channels at once.)
Tested:
* 5100 (STA mode)
* 2200 (STA mode)
* 2230 (STA mode)
Modified:
head/sys/dev/iwn/if_iwn.c
head/sys/dev/iwn/if_iwnvar.h
Modified: head/sys/dev/iwn/if_iwn.c
==
--- head/sys/dev/iwn/if_iwn.c Sat Dec 7 07:12:37 2013(r259060)
+++ head/sys/dev/iwn/if_iwn.c Sat Dec 7 08:03:10 2013(r259061)
@@ -272,7 +272,10 @@ static int iwn4965_set_gains(struct iwn_
static int iwn5000_set_gains(struct iwn_softc *);
static voidiwn_tune_sensitivity(struct iwn_softc *,
const struct iwn_rx_stats *);
+static voidiwn_save_stats_counters(struct iwn_softc *,
+ const struct iwn_stats *);
static int iwn_send_sensitivity(struct iwn_softc *);
+static voidiwn_check_rx_recovery(struct iwn_softc *, struct iwn_stats *);
static int iwn_set_pslevel(struct iwn_softc *, int, int, int);
static int iwn_send_btcoex(struct iwn_softc *);
static int iwn_send_advanced_btcoex(struct iwn_softc *);
@@ -3187,13 +3190,39 @@ iwn_rx_statistics(struct iwn_softc *sc,
if (calib-state == IWN_CALIB_STATE_ASSOC)
iwn_collect_noise(sc, stats-rx.general);
- else if (calib-state == IWN_CALIB_STATE_RUN)
+ else if (calib-state == IWN_CALIB_STATE_RUN) {
iwn_tune_sensitivity(sc, stats-rx);
+ /*
+* XXX TODO: Only run the RX recovery if we're associated!
+*/
+ iwn_check_rx_recovery(sc, stats);
+ iwn_save_stats_counters(sc, stats);
+ }
DPRINTF(sc, IWN_DEBUG_TRACE, -%s: end\n,__func__);
}
/*
+ * Save the relevant statistic counters for the next calibration
+ * pass.
+ */
+static void
+iwn_save_stats_counters(struct iwn_softc *sc, const struct iwn_stats *rs)
+{
+ struct iwn_calib_state *calib = sc-calib;
+
+ /* Save counters values for next call. */
+ calib-bad_plcp_cck = le32toh(rs-rx.cck.bad_plcp);
+ calib-fa_cck = le32toh(rs-rx.cck.fa);
+ calib-bad_plcp_ht = le32toh(rs-rx.ht.bad_plcp);
+ calib-bad_plcp_ofdm = le32toh(rs-rx.ofdm.bad_plcp);
+ calib-fa_ofdm = le32toh(rs-rx.ofdm.fa);
+
+ /* Last time we received these tick values */
+ sc-last_calib_ticks = ticks;
+}
+
+/*
* Process a TX_DONE firmware notification. Unfortunately, the 4965AGN
* and 5000 adapters have different incompatible TX status formats.
*/
@@ -5652,10 +5681,6 @@ iwn_tune_sensitivity(struct iwn_softc *s
fa += le32toh(stats-ofdm.fa) - calib-fa_ofdm;
fa *= 200 * IEEE80211_DUR_TU; /* 200TU */
- /* Save counters values for next call. */
- calib-bad_plcp_ofdm = le32toh(stats-ofdm.bad_plcp);
- calib-fa_ofdm = le32toh(stats-ofdm.fa);
-
if (fa 50 * rxena) {
/* High false alarm count, decrease sensitivity. */
DPRINTF(sc, IWN_DEBUG_CALIBRATE,
@@ -5709,10 +5734,6 @@ iwn_tune_sensitivity(struct iwn_softc *s
fa += le32toh(stats-cck.fa) - calib-fa_cck;
fa *= 200 * IEEE80211_DUR_TU; /* 200TU */
- /* Save counters values for next call. */
- calib-bad_plcp_cck = le32toh(stats-cck.bad_plcp);
- calib-fa_cck = le32toh(stats-cck.fa);
-
if (fa 50 * rxena) {
/* High false alarm count, decrease sensitivity. */
DPRINTF(sc, IWN_DEBUG_CALIBRATE,
@@ -5818,6 +5839,86 @@ send:
}
/*
+ * Look at the increase of PLCP errors over time; if it exceeds
+ * a programmed threshold then trigger an RF retune.
+ */
+static void
+iwn_check_rx_recovery(struct iwn_softc *sc, struct iwn_stats *rs)
+{
+ int32_t delta_ofdm, delta_ht, delta_cck;
+ struct iwn_calib_state *calib = sc-calib;
+ int delta_ticks, cur_ticks;
+ int delta_msec;
+ int thresh;
+
+ /*
+* Calculate the difference between the current and
+* previous statistics.
+*/
+ delta_cck = le32toh(rs-rx.cck.bad_plcp) - calib-bad_plcp_cck;
+
svn commit: r259062 - head/sys/dev/iwn
Author: adrian
Date: Sat Dec 7 08:20:24 2013
New Revision: 259062
URL: http://svnweb.freebsd.org/changeset/base/259062
Log:
Refactor out the scan channel to be assigned early on in iwn_scan()
rather than it all being a mess of 'c' and 'ic-ic_curchan'.
Tested:
* Intel 5100 (STA)
Modified:
head/sys/dev/iwn/if_iwn.c
Modified: head/sys/dev/iwn/if_iwn.c
==
--- head/sys/dev/iwn/if_iwn.c Sat Dec 7 08:03:10 2013(r259061)
+++ head/sys/dev/iwn/if_iwn.c Sat Dec 7 08:20:24 2013(r259062)
@@ -6385,6 +6385,9 @@ iwn_scan(struct iwn_softc *sc)
return (EAGAIN);
}
+ /* Assign the scan channel */
+ c = ic-ic_curchan;
+
sc-rxon = sc-rx_on[IWN_RXON_BSS_CTX];
buf = malloc(IWN_SCAN_MAXSZ, M_DEVBUF, M_NOWAIT | M_ZERO);
if (buf == NULL) {
@@ -6422,7 +6425,7 @@ iwn_scan(struct iwn_softc *sc)
IWN_RXCHAIN_VALID(sc-rxchainmask) |
IWN_RXCHAIN_FORCE_MIMO_SEL(sc-rxchainmask) |
IWN_RXCHAIN_DRIVER_FORCE;
- if (IEEE80211_IS_CHAN_A(ic-ic_curchan)
+ if (IEEE80211_IS_CHAN_A(c)
sc-hw_type == IWN_HW_REV_TYPE_4965) {
/* Ant A must be avoided in 5GHz because of an HW bug. */
rxchain |= IWN_RXCHAIN_FORCE_SEL(IWN_ANT_B);
@@ -6436,7 +6439,7 @@ iwn_scan(struct iwn_softc *sc)
tx-id = sc-broadcast_id;
tx-lifetime = htole32(IWN_LIFETIME_INFINITE);
- if (IEEE80211_IS_CHAN_5GHZ(ic-ic_curchan)) {
+ if (IEEE80211_IS_CHAN_5GHZ(c)) {
/* Send probe requests at 6Mbps. */
tx-rate = htole32(0xd);
rs = ic-ic_sup_rates[IEEE80211_MODE_11A];
@@ -6540,7 +6543,6 @@ iwn_scan(struct iwn_softc *sc)
hdr-crc_threshold = is_active ?
IWN_GOOD_CRC_TH_DEFAULT : IWN_GOOD_CRC_TH_NEVER;
- c = ic-ic_curchan;
chan = (struct iwn_scan_chan *)frm;
chan-chan = htole16(ieee80211_chan2ieee(ic, c));
chan-flags = 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: r259063 - head/sys/dev/iwn
Author: adrian
Date: Sat Dec 7 08:25:24 2013
New Revision: 259063
URL: http://svnweb.freebsd.org/changeset/base/259063
Log:
Add a channel parameter to iwn_scan().
This is in preparation for being able to use iwn_scan() to do an off
channel scan to reset the RF tuning.
It should be a no-op.
Tested:
* Intel 5100 (STA)
Modified:
head/sys/dev/iwn/if_iwn.c
Modified: head/sys/dev/iwn/if_iwn.c
==
--- head/sys/dev/iwn/if_iwn.c Sat Dec 7 08:20:24 2013(r259062)
+++ head/sys/dev/iwn/if_iwn.c Sat Dec 7 08:25:24 2013(r259063)
@@ -282,7 +282,7 @@ static int iwn_send_advanced_btcoex(stru
static int iwn5000_runtime_calib(struct iwn_softc *);
static int iwn_config(struct iwn_softc *);
static uint8_t *ieee80211_add_ssid(uint8_t *, const uint8_t *, u_int);
-static int iwn_scan(struct iwn_softc *);
+static int iwn_scan(struct iwn_softc *, struct ieee80211_channel *);
static int iwn_auth(struct iwn_softc *, struct ieee80211vap *vap);
static int iwn_run(struct iwn_softc *, struct ieee80211vap *vap);
static int iwn_ampdu_rx_start(struct ieee80211_node *,
@@ -6352,7 +6352,7 @@ iwn_get_passive_dwell_time(struct iwn_so
}
static int
-iwn_scan(struct iwn_softc *sc)
+iwn_scan(struct iwn_softc *sc, struct ieee80211_channel *c)
{
struct ifnet *ifp = sc-sc_ifp;
struct ieee80211com *ic = ifp-if_l2com;
@@ -6364,7 +6364,6 @@ iwn_scan(struct iwn_softc *sc)
struct iwn_scan_chan *chan;
struct ieee80211_frame *wh;
struct ieee80211_rateset *rs;
- struct ieee80211_channel *c;
uint8_t *buf, *frm;
uint16_t rxchain;
uint8_t txant;
@@ -8485,10 +8484,11 @@ iwn_scan_curchan(struct ieee80211_scan_s
{
struct ieee80211vap *vap = ss-ss_vap;
struct iwn_softc *sc = vap-iv_ic-ic_ifp-if_softc;
+ struct ieee80211com *ic = vap-iv_ic;
int error;
IWN_LOCK(sc);
- error = iwn_scan(sc);
+ error = iwn_scan(sc, ic-ic_curchan);
IWN_UNLOCK(sc);
if (error != 0)
ieee80211_cancel_scan(vap);
___
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: r259064 - head/sys/dev/iwn
Author: adrian
Date: Sat Dec 7 08:32:15 2013
New Revision: 259064
URL: http://svnweb.freebsd.org/changeset/base/259064
Log:
Refactor out the scan id and scan vap as part of the scan work.
Make the scan state optional - we'll obviously need a vap, but we now
won't require the scan state. the only thing the scan state is needed
for is to check for the list of SSIDs to scan - which we can now
just plain ignore by passing in NULL as the scan state pointer.
Tested:
* Intel 5100 (STA)
Modified:
head/sys/dev/iwn/if_iwn.c
Modified: head/sys/dev/iwn/if_iwn.c
==
--- head/sys/dev/iwn/if_iwn.c Sat Dec 7 08:25:24 2013(r259063)
+++ head/sys/dev/iwn/if_iwn.c Sat Dec 7 08:32:15 2013(r259064)
@@ -282,7 +282,8 @@ static int iwn_send_advanced_btcoex(stru
static int iwn5000_runtime_calib(struct iwn_softc *);
static int iwn_config(struct iwn_softc *);
static uint8_t *ieee80211_add_ssid(uint8_t *, const uint8_t *, u_int);
-static int iwn_scan(struct iwn_softc *, struct ieee80211_channel *);
+static int iwn_scan(struct iwn_softc *, struct ieee80211vap *,
+ struct ieee80211_scan_state *, struct ieee80211_channel *);
static int iwn_auth(struct iwn_softc *, struct ieee80211vap *vap);
static int iwn_run(struct iwn_softc *, struct ieee80211vap *vap);
static int iwn_ampdu_rx_start(struct ieee80211_node *,
@@ -6352,12 +6353,12 @@ iwn_get_passive_dwell_time(struct iwn_so
}
static int
-iwn_scan(struct iwn_softc *sc, struct ieee80211_channel *c)
+iwn_scan(struct iwn_softc *sc, struct ieee80211vap *vap,
+struct ieee80211_scan_state *ss, struct ieee80211_channel *c)
{
struct ifnet *ifp = sc-sc_ifp;
struct ieee80211com *ic = ifp-if_l2com;
- struct ieee80211_scan_state *ss = ic-ic_scan; /*XXX*/
- struct ieee80211_node *ni = ss-ss_vap-iv_bss;
+ struct ieee80211_node *ni = vap-iv_bss;
struct iwn_scan_hdr *hdr;
struct iwn_cmd_data *tx;
struct iwn_scan_essid *essid;
@@ -6465,22 +6466,26 @@ iwn_scan(struct iwn_softc *sc, struct ie
/*
* If we're scanning for a specific SSID, add it to the command.
+*
+* XXX maybe look at adding support for scanning multiple SSIDs?
*/
essid = (struct iwn_scan_essid *)(tx + 1);
- if (ss-ss_ssid[0].len != 0) {
- essid[0].id = IEEE80211_ELEMID_SSID;
- essid[0].len = ss-ss_ssid[0].len;
- memcpy(essid[0].data, ss-ss_ssid[0].ssid, ss-ss_ssid[0].len);
- }
+ if (ss != NULL) {
+ if (ss-ss_ssid[0].len != 0) {
+ essid[0].id = IEEE80211_ELEMID_SSID;
+ essid[0].len = ss-ss_ssid[0].len;
+ memcpy(essid[0].data, ss-ss_ssid[0].ssid,
ss-ss_ssid[0].len);
+ }
- DPRINTF(sc, IWN_DEBUG_SCAN, %s: ssid_len=%d, ssid=%*s\n,
- __func__,
- ss-ss_ssid[0].len,
- ss-ss_ssid[0].len,
- ss-ss_ssid[0].ssid);
+ DPRINTF(sc, IWN_DEBUG_SCAN, %s: ssid_len=%d, ssid=%*s\n,
+ __func__,
+ ss-ss_ssid[0].len,
+ ss-ss_ssid[0].len,
+ ss-ss_ssid[0].ssid);
- if (ss-ss_nssid 0)
- is_active = 1;
+ if (ss-ss_nssid 0)
+ is_active = 1;
+ }
/*
* Build a probe request frame. Most of the following code is a
@@ -8488,7 +8493,7 @@ iwn_scan_curchan(struct ieee80211_scan_s
int error;
IWN_LOCK(sc);
- error = iwn_scan(sc, ic-ic_curchan);
+ error = iwn_scan(sc, vap, ss, ic-ic_curchan);
IWN_UNLOCK(sc);
if (error != 0)
ieee80211_cancel_scan(vap);
___
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: r259065 - in releng/10.0: . sys/conf sys/sys
Author: gjb
Date: Sat Dec 7 11:27:54 2013
New Revision: 259065
URL: http://svnweb.freebsd.org/changeset/base/259065
Log:
- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1
[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Added:
releng/10.0/
- copied from r259064, stable/10/
Modified:
releng/10.0/sys/conf/newvers.sh
releng/10.0/sys/sys/param.h
Modified: releng/10.0/sys/conf/newvers.sh
==
--- stable/10/sys/conf/newvers.sh Sat Dec 7 08:32:15 2013
(r259064)
+++ releng/10.0/sys/conf/newvers.sh Sat Dec 7 11:27:54 2013
(r259065)
@@ -32,7 +32,7 @@
TYPE=FreeBSD
REVISION=10.0
-BRANCH=BETA4
+BRANCH=RC1
if [ X${BRANCH_OVERRIDE} != X ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/10.0/sys/sys/param.h
==
--- stable/10/sys/sys/param.h Sat Dec 7 08:32:15 2013(r259064)
+++ releng/10.0/sys/sys/param.h Sat Dec 7 11:27:54 2013(r259065)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1000502 /* Master, propagated to newvers */
+#define __FreeBSD_version 1000100 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r259066 - stable/10/sys/conf
Author: gjb
Date: Sat Dec 7 11:33:07 2013
New Revision: 259066
URL: http://svnweb.freebsd.org/changeset/base/259066
Log:
Set stable/10 to -PRERELEASE, now that releng/10.0 has been branched.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/sys/conf/newvers.sh
Modified: stable/10/sys/conf/newvers.sh
==
--- stable/10/sys/conf/newvers.sh Sat Dec 7 11:27:54 2013
(r259065)
+++ stable/10/sys/conf/newvers.sh Sat Dec 7 11:33:07 2013
(r259066)
@@ -32,7 +32,7 @@
TYPE=FreeBSD
REVISION=10.0
-BRANCH=BETA4
+BRANCH=PRERELEASE
if [ X${BRANCH_OVERRIDE} != X ]; then
BRANCH=${BRANCH_OVERRIDE}
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: r259067 - releng/10.0/sys/sys
Author: gjb Date: Sat Dec 7 12:57:38 2013 New Revision: 259067 URL: http://svnweb.freebsd.org/changeset/base/259067 Log: When stable/10 was branched from head/, __FreeBSD_version was bumped to 1000500 from 155 when it should not have been bumped yet. At the risk of having non-standard '5XX' __FreeBSD_version suffix in a -RELEASE, bump __FreeBSD_version in releng/10.0 from 1000100 to 1000510 to prevent the value from going backwards as part of the stable/10 - releng/10.0 branch. A commit to bump __FreeBSD_version in stable/10 will follow. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/sys/sys/param.h Modified: releng/10.0/sys/sys/param.h == --- releng/10.0/sys/sys/param.h Sat Dec 7 11:33:07 2013(r259066) +++ releng/10.0/sys/sys/param.h Sat Dec 7 12:57:38 2013(r259067) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1000100 /* Master, propagated to newvers */ +#define __FreeBSD_version 1000510 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r259068 - releng/10.0/sys/conf
Author: gjb Date: Sat Dec 7 13:03:14 2013 New Revision: 259068 URL: http://svnweb.freebsd.org/changeset/base/259068 Log: Forced commit to mark the real -RC1 point. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/sys/conf/newvers.sh Modified: releng/10.0/sys/conf/newvers.sh == ___ 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: r259069 - stable/10/sys/sys
Author: gjb Date: Sat Dec 7 13:06:14 2013 New Revision: 259069 URL: http://svnweb.freebsd.org/changeset/base/259069 Log: Bump __FreeBSD_version to 1000700, to set it higher than what is in releng/10.0 now. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/sys/param.h Modified: stable/10/sys/sys/param.h == --- stable/10/sys/sys/param.h Sat Dec 7 13:03:14 2013(r259068) +++ stable/10/sys/sys/param.h Sat Dec 7 13:06:14 2013(r259069) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1000502 /* Master, propagated to newvers */ +#define __FreeBSD_version 1000700 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r259070 - svnadmin/conf
Author: gjb Date: Sat Dec 7 13:11:50 2013 New Revision: 259070 URL: http://svnweb.freebsd.org/changeset/base/259070 Log: Require re@ approval for commits to releng/10.0 for the duration of the 10.0-RELEASE cycle. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: svnadmin/conf/approvers Modified: svnadmin/conf/approvers == --- svnadmin/conf/approvers Sat Dec 7 13:06:14 2013(r259069) +++ svnadmin/conf/approvers Sat Dec 7 13:11:50 2013(r259070) @@ -21,6 +21,7 @@ #^stable/9/re #^stable/8/re #^stable/7/re +^releng/10.0/ re ^releng/9.[0-2]/ (security-officer|so) ^releng/8.[0-4]/ (security-officer|so) ^releng/7.[0-4]/ (security-officer|so) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r259071 - head/sys/conf
Author: ray Date: Sat Dec 7 15:24:43 2013 New Revision: 259071 URL: http://svnweb.freebsd.org/changeset/base/259071 Log: Include dev/fb/fb_if.m in build always, without it kms modules complain about lack of fb_getinfo_desc symbol. Submitted by: dumbbell Sponsored by: The FreeBSD Foundation Modified: head/sys/conf/files Modified: head/sys/conf/files == --- head/sys/conf/files Sat Dec 7 13:11:50 2013(r259070) +++ head/sys/conf/files Sat Dec 7 15:24:43 2013(r259071) @@ -1397,7 +1397,7 @@ dev/ex/if_ex_pccard.c optional ex pccar dev/exca/exca.coptional cbb dev/fatm/if_fatm.c optional fatm pci dev/fb/fbd.c optional fbd | vt -dev/fb/fb_if.m optional fbd | vt +dev/fb/fb_if.m standard dev/fb/splash.coptional splash dev/fdt/fdt_common.c optional fdt dev/fdt/fdt_ic_if.moptional fdt ___ 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: r259071 - head/sys/conf
On Sat, Dec 07, 2013 at 03:24:43PM +, Aleksandr Rybalko wrote: Author: ray Date: Sat Dec 7 15:24:43 2013 New Revision: 259071 URL: http://svnweb.freebsd.org/changeset/base/259071 Log: Include dev/fb/fb_if.m in build always, without it kms modules complain about lack of fb_getinfo_desc symbol. Submitted by: dumbbell Sponsored by: The FreeBSD Foundation Modified: head/sys/conf/files Modified: head/sys/conf/files == --- head/sys/conf/files Sat Dec 7 13:11:50 2013(r259070) +++ head/sys/conf/files Sat Dec 7 15:24:43 2013(r259071) @@ -1397,7 +1397,7 @@ dev/ex/if_ex_pccard.c optional ex pccar dev/exca/exca.c optional cbb dev/fatm/if_fatm.c optional fatm pci dev/fb/fbd.c optional fbd | vt -dev/fb/fb_if.m optional fbd | vt +dev/fb/fb_if.m standard dev/fb/splash.c optional splash dev/fdt/fdt_common.c optional fdt dev/fdt/fdt_ic_if.m optional fdt As a tangentially related, I noted that logo_freebsd.c is compiled in unconditional. Is it required, can it be made an option ? Also, is it possible to make the mouse cursor an option, same as it was in syscons with SC_NO_CUTPASTE ? pgpsl2A5NmZ4z.pgp Description: PGP signature
svn commit: r259072 - head/libexec/rtld-elf
Author: kib
Date: Sat Dec 7 15:49:16 2013
New Revision: 259072
URL: http://svnweb.freebsd.org/changeset/base/259072
Log:
Cast Elf_Addr to void * to match the free_aligned() argument type.
Found by: gcc
Sponsored by: The FreeBSD Foundation
MFC after:6 days
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cSat Dec 7 15:24:43 2013
(r259071)
+++ head/libexec/rtld-elf/rtld.cSat Dec 7 15:49:16 2013
(r259072)
@@ -4369,11 +4369,11 @@ free_tls(void *tls, size_t tcbsize, size
tlsstart = tlsend - size;
for (i = 0; i dtvsize; i++) {
if (dtv[i + 2] != 0 (dtv[i + 2] tlsstart || dtv[i + 2] tlsend)) {
- free_aligned(dtv[i + 2]);
+ free_aligned((void *)dtv[i + 2]);
}
}
-free_aligned(tlsstart);
+free_aligned((void *)tlsstart);
free((void*) dtv);
}
___
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: r259073 - in stable/10: . contrib/ipfilter contrib/top share/man/man4 share/mk sys/amd64/include sys/contrib/dev/acpica sys/contrib/ipfilter/netinet sys/dev/fdt sys/x86/include
Author: peter Date: Sat Dec 7 18:23:29 2013 New Revision: 259073 URL: http://svnweb.freebsd.org/changeset/base/259073 Log: Hoist all the mergeinfo up to the root in preparation for enforcing merges to the root only. All MFC's were rerecorded to the root. Going forward, if an MFC includes mergeinfo, it will need to be made to the root and committed from the root. Merges with --ignore-ancestry or diff | patch can go anywhere. The mergeinfo in HEAD is in a bad state from years of neglect and manual tampering and this was branched into 10.x. This confuses the coalescing code and prevents it from doing its job. Approved by: re (gjb, implicit) Modified: Directory Properties: stable/10/ (props changed) stable/10/MAINTAINERS (props changed) stable/10/Makefile.inc1 (props changed) stable/10/ObsoleteFiles.inc (props changed) stable/10/UPDATING (props changed) stable/10/bin/df/ (props changed) stable/10/bin/freebsd-version/ (props changed) stable/10/cddl/ (props changed) stable/10/cddl/contrib/opensolaris/ (props changed) stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) stable/10/cddl/contrib/opensolaris/cmd/zfs/ (props changed) stable/10/cddl/contrib/opensolaris/lib/libzfs/ (props changed) stable/10/contrib/apr/ (props changed) stable/10/contrib/apr-util/ (props changed) stable/10/contrib/atf/ (props changed) stable/10/contrib/binutils/ (props changed) stable/10/contrib/bmake/ (props changed) stable/10/contrib/byacc/ (props changed) stable/10/contrib/bzip2/ (props changed) stable/10/contrib/com_err/ (props changed) stable/10/contrib/compiler-rt/ (props changed) stable/10/contrib/dialog/ (props changed) stable/10/contrib/dtc/ (props changed) stable/10/contrib/ee/ (props changed) stable/10/contrib/expat/ (props changed) stable/10/contrib/file/ (props changed) stable/10/contrib/gcc/ (props changed) stable/10/contrib/gdb/ (props changed) stable/10/contrib/gdtoa/ (props changed) stable/10/contrib/groff/ (props changed) stable/10/contrib/ipfilter/ (props changed) stable/10/contrib/ipfilter/ml_ipl.c (props changed) stable/10/contrib/ipfilter/mlfk_ipl.c (props changed) stable/10/contrib/ipfilter/mlh_rule.c (props changed) stable/10/contrib/ipfilter/mli_ipl.c (props changed) stable/10/contrib/ipfilter/mln_ipl.c (props changed) stable/10/contrib/ipfilter/mls_ipl.c (props changed) stable/10/contrib/ldns/ (props changed) stable/10/contrib/less/ (props changed) stable/10/contrib/libarchive/ (props changed) stable/10/contrib/libarchive/cpio/ (props changed) stable/10/contrib/libarchive/libarchive/ (props changed) stable/10/contrib/libarchive/libarchive_fe/ (props changed) stable/10/contrib/libarchive/tar/ (props changed) stable/10/contrib/libc++/ (props changed) stable/10/contrib/libc-vis/ (props changed) stable/10/contrib/libcxxrt/ (props changed) stable/10/contrib/libexecinfo/ (props changed) stable/10/contrib/libpcap/ (props changed) stable/10/contrib/libstdc++/ (props changed) stable/10/contrib/llvm/ (props changed) stable/10/contrib/llvm/tools/clang/ (props changed) stable/10/contrib/mtree/ (props changed) stable/10/contrib/ncurses/ (props changed) stable/10/contrib/netcat/ (props changed) stable/10/contrib/ntp/ (props changed) stable/10/contrib/nvi/ (props changed) stable/10/contrib/one-true-awk/ (props changed) stable/10/contrib/openbsm/ (props changed) stable/10/contrib/openpam/ (props changed) stable/10/contrib/openresolv/ (props changed) stable/10/contrib/pf/ (props changed) stable/10/contrib/sendmail/ (props changed) stable/10/contrib/serf/ (props changed) stable/10/contrib/smbfs/ (props changed) stable/10/contrib/subversion/ (props changed) stable/10/contrib/tcpdump/ (props changed) stable/10/contrib/tcsh/ (props changed) stable/10/contrib/tnftp/ (props changed) stable/10/contrib/top/ (props changed) stable/10/contrib/top/install-sh (props changed) stable/10/contrib/tzcode/stdtime/ (props changed) stable/10/contrib/tzcode/zic/ (props changed) stable/10/contrib/tzdata/ (props changed) stable/10/contrib/unbound/ (props changed) stable/10/contrib/wpa/ (props changed) stable/10/contrib/xz/ (props changed) stable/10/crypto/heimdal/ (props changed) stable/10/crypto/openssh/ (props changed) stable/10/crypto/openssl/ (props changed) stable/10/etc/ (props changed) stable/10/etc/rc.d/ (props changed) stable/10/gnu/lib/ (props changed) stable/10/gnu/usr.bin/binutils/ (props changed) stable/10/gnu/usr.bin/cc/cc_tools/ (props changed) stable/10/gnu/usr.bin/gdb/ (props changed) stable/10/include/ (props changed) stable/10/lib/ (props changed) stable/10/lib/libc/ (props changed) stable/10/lib/libc/stdtime/
svn commit: r259074 - svnadmin/hooks/scripts
Author: peter
Date: Sat Dec 7 18:27:21 2013
New Revision: 259074
URL: http://svnweb.freebsd.org/changeset/base/259074
Log:
Add initial version of mergeinfo bloat detection script
Added:
svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl (contents, props changed)
Added: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.plSat Dec 7 18:27:21
2013(r259074)
@@ -0,0 +1,198 @@
+#!/usr/bin/env perl
+
+
+# $FreeBSD$
+# source:
http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/check-mime-type.pl
+#
+
+#
+# commit-mime-type-check.pl: check that every added file has the
+# svn:mime-type property set and every added file with a mime-type
+# matching text/* also has svn:eol-style set. If any file fails this
+# test the user is sent a verbose error message suggesting solutions and
+# the commit is aborted.
+#
+# Usage: commit-mime-type-check.pl REPOS TXN-NAME
+#
+# Most of commit-mime-type-check.pl was taken from
+# commit-access-control.pl, Revision 9986, 2004-06-14 16:29:22 -0400.
+#
+# Copyright (c) 2000-2004 CollabNet. All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://subversion.tigris.org/license.html.
+# If newer versions of this license are posted there, you may use a
+# newer version instead, at your option.
+#
+# This software consists of voluntary contributions made by many
+# individuals. For exact contribution history, see the revision
+# history and logs, available at http://subversion.tigris.org/.
+#
+
+require warnings;
+import warnings;
+
+use strict;
+use Carp;
+use feature qw(switch);# be 5.10 or later, or else!
+
+##
+# Configuration section.
+
+# Svnlook path.
+my $svnlook = /usr/bin/svnlook;
+
+# Since the path to svnlook depends upon the local installation
+# preferences, check that the required program exists to insure that
+# the administrator has set up the script properly.
+{
+ my $ok = 1;
+ foreach my $program ($svnlook) {
+if (-e $program) {
+ unless (-x $program) {
+ warn $0: required program `$program' is not executable, edit $0.\n;
+ $ok = 0;
+ }
+} else {
+ warn $0: required program `$program' does not exist, edit $0.\n;
+ $ok = 0;
+}
+ }
+ exit 1 unless $ok;
+}
+
+##
+# Initial setup/command-line handling.
+
+usage unless @ARGV == 2;
+
+my $repos= shift;
+my $txn = shift;
+
+unless (-e $repos) {
+ usage($0: repository directory `$repos' does not exist.);
+}
+unless (-d $repos) {
+ usage($0: repository directory `$repos' is not a directory.);
+}
+
+
+##
+# Harvest data using svnlook.
+
+# Change into /tmp so that svnlook diff can create its .svnlook
+# directory.
+my $tmp_dir = '/tmp';
+chdir($tmp_dir)
+ or die $0: cannot chdir `$tmp_dir': $!\n;
+
+
+#see rev 257353. We're trying to allow modifications but prevent new stuff.
+#Property changes on: stable/10/etc
+#___
+#Modified: svn:mergeinfo
+#
+#Property changes on: stable/10/share/man/man7
+#___
+#Added: svn:mergeinfo
+
+my $state = 0;
+my $path;
+my @errors;
+foreach my $line (read_from_process($svnlook, 'diff', $repos, '-r', $txn)) {
+ #printf line: %s, current state %d\n, $line, $state;
+ if ($state == 0 $line =~ /^Property changes on: (.*)$/) {
+$path = $1;
+given ($path) {
+ when (/stable\/([0-9]+)/) { if ($1 = 10) { $state = 1; } else { $state
= 0; } }
+ default { $state = 0; }
+}
+#printf path: %s, state %d\n, $path, $state;
+next;
+ }
+ if ($state == 1) {
+if ($line =~ /^___/) { $state = 2; } else { $state = 0; }
+#print state 1 - 2\n;
+next;
+ }
+ if ($state == 2) {
+given ($line) {
+ when (/^Added: svn:mergeinfo/) {
+ push @errors, $path : svn:merginfo added at somewhere other than root;
+ }
+ when (/^/) { $state = 0; }
+}
+ }
+}
+
+# If there are any errors list the problem files and give information
+# on how to avoid the problem. Hopefully people will set up auto-props
+# and will not see this verbose message more than once.
+if (@errors) {
+warn $0:\n\n,
svn commit: r259075 - svnadmin/hooks/scripts
Author: peter
Date: Sat Dec 7 18:46:25 2013
New Revision: 259075
URL: http://svnweb.freebsd.org/changeset/base/259075
Log:
Add a -t / -r mode so it can be run on either a proto-txn or an existing
rev for testing. Update explanation text.
Modified:
svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
==
--- svnadmin/hooks/scripts/detect-mergeinfo-bloat.plSat Dec 7 18:27:21
2013(r259074)
+++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.plSat Dec 7 18:46:25
2013(r259075)
@@ -65,9 +65,10 @@ my $svnlook = /usr/bin/svnlook;
##
# Initial setup/command-line handling.
-usage unless @ARGV == 2;
+usage unless @ARGV == 3;
my $repos= shift;
+my $mode = shift;
my $txn = shift;
unless (-e $repos) {
@@ -100,12 +101,12 @@ chdir($tmp_dir)
my $state = 0;
my $path;
my @errors;
-foreach my $line (read_from_process($svnlook, 'diff', $repos, '-r', $txn)) {
+foreach my $line (read_from_process($svnlook, 'diff', $repos, $mode, $txn)) {
#printf line: %s, current state %d\n, $line, $state;
if ($state == 0 $line =~ /^Property changes on: (.*)$/) {
$path = $1;
given ($path) {
- when (/stable\/([0-9]+)/) { if ($1 = 10) { $state = 1; } else { $state
= 0; } }
+ when (/stable\/([0-9]+)\//) { if ($1 = 10) { $state = 1; } else {
$state = 0; } }
default { $state = 0; }
}
#printf path: %s, state %d\n, $path, $state;
@@ -119,7 +120,7 @@ foreach my $line (read_from_process($sv
if ($state == 2) {
given ($line) {
when (/^Added: svn:mergeinfo/) {
- push @errors, $path : svn:merginfo added at somewhere other than root;
+ push @errors, $path : svn:merginfo ADDED;
}
when (/^/) { $state = 0; }
}
@@ -131,9 +132,16 @@ foreach my $line (read_from_process($sv
# and will not see this verbose message more than once.
if (@errors) {
warn $0:\n\n, join(\n, @errors), \n\n, EOS;
-svn merge should be done at the root directory to prevent
-spread of stray mergeinfo records. This commit adds new
-mergeinfo.
+If you use svn merge then it must be done at the top directory
+directory to prevent spread of mergeinfo records. Resulting
+commits must ALSO be done from the root directory.
+
+This applies to the stable/10 or higher branches.
+
+This commit was aborted because it would have added NEW mergeinfo
+records elsewhere, somehow.
+
+merges with --ignore-ancestry or diff | patch do not require this.
EOS
exit 1;
} else {
@@ -143,7 +151,7 @@ EOS
sub usage
{
warn @_\n if @_;
- die usage: $0 REPOS TXN-NAME\n;
+ die usage: $0 REPOS [-r REV] | [-t TXN-NAME]\n;
}
sub safe_read_from_pipe
___
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: r259076 - svnadmin/hooks/scripts
Author: peter Date: Sat Dec 7 18:48:27 2013 New Revision: 259076 URL: http://svnweb.freebsd.org/changeset/base/259076 Log: oops. svn.freebsd.org uses ports svn due to API bindings. Update path. Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl == --- svnadmin/hooks/scripts/detect-mergeinfo-bloat.plSat Dec 7 18:46:25 2013(r259075) +++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.plSat Dec 7 18:48:27 2013(r259076) @@ -41,7 +41,7 @@ use feature qw(switch); # be 5.10 or la # Configuration section. # Svnlook path. -my $svnlook = /usr/bin/svnlook; +my $svnlook = /usr/local/bin/svnlook; # Since the path to svnlook depends upon the local installation # preferences, check that the required program exists to insure that ___ 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: r259077 - svnadmin/hooks/scripts
Author: peter
Date: Sat Dec 7 18:53:54 2013
New Revision: 259077
URL: http://svnweb.freebsd.org/changeset/base/259077
Log:
We set $PATH explicitly for our commit scripts. Don't try to second guess it.
Modified:
svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
Modified: svnadmin/hooks/scripts/detect-mergeinfo-bloat.pl
==
--- svnadmin/hooks/scripts/detect-mergeinfo-bloat.plSat Dec 7 18:48:27
2013(r259076)
+++ svnadmin/hooks/scripts/detect-mergeinfo-bloat.plSat Dec 7 18:53:54
2013(r259077)
@@ -40,28 +40,6 @@ use feature qw(switch); # be 5.10 or la
##
# Configuration section.
-# Svnlook path.
-my $svnlook = /usr/local/bin/svnlook;
-
-# Since the path to svnlook depends upon the local installation
-# preferences, check that the required program exists to insure that
-# the administrator has set up the script properly.
-{
- my $ok = 1;
- foreach my $program ($svnlook) {
-if (-e $program) {
- unless (-x $program) {
- warn $0: required program `$program' is not executable, edit $0.\n;
- $ok = 0;
- }
-} else {
- warn $0: required program `$program' does not exist, edit $0.\n;
- $ok = 0;
-}
- }
- exit 1 unless $ok;
-}
-
##
# Initial setup/command-line handling.
@@ -101,7 +79,7 @@ chdir($tmp_dir)
my $state = 0;
my $path;
my @errors;
-foreach my $line (read_from_process($svnlook, 'diff', $repos, $mode, $txn)) {
+foreach my $line (read_from_process('svnlook', 'diff', $repos, $mode, $txn)) {
#printf line: %s, current state %d\n, $line, $state;
if ($state == 0 $line =~ /^Property changes on: (.*)$/) {
$path = $1;
___
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: r259078 - svnadmin/hooks
Author: peter Date: Sat Dec 7 18:55:53 2013 New Revision: 259078 URL: http://svnweb.freebsd.org/changeset/base/259078 Log: Check for mergeinfo growth on stable/10+. Modified: svnadmin/hooks/pre-commit Modified: svnadmin/hooks/pre-commit == --- svnadmin/hooks/pre-commit Sat Dec 7 18:53:54 2013(r259077) +++ svnadmin/hooks/pre-commit Sat Dec 7 18:55:53 2013(r259078) @@ -87,6 +87,9 @@ verify.py $REPO -t $TXN || exit 1 # check for merge debris detect-merge-conflicts.sh $REPO $TXN || exit 1 +# stomp on mergeinfo bloat +detect-mergeinfo-bloat.pl $REPO -t $TXN || exit 1 + # check for upper/lowercase filename conflicts on clients case-insensitive.py $REPO $TXN || exit 1 @@ -95,16 +98,3 @@ log-police.py -t $TXN $REPO || exit # Nothing else, go ahead. exit 0 - - -# Make sure that the log message contains some text. -SVNLOOK=/usr/local/bin/svnlook -$SVNLOOK log -t $TXN $REPO | \ - grep [a-zA-Z0-9] /dev/null || exit 1 - -# Check that the author of this commit has the rights to perform -# the commit on the files and directories being modified. -commit-access-control.pl $REPO $TXN commit-access-control.cfg || exit 1 - -# All checks passed, so allow the commit. -exit 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: r259079 - head/release
Author: gjb
Date: Sat Dec 7 19:39:38 2013
New Revision: 259079
URL: http://svnweb.freebsd.org/changeset/base/259079
Log:
Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually
passed to 'make release'.
MFC after:3 days
X-Before-RC2: yes
Sponsored by: The FreeBSD Foundation
Modified:
head/release/release.conf.sample
head/release/release.sh
Modified: head/release/release.conf.sample
==
--- head/release/release.conf.sampleSat Dec 7 18:55:53 2013
(r259078)
+++ head/release/release.conf.sampleSat Dec 7 19:39:38 2013
(r259079)
@@ -39,3 +39,4 @@ PORTBRANCH=ports/head@rHEAD
#NODOC=
#NOPORTS=
#RELSTRING=
+#WITH_DVD=
Modified: head/release/release.sh
==
--- head/release/release.sh Sat Dec 7 18:55:53 2013(r259078)
+++ head/release/release.sh Sat Dec 7 19:39:38 2013(r259079)
@@ -72,6 +72,9 @@ KERNEL=GENERIC
NODOC=
NOPORTS=
+# Set to non-empty value to build dvd1.iso as part of the release.
+WITH_DVD=
+
usage() {
echo Usage: $0 [-c release.conf]
exit 1
@@ -129,7 +132,7 @@ CHROOT_DMAKEFLAGS=${CONF_FILES}
RELEASE_WMAKEFLAGS=${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}
RELEASE_KMAKEFLAGS=${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\${KERNEL}\
${ARCH_FLAGS} ${CONF_FILES}
RELEASE_RMAKEFLAGS=${ARCH_FLAGS} KERNCONF=\${KERNEL}\ ${CONF_FILES} \
- ${DOCPORTS}
+ ${DOCPORTS} WITH_DVD=${WITH_DVD}
# Force src checkout if configured
FORCE_SRC_KEY=
___
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: r259080 - in head/sys: dev/iicbus geom/cache geom/journal
Author: jhibbits
Date: Sat Dec 7 19:55:34 2013
New Revision: 259080
URL: http://svnweb.freebsd.org/changeset/base/259080
Log:
Fix some integer signs. These unsigned integers should all be signed.
Found by: clang (powerpc64)
Modified:
head/sys/dev/iicbus/max6690.c
head/sys/geom/cache/g_cache.c
head/sys/geom/journal/g_journal.c
Modified: head/sys/dev/iicbus/max6690.c
==
--- head/sys/dev/iicbus/max6690.c Sat Dec 7 19:39:38 2013
(r259079)
+++ head/sys/dev/iicbus/max6690.c Sat Dec 7 19:55:34 2013
(r259080)
@@ -362,7 +362,7 @@ max6690_sensor_sysctl(SYSCTL_HANDLER_ARG
struct max6690_softc *sc;
struct max6690_sensor *sens;
int error;
- unsigned int temp;
+ int temp;
dev = arg1;
sc = device_get_softc(dev);
Modified: head/sys/geom/cache/g_cache.c
==
--- head/sys/geom/cache/g_cache.c Sat Dec 7 19:39:38 2013
(r259079)
+++ head/sys/geom/cache/g_cache.c Sat Dec 7 19:55:34 2013
(r259080)
@@ -67,7 +67,7 @@ static u_int g_cache_used_hi = 20;
static int
sysctl_handle_pct(SYSCTL_HANDLER_ARGS)
{
- u_int val = *(u_int *)arg1;
+ int val;
int error;
error = sysctl_handle_int(oidp, val, 0, req);
Modified: head/sys/geom/journal/g_journal.c
==
--- head/sys/geom/journal/g_journal.c Sat Dec 7 19:39:38 2013
(r259079)
+++ head/sys/geom/journal/g_journal.c Sat Dec 7 19:55:34 2013
(r259080)
@@ -168,7 +168,7 @@ SYSCTL_UINT(_kern_geom_journal_cache, OI
static int
g_journal_cache_switch_sysctl(SYSCTL_HANDLER_ARGS)
{
- u_int cswitch;
+ int cswitch;
int error;
cswitch = g_journal_cache_switch;
___
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: r259080 - in head/sys: dev/iicbus geom/cache geom/journal
On Sat, 7 Dec 2013 19:55:34 + (UTC) Justin Hibbits jhibb...@freebsd.org wrote: Author: jhibbits Date: Sat Dec 7 19:55:34 2013 New Revision: 259080 URL: http://svnweb.freebsd.org/changeset/base/259080 Log: Fix some integer signs. These unsigned integers should all be signed. Found by: clang (powerpc64) MFC after: 1 week - Justin ___ 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: r259058 - head/usr.bin/bc
On Sat, 7 Dec 2013 01:44:19 -0500 Eitan Adler ead...@freebsd.org wrote: On Sat, Dec 7, 2013 at 1:27 AM, Xin LI delp...@freebsd.org wrote: Author: delphij Date: Sat Dec 7 06:27:54 2013 New Revision: 259058 URL: http://svnweb.freebsd.org/changeset/base/259058 Log: Remove mention of the compatibility option 'q', which is intentionally undocumented and its only purpose is that we do not bail out when used as a drop-in replacement of a different implementation. As I mentioned in the reply to the PR this change goes in the wrong direction. We should instead document -q as a compatibility option. Undocumented flags, even as NOPS, are bugs. It should be documented as a do-nothing option. -- Tom Rhodes ___ 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: r259081 - in head: sys/amd64/include sys/amd64/vmm sys/amd64/vmm/intel sys/amd64/vmm/io usr.sbin/bhyve
Author: neel
Date: Sat Dec 7 22:18:36 2013
New Revision: 259081
URL: http://svnweb.freebsd.org/changeset/base/259081
Log:
If a vcpu disables its local apic and then executes a 'HLT' then spin down the
vcpu and destroy its thread context. Also modify the 'HLT' processing to
ignore
pending interrupts in the IRR if interrupts have been disabled by the guest.
The interrupt cannot be injected into the guest in any case so resuming it
is futile.
With this change halt from a Linux guest works correctly.
Reviewed by: grehan@
Tested by:Tycho Nightingale (tycho.nighting...@pluribusnetworks.com)
Modified:
head/sys/amd64/include/vmm.h
head/sys/amd64/vmm/intel/vmx.c
head/sys/amd64/vmm/io/vlapic.c
head/sys/amd64/vmm/io/vlapic.h
head/sys/amd64/vmm/vmm.c
head/usr.sbin/bhyve/bhyverun.c
Modified: head/sys/amd64/include/vmm.h
==
--- head/sys/amd64/include/vmm.hSat Dec 7 19:55:34 2013
(r259080)
+++ head/sys/amd64/include/vmm.hSat Dec 7 22:18:36 2013
(r259081)
@@ -264,6 +264,7 @@ enum vm_exitcode {
VM_EXITCODE_PAGING,
VM_EXITCODE_INST_EMUL,
VM_EXITCODE_SPINUP_AP,
+ VM_EXITCODE_SPINDOWN_CPU,
VM_EXITCODE_MAX
};
@@ -307,6 +308,9 @@ struct vm_exit {
int vcpu;
uint64_trip;
} spinup_ap;
+ struct {
+ uint64_trflags;
+ } hlt;
} u;
};
Modified: head/sys/amd64/vmm/intel/vmx.c
==
--- head/sys/amd64/vmm/intel/vmx.c Sat Dec 7 19:55:34 2013
(r259080)
+++ head/sys/amd64/vmm/intel/vmx.c Sat Dec 7 22:18:36 2013
(r259081)
@@ -1336,7 +1336,7 @@ vmx_exit_process(struct vmx *vmx, int vc
struct vmcs *vmcs;
struct vmxctx *vmxctx;
uint32_t eax, ecx, edx, idtvec_info, idtvec_err, reason;
- uint64_t qual, gpa;
+ uint64_t qual, gpa, rflags;
handled = 0;
vmcs = vmx-vmcs[vcpu];
@@ -1406,7 +1406,10 @@ vmx_exit_process(struct vmx *vmx, int vc
break;
case EXIT_REASON_HLT:
vmm_stat_incr(vmx-vm, vcpu, VMEXIT_HLT, 1);
+ if ((error = vmread(VMCS_GUEST_RFLAGS, rflags)) != 0)
+ panic(vmx_exit_process: vmread(rflags) %d, error);
vmexit-exitcode = VM_EXITCODE_HLT;
+ vmexit-u.hlt.rflags = rflags;
break;
case EXIT_REASON_MTF:
vmm_stat_incr(vmx-vm, vcpu, VMEXIT_MTRAP, 1);
Modified: head/sys/amd64/vmm/io/vlapic.c
==
--- head/sys/amd64/vmm/io/vlapic.c Sat Dec 7 19:55:34 2013
(r259080)
+++ head/sys/amd64/vmm/io/vlapic.c Sat Dec 7 22:18:36 2013
(r259081)
@@ -53,6 +53,9 @@ __FBSDID($FreeBSD$);
#defineVLAPIC_CTR1(vlapic, format, p1)
\
VCPU_CTR1((vlapic)-vm, (vlapic)-vcpuid, format, p1)
+#defineVLAPIC_CTR2(vlapic, format, p1, p2)
\
+ VCPU_CTR2((vlapic)-vm, (vlapic)-vcpuid, format, p1, p2)
+
#defineVLAPIC_CTR_IRR(vlapic, msg)
\
do { \
uint32_t *irrptr = (vlapic)-apic.irr0;\
@@ -221,6 +224,12 @@ vlapic_set_intr_ready(struct vlapic *vla
if (vector 0 || vector = 256)
panic(vlapic_set_intr_ready: invalid vector %d\n, vector);
+ if (!(lapic-svr APIC_SVR_ENABLE)) {
+ VLAPIC_CTR1(vlapic, vlapic is software disabled, ignoring
+ interrupt %d, vector);
+ return;
+ }
+
idx = (vector / 32) * 4;
mask = 1 (vector % 32);
@@ -593,6 +602,25 @@ vlapic_intr_accepted(struct vlapic *vlap
vlapic_update_ppr(vlapic);
}
+static void
+lapic_set_svr(struct vlapic *vlapic, uint32_t new)
+{
+ struct LAPIC *lapic;
+ uint32_t old, changed;
+
+ lapic = vlapic-apic;
+ old = lapic-svr;
+ changed = old ^ new;
+ if ((changed APIC_SVR_ENABLE) != 0) {
+ if ((new APIC_SVR_ENABLE) == 0) {
+ VLAPIC_CTR0(vlapic, vlapic is software-disabled);
+ } else {
+ VLAPIC_CTR0(vlapic, vlapic is software-enabled);
+ }
+ }
+ lapic-svr = new;
+}
+
int
vlapic_read(struct vlapic *vlapic, uint64_t offset, uint64_t *data)
{
@@ -602,7 +630,7 @@ vlapic_read(struct vlapic *vlapic, uint6
if (offset sizeof(*lapic)) {
*data = 0;
- return 0;
+ goto done;
}
offset = ~3;
@@ -680,6 +708,8 @@ vlapic_read(struct vlapic *vlapic, uint6
svn commit: r259082 - in head/sys: dev/iicbus powerpc/powermac
Author: jhibbits
Date: Sat Dec 7 22:25:07 2013
New Revision: 259082
URL: http://svnweb.freebsd.org/changeset/base/259082
Log:
Make more unsigned ints signed.
Found by: clang (powerpc64)
MFC after:1 week
Modified:
head/sys/dev/iicbus/ds1631.c
head/sys/dev/iicbus/ds1775.c
head/sys/powerpc/powermac/platform_powermac.c
Modified: head/sys/dev/iicbus/ds1631.c
==
--- head/sys/dev/iicbus/ds1631.cSat Dec 7 22:18:36 2013
(r259081)
+++ head/sys/dev/iicbus/ds1631.cSat Dec 7 22:25:07 2013
(r259082)
@@ -398,7 +398,7 @@ ds1631_sensor_sysctl(SYSCTL_HANDLER_ARGS
device_t dev;
struct ds1631_softc *sc;
int error;
- unsigned int temp;
+ int temp;
dev = arg1;
sc = device_get_softc(dev);
Modified: head/sys/dev/iicbus/ds1775.c
==
--- head/sys/dev/iicbus/ds1775.cSat Dec 7 22:18:36 2013
(r259081)
+++ head/sys/dev/iicbus/ds1775.cSat Dec 7 22:25:07 2013
(r259082)
@@ -257,7 +257,7 @@ ds1775_sensor_sysctl(SYSCTL_HANDLER_ARGS
device_t dev;
struct ds1775_softc *sc;
int error;
- unsigned int temp;
+ int temp;
dev = arg1;
sc = device_get_softc(dev);
Modified: head/sys/powerpc/powermac/platform_powermac.c
==
--- head/sys/powerpc/powermac/platform_powermac.c Sat Dec 7 22:18:36
2013(r259081)
+++ head/sys/powerpc/powermac/platform_powermac.c Sat Dec 7 22:25:07
2013(r259082)
@@ -219,7 +219,8 @@ powermac_timebase_freq(platform_t plat,
static int
powermac_smp_fill_cpuref(struct cpuref *cpuref, phandle_t cpu)
{
- cell_t cpuid, res;
+ cell_t cpuid;
+ int res;
cpuref-cr_hwref = cpu;
res = OF_getprop(cpu, reg, cpuid, sizeof(cpuid));
___
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: r259083 - head/share/mk
Author: dim
Date: Sat Dec 7 22:30:07 2013
New Revision: 259083
URL: http://svnweb.freebsd.org/changeset/base/259083
Log:
For WARNS = 3, change the clang warning flag -Wno-conversion to
-Wno-enum-conversion. In earlier clang versions (before 3.2), the
latter did not exist, and suppressing enum conversion warnings was
really the goal of this warning suppression flag.
This should enable the same kind of warning again as was fixed by
r259072 (incompatible integer to pointer conversion passing 'Elf_Addr'
(aka 'unsigned int') to parameter of type 'void *'), and which was only
emitted by gcc.
Noticed by: kib
MFC after:3 days
Modified:
head/share/mk/bsd.sys.mk
Modified: head/share/mk/bsd.sys.mk
==
--- head/share/mk/bsd.sys.mkSat Dec 7 22:25:07 2013(r259082)
+++ head/share/mk/bsd.sys.mkSat Dec 7 22:30:07 2013(r259083)
@@ -73,7 +73,7 @@ CWARNFLAGS+= -Wno-empty-body -Wno-string
.endif # WARNS = 6
.if ${WARNS} = 3
CWARNFLAGS+= -Wno-tautological-compare -Wno-unused-value\
- -Wno-parentheses-equality -Wno-unused-function -Wno-conversion
+ -Wno-parentheses-equality -Wno-unused-function
-Wno-enum-conversion
.endif # WARNS = 3
.if ${WARNS} = 2
CWARNFLAGS+= -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter
___
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: r259016 - in head/sys: conf dev/drm2 dev/drm2/i915 dev/drm2/radeon dev/fb dev/vt kern modules/drm2/i915kms modules/drm2/radeonkms sparc64/sparc64 sys teken
On 05.12.13 23:38, Aleksandr Rybalko wrote: Author: ray Date: Thu Dec 5 22:38:53 2013 New Revision: 259016 URL: http://svnweb.freebsd.org/changeset/base/259016 Log: Merge VT(9) project (a.k.a. newcons). Reviewed by:nwhitehorn MFC_to_10_after:re approval Sponsored by: The FreeBSD Foundation Great! Thanks, gives a new look feel on the console :) Have it running on amd64/i386 and PowerMac(32/64-bit). The only thing I need to figure is the mapping of the AltGr or in Mac world, the alt key mapping. Iow, the third level mapping of the keys. e.g. the @ here is on altgr-2... Again, thanks! Andreas ___ 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: r259084 - in head/sys: fs/nfsclient nfsclient
Author: rmacklem
Date: Sat Dec 7 23:05:59 2013
New Revision: 259084
URL: http://svnweb.freebsd.org/changeset/base/259084
Log:
For software builds, the NFS client does many small
synchronous (with FILE_SYNC) writes because non-contiguous
byte ranges in the same buffer cache block are being
written. This patch adds a new mount option noncontigwr
which allows the non-contiguous byte ranges to be combined,
with the dirty byte range becoming the superset of the bytes
that are dirty, if the file has not been file locked.
This reduces the number of writes significantly for software
builds. The only case where this change might break existing
applications is where an application is writing
non-overlapping byte ranges within the same buffer cache block
of a file from multiple clients concurrently.
Since such an application would normally do file locking on
the file, avoiding the byte range merge for files that have
been file locked should be sufficient for most (maybe all?) cases.
Submitted by: jhb (earlier version)
Reviewed by: kib
MFC after:3 weeks
Modified:
head/sys/fs/nfsclient/nfs_clbio.c
head/sys/fs/nfsclient/nfs_clvfsops.c
head/sys/fs/nfsclient/nfs_clvnops.c
head/sys/fs/nfsclient/nfsnode.h
head/sys/nfsclient/nfsargs.h
Modified: head/sys/fs/nfsclient/nfs_clbio.c
==
--- head/sys/fs/nfsclient/nfs_clbio.c Sat Dec 7 22:30:07 2013
(r259083)
+++ head/sys/fs/nfsclient/nfs_clbio.c Sat Dec 7 23:05:59 2013
(r259084)
@@ -872,7 +872,7 @@ ncl_write(struct vop_write_args *ap)
struct vattr vattr;
struct nfsmount *nmp = VFSTONFS(vp-v_mount);
daddr_t lbn;
- int bcount;
+ int bcount, noncontig_write, obcount;
int bp_cached, n, on, error = 0, error1;
size_t orig_resid, local_resid;
off_t orig_size, tmp_off;
@@ -1035,7 +1035,15 @@ again:
* unaligned buffer size.
*/
mtx_lock(np-n_mtx);
- if (uio-uio_offset == np-n_size n) {
+ if ((np-n_flag NHASBEENLOCKED) == 0
+ (nmp-nm_flag NFSMNT_NONCONTIGWR) != 0)
+ noncontig_write = 1;
+ else
+ noncontig_write = 0;
+ if ((uio-uio_offset == np-n_size ||
+ (noncontig_write != 0
+ lbn == (np-n_size / biosize)
+ uio-uio_offset + n np-n_size)) n) {
mtx_unlock(np-n_mtx);
/*
* Get the buffer (in its pre-append state to maintain
@@ -1043,8 +1051,8 @@ again:
* nfsnode after we have locked the buffer to prevent
* readers from reading garbage.
*/
- bcount = on;
- bp = nfs_getcacheblk(vp, lbn, bcount, td);
+ obcount = np-n_size - (lbn * biosize);
+ bp = nfs_getcacheblk(vp, lbn, obcount, td);
if (bp != NULL) {
long save;
@@ -1056,9 +1064,12 @@ again:
mtx_unlock(np-n_mtx);
save = bp-b_flags B_CACHE;
- bcount += n;
+ bcount = on + n;
allocbuf(bp, bcount);
bp-b_flags |= save;
+ if (noncontig_write != 0 on obcount)
+ vfs_bio_bzero_buf(bp, obcount, on -
+ obcount);
}
} else {
/*
@@ -1157,19 +1168,23 @@ again:
* area, just update the b_dirtyoff and b_dirtyend,
* otherwise force a write rpc of the old dirty area.
*
+* If there has been a file lock applied to this file
+* or vfs.nfs.old_noncontig_writing is set, do the following:
* While it is possible to merge discontiguous writes due to
* our having a B_CACHE buffer ( and thus valid read data
* for the hole), we don't because it could lead to
* significant cache coherency problems with multiple clients,
* especially if locking is implemented later on.
*
-* As an optimization we could theoretically maintain
-* a linked list of discontinuous areas, but we would still
-* have to commit them separately so there isn't much
-* advantage to it except perhaps a bit of asynchronization.
+* If vfs.nfs.old_noncontig_writing is not set and there has
+* not been file locking done on this file:
+
svn commit: r259085 - in head/sys/amd64/vmm: . intel io
Author: neel
Date: Sat Dec 7 23:11:12 2013
New Revision: 259085
URL: http://svnweb.freebsd.org/changeset/base/259085
Log:
Use callout(9) to drive the vlapic timer instead of clocking it on each VM
exit.
This decouples the guest's 'hz' from the host's 'hz' setting. For e.g. it is
now possible to have a guest run at 'hz=1000' while the host is at 'hz=100'.
Discussed with: grehan@
Tested by:Tycho Nightingale (tycho.nighting...@pluribusnetworks.com)
Modified:
head/sys/amd64/vmm/intel/vmx.c
head/sys/amd64/vmm/io/vlapic.c
head/sys/amd64/vmm/io/vlapic.h
head/sys/amd64/vmm/vmm.c
head/sys/amd64/vmm/vmm_lapic.c
head/sys/amd64/vmm/vmm_lapic.h
Modified: head/sys/amd64/vmm/intel/vmx.c
==
--- head/sys/amd64/vmm/intel/vmx.c Sat Dec 7 23:05:59 2013
(r259084)
+++ head/sys/amd64/vmm/intel/vmx.c Sat Dec 7 23:11:12 2013
(r259085)
@@ -1563,7 +1563,6 @@ vmx_run(void *arg, int vcpu, register_t
panic(vmx_run: error %d setting up pcpu defaults, error);
do {
- lapic_timer_tick(vmx-vm, vcpu);
vmx_inject_interrupts(vmx, vcpu);
vmx_run_trace(vmx, vcpu);
rc = vmx_setjmp(vmxctx);
Modified: head/sys/amd64/vmm/io/vlapic.c
==
--- head/sys/amd64/vmm/io/vlapic.c Sat Dec 7 23:05:59 2013
(r259084)
+++ head/sys/amd64/vmm/io/vlapic.c Sat Dec 7 23:11:12 2013
(r259085)
@@ -30,8 +30,10 @@
__FBSDID($FreeBSD$);
#include sys/param.h
+#include sys/lock.h
#include sys/kernel.h
#include sys/malloc.h
+#include sys/mutex.h
#include sys/systm.h
#include sys/smp.h
@@ -103,12 +105,15 @@ struct vlapic {
struct vm *vm;
int vcpuid;
- struct LAPIC apic;
+ struct LAPICapic;
int esr_update;
- int divisor;
- int ccr_ticks;
+ struct callout callout;/* vlapic timer */
+ struct bintime timer_fire_bt; /* callout expiry time */
+ struct bintime timer_freq_bt; /* timer frequency */
+ struct bintime timer_period_bt; /* timer period */
+ struct mtx timer_mtx;
/*
* The 'isrvec_stk' is a stack of vectors injected by the local apic.
@@ -123,6 +128,21 @@ struct vlapic {
enum boot_state boot_state;
};
+/*
+ * The 'vlapic-timer_mtx' is used to provide mutual exclusion between the
+ * vlapic_callout_handler() and vcpu accesses to the following registers:
+ * - initial count register aka icr_timer
+ * - current count register aka ccr_timer
+ * - divide config register aka dcr_timer
+ * - timer LVT register
+ *
+ * Note that the vlapic_callout_handler() does not write to any of these
+ * registers so they can be safely read from the vcpu context without locking.
+ */
+#defineVLAPIC_TIMER_LOCK(vlapic) mtx_lock(((vlapic)-timer_mtx))
+#defineVLAPIC_TIMER_UNLOCK(vlapic)
mtx_unlock(((vlapic)-timer_mtx))
+#defineVLAPIC_TIMER_LOCKED(vlapic)
mtx_owned(((vlapic)-timer_mtx))
+
#define VLAPIC_BUS_FREQtsc_freq
static int
@@ -170,11 +190,62 @@ vlapic_dump_lvt(uint32_t offset, uint32_
}
#endif
-static uint64_t
+static uint32_t
vlapic_get_ccr(struct vlapic *vlapic)
{
- struct LAPIC*lapic = vlapic-apic;
- return lapic-ccr_timer;
+ struct bintime bt_now, bt_rem;
+ struct LAPIC *lapic;
+ uint32_t ccr;
+
+ ccr = 0;
+ lapic = vlapic-apic;
+
+ VLAPIC_TIMER_LOCK(vlapic);
+ if (callout_active(vlapic-callout)) {
+ /*
+* If the timer is scheduled to expire in the future then
+* compute the value of 'ccr' based on the remaining time.
+*/
+ binuptime(bt_now);
+ if (bintime_cmp(vlapic-timer_fire_bt, bt_now, )) {
+ bt_rem = vlapic-timer_fire_bt;
+ bintime_sub(bt_rem, bt_now);
+ ccr += bt_rem.sec * BT2FREQ(vlapic-timer_freq_bt);
+ ccr += bt_rem.frac / vlapic-timer_freq_bt.frac;
+ }
+ }
+ KASSERT(ccr = lapic-icr_timer, (vlapic_get_ccr: invalid ccr %#x,
+ icr_timer is %#x, ccr, lapic-icr_timer));
+ VLAPIC_CTR2(vlapic, vlapic ccr_timer = %#x, icr_timer = %#x,
+ ccr, lapic-icr_timer);
+ VLAPIC_TIMER_UNLOCK(vlapic);
+ return (ccr);
+}
+
+static void
+vlapic_set_dcr(struct vlapic *vlapic, uint32_t dcr)
+{
+ struct LAPIC *lapic;
+ int divisor;
+
+ lapic = vlapic-apic;
+ VLAPIC_TIMER_LOCK(vlapic);
+
+ lapic-dcr_timer = dcr;
+ divisor = vlapic_timer_divisor(dcr);
+ VLAPIC_CTR2(vlapic, vlapic dcr_timer=%#x,
Re: svn commit: r259016 - in head/sys: conf dev/drm2 dev/drm2/i915 dev/drm2/radeon dev/fb dev/vt kern modules/drm2/i915kms modules/drm2/radeonkms sparc64/sparc64 sys teken
Andreas Tobler andre...@freebsd.org написав(ла): On 05.12.13 23:38, Aleksandr Rybalko wrote: Author: ray Date: Thu Dec 5 22:38:53 2013 New Revision: 259016 URL: http://svnweb.freebsd.org/changeset/base/259016 Log: Merge VT(9) project (a.k.a. newcons). Reviewed by: nwhitehorn MFC_to_10_after: re approval Sponsored by: The FreeBSD Foundation Great! Thanks, gives a new look feel on the console :) Have it running on amd64/i386 and PowerMac(32/64-bit). The only thing I need to figure is the mapping of the AltGr or in Mac world, the alt key mapping. Iow, the third level mapping of the keys. e.g. the @ here is on altgr-2... Again, thanks! Andreas Hello Andreas, I'm glad to fix that, but I've to understand how it is should work :-) Thanks! WBW -- Aleksandr Rybalko r...@ddteam.net ___ 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: r259086 - in vendor/nvi/dist: cl common
Author: peter
Date: Sun Dec 8 00:04:25 2013
New Revision: 259086
URL: http://svnweb.freebsd.org/changeset/base/259086
Log:
Import nvi2 as of c80f493, including:
Fix cleanup multikey mappgs (FreeBSD bin/182463)
Modified:
vendor/nvi/dist/cl/cl_term.c
vendor/nvi/dist/common/key.c
vendor/nvi/dist/common/key.h
Modified: vendor/nvi/dist/cl/cl_term.c
==
--- vendor/nvi/dist/cl/cl_term.cSat Dec 7 23:11:12 2013
(r259085)
+++ vendor/nvi/dist/cl/cl_term.cSun Dec 8 00:04:25 2013
(r259086)
@@ -10,7 +10,7 @@
#include config.h
#ifndef lint
-static const char sccsid[] = $Id: cl_term.c,v 10.33 2012/04/21 23:51:46 zy
Exp $;
+static const char sccsid[] = $Id: cl_term.c,v 10.34 2013/12/07 16:21:14
wjenkner Exp $;
#endif /* not lint */
#include sys/types.h
@@ -187,14 +187,18 @@ cl_term_init(SCR *sp)
int
cl_term_end(GS *gp)
{
- SEQ *qp, *nqp;
+ SEQ *qp, *nqp, *pre_qp = NULL;
/* Delete screen specific mappings. */
SLIST_FOREACH_SAFE(qp, gp-seqq, q, nqp)
if (F_ISSET(qp, SEQ_SCREEN)) {
- SLIST_REMOVE_HEAD(gp-seqq, q);
+ if (qp == SLIST_FIRST(gp-seqq))
+ SLIST_REMOVE_HEAD(gp-seqq, q);
+ else
+ SLIST_REMOVE_AFTER(pre_qp, q);
(void)seq_free(qp);
- }
+ } else
+ pre_qp = qp;
return (0);
}
Modified: vendor/nvi/dist/common/key.c
==
--- vendor/nvi/dist/common/key.cSat Dec 7 23:11:12 2013
(r259085)
+++ vendor/nvi/dist/common/key.cSun Dec 8 00:04:25 2013
(r259086)
@@ -10,7 +10,7 @@
#include config.h
#ifndef lint
-static const char sccsid[] = $Id: key.c,v 10.53 2013/03/11 01:20:53 yamt Exp
$;
+static const char sccsid[] = $Id: key.c,v 10.54 2013/11/13 12:15:27 zy Exp $;
#endif /* not lint */
#include sys/types.h
@@ -272,7 +272,7 @@ v_key_name(
* The code prints non-printable wide characters in 4 or 5 digits
* Unicode escape sequences, so only supports plane 0 to 15.
*/
- if (ISPRINT(ach))
+ if (CAN_PRINT(sp, ach))
goto done;
nopr: if (iscntrl(ch) (ch 0x20 || ch == 0x7f)) {
sp-cname[0] = '^';
Modified: vendor/nvi/dist/common/key.h
==
--- vendor/nvi/dist/common/key.hSat Dec 7 23:11:12 2013
(r259085)
+++ vendor/nvi/dist/common/key.hSun Dec 8 00:04:25 2013
(r259086)
@@ -6,7 +6,7 @@
*
* See the LICENSE file for redistribution information.
*
- * $Id: key.h,v 10.55 2012/10/07 01:31:17 zy Exp $
+ * $Id: key.h,v 10.56 2013/11/13 12:15:27 zy Exp $
*/
#include multibyte.h
@@ -23,8 +23,9 @@
#define INPUT2INT5(sp,cw,n,nlen,w,wlen)
\
sp-conv.input2int(sp, n, nlen, (cw), wlen, w)
#define CONST
+#define INTISWIDE(c)(wctob(c) == EOF)
#define CHAR_WIDTH(sp, ch) wcwidth(ch)
-#define INTISWIDE(c) (wctob(c) == EOF)
+#define CAN_PRINT(sp, ch) (CHAR_WIDTH(sp, ch) 0)
#else
#define FILE2INT5(sp,buf,n,nlen,w,wlen) \
(w = n, wlen = nlen, 0)
@@ -36,9 +37,10 @@
(n = w, nlen = wlen, 0)
#define INPUT2INT5(sp,buf,n,nlen,w,wlen) \
(w = n, wlen = nlen, 0)
-#define CONST const
-#define INTISWIDE(c) 0
+#define CONST const
+#define INTISWIDE(c)0
#define CHAR_WIDTH(sp, ch) 1
+#define CAN_PRINT(sp, ch) isprint(ch)
#endif
#define FILE2INT(sp,n,nlen,w,wlen) \
FILE2INT5(sp,sp-cw,n,nlen,w,wlen)
___
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: r259087 - vendor/nvi/2.1.2-c80f493b0382d3c
Author: peter Date: Sun Dec 8 00:05:31 2013 New Revision: 259087 URL: http://svnweb.freebsd.org/changeset/base/259087 Log: Tag nvi2 import 2.1.2-c80f493b0382d3c Added: vendor/nvi/2.1.2-c80f493b0382d3c/ - copied from r259086, vendor/nvi/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: r259088 - in head/contrib/nvi: cl common
Author: peter
Date: Sun Dec 8 00:08:03 2013
New Revision: 259088
URL: http://svnweb.freebsd.org/changeset/base/259088
Log:
Vendor import nvi-2.1.2-c80f493b038 a multikey mapping fix
PR: bin/182463
Modified:
head/contrib/nvi/cl/cl_term.c
head/contrib/nvi/common/key.c
head/contrib/nvi/common/key.h
Directory Properties:
head/contrib/nvi/ (props changed)
Modified: head/contrib/nvi/cl/cl_term.c
==
--- head/contrib/nvi/cl/cl_term.c Sun Dec 8 00:05:31 2013
(r259087)
+++ head/contrib/nvi/cl/cl_term.c Sun Dec 8 00:08:03 2013
(r259088)
@@ -10,7 +10,7 @@
#include config.h
#ifndef lint
-static const char sccsid[] = $Id: cl_term.c,v 10.33 2012/04/21 23:51:46 zy
Exp $;
+static const char sccsid[] = $Id: cl_term.c,v 10.34 2013/12/07 16:21:14
wjenkner Exp $;
#endif /* not lint */
#include sys/types.h
@@ -187,14 +187,18 @@ cl_term_init(SCR *sp)
int
cl_term_end(GS *gp)
{
- SEQ *qp, *nqp;
+ SEQ *qp, *nqp, *pre_qp = NULL;
/* Delete screen specific mappings. */
SLIST_FOREACH_SAFE(qp, gp-seqq, q, nqp)
if (F_ISSET(qp, SEQ_SCREEN)) {
- SLIST_REMOVE_HEAD(gp-seqq, q);
+ if (qp == SLIST_FIRST(gp-seqq))
+ SLIST_REMOVE_HEAD(gp-seqq, q);
+ else
+ SLIST_REMOVE_AFTER(pre_qp, q);
(void)seq_free(qp);
- }
+ } else
+ pre_qp = qp;
return (0);
}
Modified: head/contrib/nvi/common/key.c
==
--- head/contrib/nvi/common/key.c Sun Dec 8 00:05:31 2013
(r259087)
+++ head/contrib/nvi/common/key.c Sun Dec 8 00:08:03 2013
(r259088)
@@ -10,7 +10,7 @@
#include config.h
#ifndef lint
-static const char sccsid[] = $Id: key.c,v 10.53 2013/03/11 01:20:53 yamt Exp
$;
+static const char sccsid[] = $Id: key.c,v 10.54 2013/11/13 12:15:27 zy Exp $;
#endif /* not lint */
#include sys/types.h
@@ -272,7 +272,7 @@ v_key_name(
* The code prints non-printable wide characters in 4 or 5 digits
* Unicode escape sequences, so only supports plane 0 to 15.
*/
- if (ISPRINT(ach))
+ if (CAN_PRINT(sp, ach))
goto done;
nopr: if (iscntrl(ch) (ch 0x20 || ch == 0x7f)) {
sp-cname[0] = '^';
Modified: head/contrib/nvi/common/key.h
==
--- head/contrib/nvi/common/key.h Sun Dec 8 00:05:31 2013
(r259087)
+++ head/contrib/nvi/common/key.h Sun Dec 8 00:08:03 2013
(r259088)
@@ -6,7 +6,7 @@
*
* See the LICENSE file for redistribution information.
*
- * $Id: key.h,v 10.55 2012/10/07 01:31:17 zy Exp $
+ * $Id: key.h,v 10.56 2013/11/13 12:15:27 zy Exp $
*/
#include multibyte.h
@@ -23,8 +23,9 @@
#define INPUT2INT5(sp,cw,n,nlen,w,wlen)
\
sp-conv.input2int(sp, n, nlen, (cw), wlen, w)
#define CONST
+#define INTISWIDE(c)(wctob(c) == EOF)
#define CHAR_WIDTH(sp, ch) wcwidth(ch)
-#define INTISWIDE(c) (wctob(c) == EOF)
+#define CAN_PRINT(sp, ch) (CHAR_WIDTH(sp, ch) 0)
#else
#define FILE2INT5(sp,buf,n,nlen,w,wlen) \
(w = n, wlen = nlen, 0)
@@ -36,9 +37,10 @@
(n = w, nlen = wlen, 0)
#define INPUT2INT5(sp,buf,n,nlen,w,wlen) \
(w = n, wlen = nlen, 0)
-#define CONST const
-#define INTISWIDE(c) 0
+#define CONST const
+#define INTISWIDE(c)0
#define CHAR_WIDTH(sp, ch) 1
+#define CAN_PRINT(sp, ch) isprint(ch)
#endif
#define FILE2INT(sp,n,nlen,w,wlen) \
FILE2INT5(sp,sp-cw,n,nlen,w,wlen)
___
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: r259071 - head/sys/conf
Konstantin Belousov kostik...@gmail.com написав(ла): On Sat, Dec 07, 2013 at 03:24:43PM +, Aleksandr Rybalko wrote: Author: ray Date: Sat Dec 7 15:24:43 2013 New Revision: 259071 URL: http://svnweb.freebsd.org/changeset/base/259071 Log: Include dev/fb/fb_if.m in build always, without it kms modules complain about lack of fb_getinfo_desc symbol. Submitted by: dumbbell Sponsored by: The FreeBSD Foundation Modified: head/sys/conf/files Modified: head/sys/conf/files == --- head/sys/conf/files Sat Dec 7 13:11:50 2013(r259070) +++ head/sys/conf/files Sat Dec 7 15:24:43 2013(r259071) @@ -1397,7 +1397,7 @@ dev/ex/if_ex_pccard.c optional ex pccar dev/exca/exca.c optional cbb dev/fatm/if_fatm.c optional fatm pci dev/fb/fbd.coptional fbd | vt -dev/fb/fb_if.m optional fbd | vt +dev/fb/fb_if.m standard dev/fb/splash.c optional splash dev/fdt/fdt_common.coptional fdt dev/fdt/fdt_ic_if.m optional fdt As a tangentially related, I noted that logo_freebsd.c is compiled in unconditional. Is it required, can it be made an option ? Also, is it possible to make the mouse cursor an option, same as it was in syscons with SC_NO_CUTPASTE ? Hi Konstantin, Yeah, no problem for both questions. Working on that. Thanks a lot! WBW -- Aleksandr Rybalko r...@ddteam.net ___ 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: r259089 - head/sbin/mount_nfs
Author: rmacklem Date: Sun Dec 8 00:59:04 2013 New Revision: 259089 URL: http://svnweb.freebsd.org/changeset/base/259089 Log: Document the noncontigwr NFS mount option. This is a content change. MFC after:3 weeks Modified: head/sbin/mount_nfs/mount_nfs.8 Modified: head/sbin/mount_nfs/mount_nfs.8 == --- head/sbin/mount_nfs/mount_nfs.8 Sun Dec 8 00:08:03 2013 (r259088) +++ head/sbin/mount_nfs/mount_nfs.8 Sun Dec 8 00:59:04 2013 (r259089) @@ -28,7 +28,7 @@ .\@(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\ $FreeBSD$ .\ -.Dd July 8, 2013 +.Dd December 7, 2013 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -257,6 +257,19 @@ servers on the client. Note that this option will only be honored when performing the initial mount, it will be silently ignored if used while updating the mount options. +.It Cm noncontigwr +This mount option allows the NFS client to +combine non-contiguous byte ranges being written +such that the dirty byte range becomes a superset of the bytes +that are dirty. +This reduces the number of writes significantly for software +builds. +The merging of byte ranges isn't done if the file has been file +locked, since most applications modifying a file from multiple +clients will use file locking. +As such, this option could result in a corrupted file for the +rare case of an application modifying the file from multiple +clients concurrently without using file locking. .It Cm principal For the RPCSEC_GSS security flavors, such as krb5, krb5i and krb5p, this option sets the name of the host based principal name expected ___ 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: r259090 - stable/9/sys/arm/conf
Author: imp Date: Sun Dec 8 02:48:06 2013 New Revision: 259090 URL: http://svnweb.freebsd.org/changeset/base/259090 Log: 4096 is 4MB, and macb doesn't even come close to working, so don't say it is an altenative. It hasn't worked in quite some time. The die hards can still try to use macb in the tree if they want... Modified: stable/9/sys/arm/conf/SAM9G20EK Modified: stable/9/sys/arm/conf/SAM9G20EK == --- stable/9/sys/arm/conf/SAM9G20EK Sun Dec 8 00:59:04 2013 (r259089) +++ stable/9/sys/arm/conf/SAM9G20EK Sun Dec 8 02:48:06 2013 (r259090) @@ -37,18 +37,18 @@ options FFS #Berkeley Fast Filesystem #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 3MB ram disk +#options MD_ROOT_SIZE=4096 #4MB ram disk optionsNFSCL #New Network Filesystem Client -#options NFSD#New Network Filesystem Server -#options NFSLOCKD#Network Lock Manager -#options NFS_ROOT#NFS usable as /, requires NFSCL -#options BOOTP_NFSROOT -#options BOOTP -#options BOOTP_NFSV3 -#options BOOTP_WIRED_TO=ate0 -#options BOOTP_COMPAT +optionsNFSD#New Network Filesystem Server +optionsNFSLOCKD#Network Lock Manager +optionsNFS_ROOT#NFS usable as /, requires NFSCL +optionsBOOTP_NFSROOT +optionsBOOTP +optionsBOOTP_NFSV3 +optionsBOOTP_WIRED_TO=ate0 +optionsBOOTP_COMPAT -optionsROOTDEVNAME=\ufs:/dev/mmcsd0s1a\ +#options ROOTDEVNAME=\ufs:/dev/mmcsd0s1a\ optionsALT_BREAK_TO_DEBUGGER @@ -86,7 +86,6 @@ deviceuart# Serial Ports # Ethernet device ate # Ethernet Driver -#devicemacb# Alternate Ethernet driver device mii option AT91_ATE_USE_RMII ___ 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: r259092 - in head/contrib/gcc: . cp doc
Author: pfg
Date: Sun Dec 8 03:02:44 2013
New Revision: 259092
URL: http://svnweb.freebsd.org/changeset/base/259092
Log:
gcc: new fvisibility-ms-compat option
Obtained from:gcc 4.3 (rev. 126088; GPLv2)
MFC after:3 weeks
Modified:
head/contrib/gcc/ChangeLog.gcc43
head/contrib/gcc/c.opt
head/contrib/gcc/cp/ChangeLog.gcc43
head/contrib/gcc/cp/decl.c
head/contrib/gcc/cp/decl2.c
head/contrib/gcc/doc/invoke.texi
Modified: head/contrib/gcc/ChangeLog.gcc43
==
--- head/contrib/gcc/ChangeLog.gcc43Sun Dec 8 02:48:10 2013
(r259091)
+++ head/contrib/gcc/ChangeLog.gcc43Sun Dec 8 03:02:44 2013
(r259092)
@@ -45,6 +45,12 @@
* flags.h (force_align_functions_log): Delete.
* toplev.c (force_align_functions_log): Delete.
+2007-06-28 Geoffrey Keating geo...@apple.com (r126088)
+
+ * doc/invoke.texi (C++ Dialect Options): Document
+ fvisibility-ms-compat.
+ * c.opt (fvisibility-ms-compat): New.
+
2007-06-05 Joerg Wunsch j@uriah.heep.sax.de (r125346)
PR preprocessor/23479
Modified: head/contrib/gcc/c.opt
==
--- head/contrib/gcc/c.opt Sun Dec 8 02:48:10 2013(r259091)
+++ head/contrib/gcc/c.opt Sun Dec 8 03:02:44 2013(r259092)
@@ -741,6 +741,10 @@ fvisibility-inlines-hidden
C++ ObjC++
Marks all inlined methods as having hidden visibility
+fvisibility-ms-compat
+C++ ObjC++ Var(flag_visibility_ms_compat)
+Changes visibility to match Microsoft Visual Studio by default
+
fvtable-gc
C++ ObjC++
Discard unused virtual functions
Modified: head/contrib/gcc/cp/ChangeLog.gcc43
==
--- head/contrib/gcc/cp/ChangeLog.gcc43 Sun Dec 8 02:48:10 2013
(r259091)
+++ head/contrib/gcc/cp/ChangeLog.gcc43 Sun Dec 8 03:02:44 2013
(r259092)
@@ -7,6 +7,13 @@
* typeck.c (cxx_alignof_expr): When alignof is used on a plain
FUNCTION_DECL, return its alignment.
+2007-06-28 Geoffrey Keating geo...@apple.com (r126088)
+
+ * decl2.c (determine_visibility): Implement
+ flag_visibility_ms_compat effect on type info.
+ * decl.c (cxx_init_decl_processing): Implement
+ global effect of flag_visibility_ms_compat.
+
2007-06-28 Geoffrey Keating geo...@apple.com (r126080)
* decl2.c (start_objects): Mark constructor-runnning function
Modified: head/contrib/gcc/cp/decl.c
==
--- head/contrib/gcc/cp/decl.c Sun Dec 8 02:48:10 2013(r259091)
+++ head/contrib/gcc/cp/decl.c Sun Dec 8 03:02:44 2013(r259092)
@@ -3157,6 +3157,9 @@ cxx_init_decl_processing (void)
}
if (flag_inline_functions)
flag_inline_trees = 2;
+
+ if (flag_visibility_ms_compat)
+ default_visibility = VISIBILITY_HIDDEN;
/* Initially, C. */
current_lang_name = lang_name_c;
Modified: head/contrib/gcc/cp/decl2.c
==
--- head/contrib/gcc/cp/decl2.c Sun Dec 8 02:48:10 2013(r259091)
+++ head/contrib/gcc/cp/decl2.c Sun Dec 8 03:02:44 2013(r259092)
@@ -1726,6 +1726,19 @@ determine_visibility (tree decl)
but have no TEMPLATE_INFO, so don't try to check it. */
use_template = 0;
}
+ else if (TREE_CODE (decl) == VAR_DECL DECL_TINFO_P (decl)
+ flag_visibility_ms_compat)
+ {
+ /* Under -fvisibility-ms-compat, types are visible by default,
+even though their contents aren't. */
+ tree underlying_type = TREE_TYPE (DECL_NAME (decl));
+ int underlying_vis = type_visibility (underlying_type);
+ if (underlying_vis == VISIBILITY_ANON
+ || CLASSTYPE_VISIBILITY_SPECIFIED (underlying_type))
+ constrain_visibility (decl, underlying_vis);
+ else
+ DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT;
+ }
else if (TREE_CODE (decl) == VAR_DECL DECL_TINFO_P (decl))
{
/* tinfo visibility is based on the type it's for. */
Modified: head/contrib/gcc/doc/invoke.texi
==
--- head/contrib/gcc/doc/invoke.texiSun Dec 8 02:48:10 2013
(r259091)
+++ head/contrib/gcc/doc/invoke.texiSun Dec 8 03:02:44 2013
(r259092)
@@ -186,6 +186,7 @@ in the following sections.
-frepo -fno-rtti -fstats -ftemplate-depth-@var{n} @gol
-fno-threadsafe-statics -fuse-cxa-atexit -fno-weak -nostdinc++ @gol
-fno-default-inline -fvisibility-inlines-hidden @gol
+-fvisibility-ms-compat @gol
-Wabi -Wctor-dtor-privacy @gol
-Wnon-virtual-dtor -Wreorder @gol
-Weffc++ -Wno-deprecated -Wstrict-null-sentinel @gol
@@ -1626,6 +1627,40 @@ Explicitly
svn commit: r259093 - stable/9/sys/arm/arm
Author: imp
Date: Sun Dec 8 03:49:45 2013
New Revision: 259093
URL: http://svnweb.freebsd.org/changeset/base/259093
Log:
MFC:
r246881 | ian | 2013-02-16 13:43:16 -0700 (Sat, 16 Feb 2013) | 4 lines
In _bus_dmamap_addseg(), the return value must be zero for error, or the size
actually added to the segment (possibly smaller than the requested size if
boundary crossings had to be avoided).
This fixes NFS root on Atmel platforms, and likely others.
Modified:
stable/9/sys/arm/arm/busdma_machdep.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/sys/ (props changed)
Modified: stable/9/sys/arm/arm/busdma_machdep.c
==
--- stable/9/sys/arm/arm/busdma_machdep.c Sun Dec 8 03:02:44 2013
(r259092)
+++ stable/9/sys/arm/arm/busdma_machdep.c Sun Dec 8 03:49:45 2013
(r259093)
@@ -913,7 +913,7 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, b
dr = _bus_dma_inrange(dmat-ranges, dmat-_nranges,
curaddr);
if (dr == NULL)
- return (EINVAL);
+ return (0);
/*
* In a valid DMA range. Translate the physical
* memory address to an address in the DMA window.
@@ -935,12 +935,12 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, b
segs[seg].ds_len += sgsize;
} else {
if (++seg = dmat-nsegments)
- return (EFBIG);
+ return (0);
segs[seg].ds_addr = curaddr;
segs[seg].ds_len = sgsize;
}
*segp = seg;
- return (0);
+ return (sgsize);
}
/*
___
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: r259094 - head/etc/rc.d
Author: peter
Date: Sun Dec 8 05:55:55 2013
New Revision: 259094
URL: http://svnweb.freebsd.org/changeset/base/259094
Log:
Rev 256256 had an undocumented side effect of breaking existing behavior
for ipv6 jails.
Among the harmful side effects included putting a route to an entire /64
onto an interface even if you were in a smaller network - eg: /80.
This broke the freebsd.org cluster hosted at ISC which has /80 networks.
Modified:
head/etc/rc.d/jail
Modified: head/etc/rc.d/jail
==
--- head/etc/rc.d/jail Sun Dec 8 03:49:45 2013(r259093)
+++ head/etc/rc.d/jail Sun Dec 8 05:55:55 2013(r259094)
@@ -319,8 +319,8 @@ jail_extract_address()
_mask=${_mask:-/32}
elif [ ${_type} = inet6 ]; then
- # In case _maske is not set for IPv6, use /64.
- _mask=${_mask:-/64}
+ # In case _maske is not set for IPv6, use /128.
+ _mask=${_mask:-/128}
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: r259095 - head/sys/dev/usb/controller
Author: hselasky Date: Sun Dec 8 06:52:22 2013 New Revision: 259095 URL: http://svnweb.freebsd.org/changeset/base/259095 Log: Fix typos. Found by: remko Modified: head/sys/dev/usb/controller/usb_controller.c Modified: head/sys/dev/usb/controller/usb_controller.c == --- head/sys/dev/usb/controller/usb_controller.cSun Dec 8 05:55:55 2013(r259094) +++ head/sys/dev/usb/controller/usb_controller.cSun Dec 8 06:52:22 2013(r259095) @@ -441,7 +441,7 @@ usb_bus_detach(struct usb_proc_msg *pm) /** * usb_bus_suspend * - * This function is used to suspend the USB contoller. + * This function is used to suspend the USB controller. **/ static void usb_bus_suspend(struct usb_proc_msg *pm) @@ -498,7 +498,7 @@ usb_bus_suspend(struct usb_proc_msg *pm) /** * usb_bus_resume * - * This function is used to resume the USB contoller. + * This function is used to resume the USB controller. **/ static void usb_bus_resume(struct usb_proc_msg *pm) @@ -561,7 +561,7 @@ usb_bus_resume(struct usb_proc_msg *pm) /** * usb_bus_reset * - * This function is used to reset the USB contoller. + * This function is used to reset the USB controller. **/ static void usb_bus_reset(struct usb_proc_msg *pm) @@ -583,7 +583,7 @@ usb_bus_reset(struct usb_proc_msg *pm) /** * usb_bus_shutdown * - * This function is used to shutdown the USB contoller. + * This function is used to shutdown the USB controller. **/ static void usb_bus_shutdown(struct usb_proc_msg *pm) ___ 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
