Re: bin/125185: csh(1) exit on signal 11
Synopsis: csh(1) exit on signal 11 State-Changed-From-To: open->closed State-Changed-By: jh State-Changed-When: Thu Nov 24 16:22:21 UTC 2011 State-Changed-Why: Incorporated into bin/129405. http://www.freebsd.org/cgi/query-pr.cgi?pr=125185 ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/138622: [cam] CAMIOCOMMAND ioctl failed: Inappropriate ioctl for device
Synopsis: [cam] CAMIOCOMMAND ioctl failed: Inappropriate ioctl for device State-Changed-From-To: open->feedback State-Changed-By: jh State-Changed-When: Thu Nov 24 19:35:18 UTC 2011 State-Changed-Why: Can you still reproduce this on recent FreeBSD versions? http://www.freebsd.org/cgi/query-pr.cgi?pr=138622 ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/138288: [radeon] RADEON(0): No valid MMIO address [regression]
Synopsis: [radeon] RADEON(0): No valid MMIO address [regression] State-Changed-From-To: open->feedback State-Changed-By: jh State-Changed-When: Thu Nov 24 19:36:16 UTC 2011 State-Changed-Why: Is this still a problem on recent FreeBSD versions? http://www.freebsd.org/cgi/query-pr.cgi?pr=138288 ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/142083: [vfs] buffer overflow in vfs_mountroot_try (sys/kern/vfs_mount.c)
Synopsis: [vfs] buffer overflow in vfs_mountroot_try (sys/kern/vfs_mount.c) State-Changed-From-To: open->feedback State-Changed-By: jh State-Changed-When: Thu Nov 24 19:54:36 UTC 2011 State-Changed-Why: Is this still a problem after r214006? As far as I can see the code in question has been removed in r214006. http://www.freebsd.org/cgi/query-pr.cgi?pr=142083 ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/137361: [panic] FreeBSD panics with random intervals
Synopsis: [panic] FreeBSD panics with random intervals State-Changed-From-To: open->feedback State-Changed-By: jh State-Changed-When: Thu Nov 24 19:57:40 UTC 2011 State-Changed-Why: Is this still a problem for you? Could this be a hardware problem? http://www.freebsd.org/cgi/query-pr.cgi?pr=137361 ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/131448: Bad display while booting
Synopsis: Bad display while booting State-Changed-From-To: open->feedback State-Changed-By: jh State-Changed-When: Thu Nov 24 19:59:30 UTC 2011 State-Changed-Why: Can you still reproduce this on recent FreeBSD versions? http://www.freebsd.org/cgi/query-pr.cgi?pr=131448 ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/161257: commit references a PR
The following reply was made to PR bin/161257; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: bin/161257: commit references a PR Date: Thu, 24 Nov 2011 20:54:15 + (UTC) Author: trociny Date: Thu Nov 24 20:54:06 2011 New Revision: 227956 URL: http://svn.freebsd.org/changeset/base/227956 Log: usr.bin/procstat Add -l flag to display resource limits. PR: bin/161257 Reviewed by: kib MFC after: 2 weeks Added: head/usr.bin/procstat/procstat_rlimit.c (contents, props changed) Modified: head/usr.bin/procstat/Makefile head/usr.bin/procstat/procstat.1 head/usr.bin/procstat/procstat.c head/usr.bin/procstat/procstat.h Modified: head/usr.bin/procstat/Makefile == --- head/usr.bin/procstat/Makefile Thu Nov 24 20:43:37 2011 (r227955) +++ head/usr.bin/procstat/Makefile Thu Nov 24 20:54:06 2011 (r227956) @@ -10,6 +10,7 @@ SRCS=procstat.c \ procstat_cred.c \ procstat_files.c\ procstat_kstack.c \ + procstat_rlimit.c \ procstat_sigs.c \ procstat_threads.c \ procstat_vm.c Modified: head/usr.bin/procstat/procstat.1 == --- head/usr.bin/procstat/procstat.1 Thu Nov 24 20:43:37 2011 (r227955) +++ head/usr.bin/procstat/procstat.1 Thu Nov 24 20:54:06 2011 (r227956) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 22, 2011 +.Dd November 24, 2011 .Dt PROCSTAT 1 .Os .Sh NAME @@ -69,6 +69,8 @@ Display the stacks of kernel threads in threads currently running on a CPU and threads with stacks swapped to disk. If the flag is repeated, function offsets as well as function names are printed. +.It Fl l +Display resource limits for the process. .It Fl s Display security credential information for the process. .It Fl t Modified: head/usr.bin/procstat/procstat.c == --- head/usr.bin/procstat/procstat.c Thu Nov 24 20:43:37 2011 (r227955) +++ head/usr.bin/procstat/procstat.c Thu Nov 24 20:54:06 2011 (r227956) @@ -39,8 +39,8 @@ #include "procstat.h" -static int aflag, bflag, cflag, eflag, fflag, iflag, jflag, kflag, sflag, tflag; -static int vflag, xflag; +static int aflag, bflag, cflag, eflag, fflag, iflag, jflag, kflag, lflag, sflag; +static int tflag, vflag, xflag; int hflag, nflag, Cflag; static void @@ -50,7 +50,7 @@ usage(void) fprintf(stderr, "usage: procstat [-h] [-C] [-M core] [-N system] " "[-w interval] \n"); fprintf(stderr, "[-b | -c | -e | -f | -i | -j | -k | " - "-s | -t | -v | -x] [-a | pid ...]\n"); + "-l | -s | -t | -v | -x] [-a | pid ...]\n"); exit(EX_USAGE); } @@ -72,6 +72,8 @@ procstat(struct procstat *prstat, struct procstat_threads_sigs(prstat, kipp); else if (kflag) procstat_kstack(kipp, kflag); + else if (lflag) + procstat_rlimit(kipp); else if (sflag) procstat_cred(kipp); else if (tflag) @@ -123,7 +125,7 @@ main(int argc, char *argv[]) interval = 0; memf = nlistf = NULL; - while ((ch = getopt(argc, argv, "CN:M:abcefijkhstvw:x")) != -1) { + while ((ch = getopt(argc, argv, "CN:M:abcefijklhstvw:x")) != -1) { switch (ch) { case 'C': Cflag++; @@ -167,6 +169,10 @@ main(int argc, char *argv[]) kflag++; break; + case 'l': + lflag++; + break; + case 'n': nflag++; break; @@ -210,8 +216,8 @@ main(int argc, char *argv[]) argv += optind; /* We require that either 0 or 1 mode flags be set. */ - tmp = bflag + cflag + eflag + fflag + (kflag ? 1 : 0) + sflag + tflag + - vflag + xflag; + tmp = bflag + cflag + eflag + fflag + (kflag ? 1 : 0) + lflag + sflag + + tflag + vflag + xflag; if (!(tmp == 0 || tmp == 1)) usage(); Modified: head/usr.bin/procstat/procstat.h == --- head/usr.bin/procstat/procstat.h Thu Nov 24 20:43:37 2011 (r227955) +++ head/usr.bin/procstat/procstat.h Thu Nov 24 20:54:06 2011 (r227956) @@ -42,6 +42,7 @@ void procstat_cred(struct kinfo_proc *ki void procstat_env(struct kinfo_proc *kipp); void procstat_files(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_kstack(struct kinfo_proc *
kern/162859: [acpi] ACPI battery/acline monitoring partialy working (switching)
>Number: 162859 >Category: kern >Synopsis: [acpi] ACPI battery/acline monitoring partialy working >(switching) >Confidential: no >Severity: serious >Priority: medium >Responsible:freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Nov 24 21:50:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Maciej Suszko >Release:9.0-PRERELEASE >Organization: >Environment: FreeBSD arsenic.lan 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #0 r227939: Thu Nov 24 21:27:32 CET 2011 r...@arsenic.lan:/usr/obj/usr/src/sys/GENERIC amd64 >Description: This problem is similar to kern/160838, but in my case - acpiconf -i batt show all the information (AC adapter connected): tlhscd@arsenic:~ $ sysctl hw.acpi.acline hw.acpi.acline: 1 tlhscd@arsenic:~ $ acpiconf -i batt Design capacity:4241 mAh Last full capacity: 4241 mAh Technology: secondary (rechargeable) Design voltage: 14400 mV Capacity (warn):213 mAh Capacity (low): 43 mAh Low/warn granularity: 100 mAh Warn/full granularity: 100 mAh Model number: Primary Serial number: 11436 2010/03/05 Type: LIon OEM info: Hewlett-Packard State: charging Remaining capacity: 99% Remaining time: unknown Present rate: 341 mA (5703 mW) Present voltage:16727 mV After disconnecting AC adapter, acpiconf shows the battery is discharging, but remaining capacity, time and rates does not change: tlhscd@arsenic:~ $ sysctl hw.acpi.acline hw.acpi.acline: 0 tlhscd@arsenic:~ $ acpiconf -i batt Design capacity:4240 mAh Last full capacity: 4240 mAh Technology: secondary (rechargeable) Design voltage: 14400 mV Capacity (warn):212 mAh Capacity (low): 43 mAh Low/warn granularity: 100 mAh Warn/full granularity: 100 mAh Model number: Primary Serial number: 11436 2010/03/05 Type: LIon OEM info: Hewlett-Packard State: discharging Remaining capacity: 100% Remaining time: 1:13 Present rate: 3450 mA (57756 mW) Present voltage:16741 mV Reconnecting AC adapter back does not change computer state - acpiconf shows the same message, hw.acpi.acline is still 0. >How-To-Repeat: Boot machine with AC adapter connected, login to system, disconnect and reconnect AC adapter. The above is observed on HP nx7300 laptop with those settings in rc.conf: performance_cx_lowest="HIGH" economy_cx_lowest="LOW" Setting debug.acpi.max_tasks as temporary fix like in kern/160838 does not work for me. As far as I remember - in 8.2-STABLE all worked as expected. >Fix: >Release-Note: >Audit-Trail: >Unformatted: ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
misc/162860: Cannot share ZFS filesystem to hosts with a hyphen in hostname
>Number: 162860 >Category: misc >Synopsis: Cannot share ZFS filesystem to hosts with a hyphen in hostname >Confidential: no >Severity: non-critical >Priority: low >Responsible:freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Nov 24 22:00:23 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sascha Frey >Release:9.0-RC2 >Organization: Bielefeld University, Faculty of Technology >Environment: FreeBSD nibbler.TechFak.Uni-Bielefeld.DE 9.0-RC2 FreeBSD 9.0-RC2 #0: Sat Nov 12 18:35:25 UTC 2011 r...@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Sharing a ZFS filesystem over NFS to hosts with a hyphen (-) in their hostnames using 'zfs set sharenfs' does not work. 'zfs get sharenfs' does return the correct string as set before, but in /etc/zfs/exports the hyphen in the hostname was replaced with a blank. >How-To-Repeat: # zfs set sharenfs="-maproot=root foo-bar" systempool/export/test # zfs get sharenfs systempool/export/test NAME PROPERTY VALUESOURCE systempool/export/test sharenfs -maproot=root foo-bar local # cat /etc/zfs/exports [...] /export/test -maproot=root foo bar >Fix: >Release-Note: >Audit-Trail: >Unformatted: ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/162806: ifconfig(8): ifconfig alias NOT work correctly
Synopsis: ifconfig(8): ifconfig alias NOT work correctly Responsible-Changed-From-To: freebsd-bugs->glebius Responsible-Changed-By: glebius Responsible-Changed-When: Thu Nov 24 22:23:21 UTC 2011 Responsible-Changed-Why: Looks like my fault. http://www.freebsd.org/cgi/query-pr.cgi?pr=162806 ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/162859: [acpi] ACPI battery/acline monitoring partialy working (switching)
The following reply was made to PR kern/162859; it has been noted by GNATS. From: Oliver Pinter To: Maciej Suszko Cc: freebsd-gnats-sub...@freebsd.org Subject: Re: kern/162859: [acpi] ACPI battery/acline monitoring partialy working (switching) Date: Thu, 24 Nov 2011 23:14:04 +0100 Same situation here, my laptop is HP ProBook 5310m. On 11/24/11, Maciej Suszko wrote: > >>Number: 162859 >>Category: kern >>Synopsis: [acpi] ACPI battery/acline monitoring partialy working >> (switching) >>Confidential: no >>Severity: serious >>Priority: medium >>Responsible:freebsd-bugs >>State: open >>Quarter: >>Keywords: >>Date-Required: >>Class: sw-bug >>Submitter-Id: current-users >>Arrival-Date: Thu Nov 24 21:50:08 UTC 2011 >>Closed-Date: >>Last-Modified: >>Originator: Maciej Suszko >>Release:9.0-PRERELEASE >>Organization: >>Environment: > FreeBSD arsenic.lan 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #0 r227939: Thu > Nov 24 21:27:32 CET 2011 r...@arsenic.lan:/usr/obj/usr/src/sys/GENERIC > amd64 >>Description: > This problem is similar to kern/160838, but in my case - acpiconf -i batt > show all the information (AC adapter connected): > > tlhscd@arsenic:~ $ sysctl hw.acpi.acline > hw.acpi.acline: 1 > > tlhscd@arsenic:~ $ acpiconf -i batt > Design capacity:4241 mAh > Last full capacity: 4241 mAh > Technology: secondary (rechargeable) > Design voltage: 14400 mV > Capacity (warn):213 mAh > Capacity (low): 43 mAh > Low/warn granularity: 100 mAh > Warn/full granularity: 100 mAh > Model number: Primary > Serial number: 11436 2010/03/05 > Type: LIon > OEM info: Hewlett-Packard > State: charging > Remaining capacity: 99% > Remaining time: unknown > Present rate: 341 mA (5703 mW) > Present voltage:16727 mV > > After disconnecting AC adapter, acpiconf shows the battery is discharging, > but remaining capacity, time and rates does not change: > > tlhscd@arsenic:~ $ sysctl hw.acpi.acline > hw.acpi.acline: 0 > > tlhscd@arsenic:~ $ acpiconf -i batt > Design capacity:4240 mAh > Last full capacity: 4240 mAh > Technology: secondary (rechargeable) > Design voltage: 14400 mV > Capacity (warn):212 mAh > Capacity (low): 43 mAh > Low/warn granularity: 100 mAh > Warn/full granularity: 100 mAh > Model number: Primary > Serial number: 11436 2010/03/05 > Type: LIon > OEM info: Hewlett-Packard > State: discharging > Remaining capacity: 100% > Remaining time: 1:13 > Present rate: 3450 mA (57756 mW) > Present voltage:16741 mV > > Reconnecting AC adapter back does not change computer state - acpiconf shows > the same message, hw.acpi.acline is still 0. >>How-To-Repeat: > Boot machine with AC adapter connected, login to system, disconnect and > reconnect AC adapter. > > The above is observed on HP nx7300 laptop with those settings in rc.conf: > performance_cx_lowest="HIGH" > economy_cx_lowest="LOW" > > Setting debug.acpi.max_tasks as temporary fix like in kern/160838 does not > work for me. > > As far as I remember - in 8.2-STABLE all worked as expected. >>Fix: > > >>Release-Note: >>Audit-Trail: >>Unformatted: > ___ > freebsd-bugs@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-bugs > To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org" > ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
misc/162866: extract revision from hg.
>Number: 162866 >Category: misc >Synopsis: extract revision from hg. >Confidential: no >Severity: non-critical >Priority: low >Responsible:freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 25 05:30:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KOIE Hidetaka >Release:10.0-CURRENT >Organization: Surigiken >Environment: FreeBSD guriandgura 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r227876+c95877008e9f,hgver,npowerd,zfs_cv_init: Thu Nov 24 21:41:32 JST 2011 koie@guriandgura:/usr/obj/usr/src/sys/GURIANDGURA amd64 >Description: I'm using hgsubversion that is a subversion client on mercurial(hg). This patch is to extract hg-revision, svn-revision, and applied MQ patches. This patch includes some minor bugfixs: - echo "$svnversion" is removed. (it is a debug code?) - hg/git are not used when svnversion command exists and /usr/src is not managed by subvresion. >How-To-Repeat: >Fix: Patch attached with submission follows: # HG changeset patch # Parent c95877008e9f997df652a3ae91c51487f18dfaa0 diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -87,19 +87,22 @@ v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date` i=`${MAKE:-make} -V KERN_IDENT` -for dir in /bin /usr/bin /usr/local/bin; do - if [ -x "${dir}/svnversion" ] ; then - svnversion=${dir}/svnversion - break - fi - if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then - git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git" - break - fi -done +get_path() { + local name op + op="$1"; shift + name="$1"; shift + for dir in "$@"; do + if [ "$op" "$dir/$name" ]; then + echo "$dir/$name" + return + fi + done +} +bin_path_list="/bin /usr/bin /usr/local/bin" + +svnversion=$(get_path -x svnversion $bin_path_list) if [ -n "$svnversion" ] ; then - echo "$svnversion" svn=`cd ${SYSDIR} && $svnversion` case "$svn" in [0-9]*) svn=" r${svn}" ;; @@ -107,6 +110,15 @@ esac fi +git_cmd=$(get_path -x git $bin_path_list) +if [ -n "$git_cmd" ]; then + git_dir=$(get_path -d .git "${SYSDIR}" "${SYSDIR}/..") + if [ -n "$git_dir" ]; then + git_cmd="${dir}/git --git-dir=$git_dir" + else + unset git_cmd + fi +fi if [ -n "$git_cmd" ] ; then git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null` svn=`$git_cmd svn find-rev $git 2>/dev/null` @@ -129,10 +141,47 @@ fi fi +hg_cmd=$(get_path -x hg $bin_path_list) +if [ -n "$hg_cmd" ]; then + hg_repo=$(cd ${SYSDIR} && $hg_cmd root 2>/dev/null) + if [ -n "$hg_repo" ]; then + hg_cmd="$hg_cmd --repository ${hg_repo}" + else + unset hg_cmd + fi +fi +if [ -n "$hg_cmd" ] ; then + if [ -n "$($hg_cmd status --modified ${SYSDIR})" ]; then + hg_mod="-dirty" + fi + + if [ -d "${hg_repo}/.hg/patches" ]; then + for I in $($hg_cmd qapplied 2>/dev/null); do + hg_patches="${hg_patches},${I}" + done + fi + + if [ -n "${hg_patches}" ]; then + hg_opt="-rqbase" + else + hg_opt="" + fi + revs=$($hg_cmd parent $hg_opt --template '{node|short}\t{svnrev}\n') + hg_rev=$(echo "$revs" | cut -f 1) + svn_rev=$(echo "$revs" | cut -f 2) + if [ -n "${svn_rev}" ]; then + svn=" r${svn_rev}" + else + svn=" " + fi + + hg="+${hg_rev}${hg_mod}${hg_patches}" +fi + cat << EOF > vers.c $COPYRIGHT -#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}" -#define VERSTR "${VERSION} #${v}${svn}${git}: ${t}\\n${u}@${h}:${d}\\n" +#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${hg}: ${t}" +#define VERSTR "${VERSION} #${v}${svn}${git}${hg}: ${t}\\n ${u}@${h}:${d}\\n" #define RELSTR "${RELEASE}" char sccs[sizeof(SCCSSTR) > 128 ? sizeof(SCCSSTR) : 128] = SCCSSTR; >Release-Note: >Audit-Trail: >Unformatted: ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
kern/162867: better zfs_cv_init
>Number: 162867 >Category: kern >Synopsis: better zfs_cv_init >Confidential: no >Severity: non-critical >Priority: low >Responsible:freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 25 06:00:25 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KOIE Hidetaka >Release:10.0-CURRENT >Organization: Surigiken >Environment: FreeBSD guriandgura 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r227876+c95877008e9f,hgver,npowerd,zfs_cv_init: Thu Nov 24 21:41:32 JST 2011 koie@guriandgura:/usr/obj/usr/src/sys/GURIANDGURA amd64 >Description: condition variables in ZFS are too long to view with ps(1)/top(1). This patch is to set a last member. >How-To-Repeat: >Fix: Patch attached with submission follows: # HG changeset patch # Parent eb7e7f3e356ee376809b5b7819155c8c0d142ad3 diff --git a/sys/cddl/compat/opensolaris/sys/kcondvar.h b/sys/cddl/compat/opensolaris/sys/kcondvar.h --- a/sys/cddl/compat/opensolaris/sys/kcondvar.h +++ b/sys/cddl/compat/opensolaris/sys/kcondvar.h @@ -44,18 +44,21 @@ CV_DRIVER } kcv_type_t; -#definezfs_cv_init(cv, name, type, arg)do { \ - const char *_name; \ - ASSERT((type) == CV_DEFAULT); \ - for (_name = #cv; *_name != '\0'; _name++) {\ - if (*_name >= 'a' && *_name <= 'z') \ +#define zfs_cv_init(cv, name, type, arg) do {\ + ASSERT(type == CV_DEFAULT); \ + const char *n = name; \ + const char *e; \ + for (e = n; *e != '\0'; e++)\ + ; \ + const char *s; \ + for (s = e; n < s; s--) { \ + char c = s[-1]; \ + if (c == '>' || c == '.' || c == '&') \ break; \ } \ - if (*_name == '\0') \ - _name = #cv;\ - cv_init((cv), _name); \ + cv_init(cv, s); \ } while (0) -#definecv_init(cv, name, type, arg)zfs_cv_init((cv), (name), (type), (arg)) +#definecv_init(cv, name, type, arg)zfs_cv_init((cv), #cv, (type), (arg)) #endif /* _KERNEL */ >Release-Note: >Audit-Trail: >Unformatted: ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"