Re: svn commit: r185356 - head/sys/dev/ixgbe
On Thu, 27 Nov 2008, [utf-8] Dag-Erling Sm??rgrav wrote:
M. Warner Losh [EMAIL PROTECTED] writes:
I personally really dislike the style (and yes, I know all the
arguments for it). If you really want something that complex inside a
block to need block scoped variables, then that really argues for a
function oft times...
There is one particular situation where it is very convenient:
int
foo(struct sockaddr *sa)
{
switch (s-sa_family) {
case AF_INET: {
struct sockaddr_in *sin = (struct sockaddr_in *)sa;
/* ... */
break;
}
Switch statements are 1 case (the only case?) where the braces needed for
non-C99 declarations don't require extra indentation. However, indent(1)
doesn't understand this and mangles the above to:
int
foo(struct sockaddr *sa)
{
switch (s-sa_family) {
case AF_INET:{
struct sockaddr_in *sin = (struct sockaddr_in *)sa;
/* ... */
break;
}
indent(1) has fixed a style bug in the above (the missing blank line after
the declarations) but it has introduced 2 (the missing space before {
and the unwanted indentation). Fixing the other style bug in the above
(the initialization in the declaration) is beyond the scope of indent(1).
gindent-2.2.9 -npro gives the same style bugs and 1 more (it misformats
the comment to a block one, but that may be due to a bad default).
Bruce___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185381 - head/sys/conf
Author: bz Date: Fri Nov 28 12:23:02 2008 New Revision: 185381 URL: http://svn.freebsd.org/changeset/base/185381 Log: Add a reference to hwpmc_core.c most likely missed in r185363 to try to unbreak universe (untested). Modified: head/sys/conf/files.pc98 Modified: head/sys/conf/files.pc98 == --- head/sys/conf/files.pc98Fri Nov 28 00:48:05 2008(r185380) +++ head/sys/conf/files.pc98Fri Nov 28 12:23:02 2008(r185381) @@ -111,6 +111,7 @@ dev/fb/fb.c optional fb | gdc dev/fe/if_fe_cbus.coptional fe isa dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_intel.coptional hwpmc +dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_pentium.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_ppro.c optional hwpmc ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185400 - head/usr.bin/netstat
Author: gnn
Date: Fri Nov 28 18:35:14 2008
New Revision: 185400
URL: http://svn.freebsd.org/changeset/base/185400
Log:
Fix a printing problem when using the -L flag to netstat caused
by adding the -x flag earlier.
Submitted by: Anton Yuzhaninov
MFC after:3 days
Modified:
head/usr.bin/netstat/inet.c
Modified: head/usr.bin/netstat/inet.c
==
--- head/usr.bin/netstat/inet.c Fri Nov 28 17:17:54 2008(r185399)
+++ head/usr.bin/netstat/inet.c Fri Nov 28 18:35:14 2008(r185400)
@@ -407,19 +407,22 @@ protopr(u_long off, const char *name, in
if (Lflag)
printf(%-5.5s %-14.14s %-22.22s\n,
Proto, Listen, Local Address);
- printf((Aflag !Wflag) ?
- %-5.5s %-6.6s %-6.6s %-18.18s %-18.18s :
- %-5.5s %-6.6s %-6.6s %-22.22s %-22.22s,
- Proto, Recv-Q, Send-Q,
- Local Address, Foreign Address);
- if (xflag)
- printf(%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s
%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %s\n,
- R-MBUF, S-MBUF, R-CLUS, S-CLUS,
- R-HIWA, S-HIWA, R-LOWA, S-LOWA,
- R-BCNT, S-BCNT, R-BMAX, S-BMAX,
- (state));
- else
- printf((state)\n);
+ else {
+ printf((Aflag !Wflag) ?
+ %-5.5s %-6.6s %-6.6s %-18.18s
%-18.18s :
+ %-5.5s %-6.6s %-6.6s %-22.22s
%-22.22s,
+ Proto, Recv-Q, Send-Q,
+ Local Address, Foreign Address);
+ if (xflag)
+ printf(%-6.6s %-6.6s %-6.6s %-6.6s
%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %s\n,
+ R-MBUF, S-MBUF, R-CLUS,
+ S-CLUS, R-HIWA, S-HIWA,
+ R-LOWA, S-LOWA, R-BCNT,
+ S-BCNT, R-BMAX, S-BMAX,
+ (state));
+ else
+ printf((state)\n);
+ }
first = 0;
}
if (Lflag so-so_qlimit == 0)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185401 - head/bin/sh
Author: stefanf
Date: Fri Nov 28 18:55:42 2008
New Revision: 185401
URL: http://svn.freebsd.org/changeset/base/185401
Log:
Report error messages of the builtins 'type' and 'command -V' to stderr
instead
of stdout.
Noticed by: Zajcev Evgeny
Modified:
head/bin/sh/exec.c
Modified: head/bin/sh/exec.c
==
--- head/bin/sh/exec.c Fri Nov 28 18:35:14 2008(r185400)
+++ head/bin/sh/exec.c Fri Nov 28 18:55:42 2008(r185401)
@@ -728,9 +728,6 @@ typecmd_impl(int argc, char **argv, int
extern char *const parsekwd[];
for (i = 1; i argc; i++) {
- if (cmd != TYPECMD_SMALLV)
- out1str(argv[i]);
-
/* First look at the keywords */
for (pp = (char **)parsekwd; *pp; pp++)
if (**pp == *argv[i] equal(*pp, argv[i]))
@@ -740,7 +737,7 @@ typecmd_impl(int argc, char **argv, int
if (cmd == TYPECMD_SMALLV)
out1fmt(%s\n, argv[i]);
else
- out1str( is a shell keyword\n);
+ out1fmt(%s is a shell keyword\n, argv[i]);
continue;
}
@@ -749,7 +746,8 @@ typecmd_impl(int argc, char **argv, int
if (cmd == TYPECMD_SMALLV)
out1fmt(alias %s='%s'\n, argv[i], ap-val);
else
- out1fmt( is an alias for %s\n, ap-val);
+ out1fmt(%s is an alias for %s\n, argv[i],
+ ap-val);
continue;
}
@@ -775,7 +773,7 @@ typecmd_impl(int argc, char **argv, int
if (cmd == TYPECMD_SMALLV)
out1fmt(%s\n, name);
else
- out1fmt( is%s %s\n,
+ out1fmt(%s is%s %s\n, argv[i],
(cmdp cmd == TYPECMD_TYPE) ?
a tracked alias for : ,
name);
@@ -784,11 +782,12 @@ typecmd_impl(int argc, char **argv, int
if (cmd == TYPECMD_SMALLV)
out1fmt(%s\n, argv[i]);
else
- out1fmt( is %s\n, argv[i]);
+ out1fmt(%s is %s\n, argv[i],
+ argv[i]);
} else {
if (cmd != TYPECMD_SMALLV)
- out1fmt(: %s\n,
- strerror(errno));
+ outfmt(out2, %s: %s\n,
+ argv[i], strerror(errno));
error |= 127;
}
}
@@ -798,19 +797,19 @@ typecmd_impl(int argc, char **argv, int
if (cmd == TYPECMD_SMALLV)
out1fmt(%s\n, argv[i]);
else
- out1str( is a shell function\n);
+ out1fmt(%s is a shell function\n, argv[i]);
break;
case CMDBUILTIN:
if (cmd == TYPECMD_SMALLV)
out1fmt(%s\n, argv[i]);
else
- out1str( is a shell builtin\n);
+ out1fmt(%s is a shell builtin\n, argv[i]);
break;
default:
if (cmd != TYPECMD_SMALLV)
- out1str(: not found\n);
+ outfmt(out2, %s: not found\n, argv[i]);
error |= 127;
break;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185402 - head/tools/regression/bin/sh/builtins
Author: stefanf Date: Fri Nov 28 18:59:04 2008 New Revision: 185402 URL: http://svn.freebsd.org/changeset/base/185402 Log: Update for 185401, errors now go to stderr. Added: head/tools/regression/bin/sh/builtins/type1.0.stderr (props changed) - copied unchanged from r181018, head/tools/regression/bin/sh/builtins/type1.0.stdout Deleted: head/tools/regression/bin/sh/builtins/type1.0.stdout Copied: head/tools/regression/bin/sh/builtins/type1.0.stderr (from r181018, head/tools/regression/bin/sh/builtins/type1.0.stdout) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/builtins/type1.0.stderrFri Nov 28 18:59:04 2008(r185402, copy of r181018, head/tools/regression/bin/sh/builtins/type1.0.stdout) @@ -0,0 +1,4 @@ +not-here: not found +/not-here: No such file or directory +not-here: not found +/not-here: No such file or directory ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185403 - head
Author: imp Date: Fri Nov 28 19:21:10 2008 New Revision: 185403 URL: http://svn.freebsd.org/changeset/base/185403 Log: Add missing 'THE'. This was discussed with core@ in the larger context of making this text match the OSL text, but the changes that OSL silently made to the license to approve it haven't been brought back yet. Still working on that issue. We likely should start using the UTF-8 copyright symbol (What copy; expands to in HTML), but I'm not 100% confident in my ability to tell Emacs to save it like that. And I haven't gotten approval for that change. Approved by: core@ Modified: head/COPYRIGHT Modified: head/COPYRIGHT == --- head/COPYRIGHT Fri Nov 28 18:59:04 2008(r185402) +++ head/COPYRIGHT Fri Nov 28 19:21:10 2008(r185403) @@ -15,10 +15,10 @@ are met: notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185405 - head/share/misc
Author: maxim Date: Fri Nov 28 19:35:48 2008 New Revision: 185405 URL: http://svn.freebsd.org/changeset/base/185405 Log: o FreeBSD 6.4-RELEASE added. Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree == --- head/share/misc/bsd-family-tree Fri Nov 28 19:23:46 2008 (r185404) +++ head/share/misc/bsd-family-tree Fri Nov 28 19:35:48 2008 (r185405) @@ -217,12 +217,13 @@ FreeBSD 5.2 | | | | | | OpenBSD 4.2 | | | | NetBSD 4.0 | | | FreeBSD 6.3| | | | - || | | | - *--FreeBSD | | |DragonFly 1.12.0 - |7.0 | | | | - | | | | OpenBSD 4.3 | - | V | | |DragonFly 2.0.0 - || | OpenBSD 4.4 | + |\ | | | | + *--FreeBSD| | | |DragonFly 1.12.0 + |7.0 | | | | | + | | | | | OpenBSD 4.3 | + | V | | | |DragonFly 2.0.0 + | FreeBSD | | OpenBSD 4.4 | + |6.4 | | | | || | | | FreeBSD 8 -current| NetBSD -current OpenBSD -current | || | | | @@ -488,6 +489,7 @@ FreeBSD 7.0 2008-02-27 [FBD] OpenBSD 4.32008-05-01 [OBD] DragonFly 2.0.02008-07-21 [DFB] OpenBSD 4.42008-11-01 [OBD] +FreeBSD 6.42008-11-28 [FBD] Bibliography ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185408 - in stable/7/lib/libarchive: . test
Author: kientzle
Date: Fri Nov 28 20:08:47 2008
New Revision: 185408
URL: http://svn.freebsd.org/changeset/base/185408
Log:
MFC 182590,182778,182779,184109: Support for certain
archive_entry attributes to be explicitly unset.
This fixes a number of issues:
* Zip archives with length at end can now be
extracted correctly, since the Zip extractor
can simply mark the size as unknown.
* Extract-to-disk can now accurately handle
cases with partial time information (e.g.,
mtime is known but not atime)
* We get more accurate handling of different
hardlink extraction cases; sometimes a hardlink
entry has definitive size information and sometimes
not.
Approved by: re
Modified:
stable/7/lib/libarchive/ (props changed)
stable/7/lib/libarchive/archive_entry.c
stable/7/lib/libarchive/archive_entry.h
stable/7/lib/libarchive/archive_entry_private.h
stable/7/lib/libarchive/archive_read_support_format_zip.c
stable/7/lib/libarchive/archive_write_disk.c
stable/7/lib/libarchive/test/test_entry.c
stable/7/lib/libarchive/test/test_read_format_zip.c
stable/7/lib/libarchive/test/test_read_format_zip.zip.uu
stable/7/lib/libarchive/test/test_write_disk.c
stable/7/lib/libarchive/test/test_write_disk_hardlink.c
Modified: stable/7/lib/libarchive/archive_entry.c
==
--- stable/7/lib/libarchive/archive_entry.c Fri Nov 28 19:58:31 2008
(r185407)
+++ stable/7/lib/libarchive/archive_entry.c Fri Nov 28 20:08:47 2008
(r185408)
@@ -395,8 +395,7 @@ archive_entry_clone(struct archive_entry
aes_copy(entry2-ae_hardlink, entry-ae_hardlink);
aes_copy(entry2-ae_pathname, entry-ae_pathname);
aes_copy(entry2-ae_symlink, entry-ae_symlink);
- entry2-ae_hardlinkset = entry-ae_hardlinkset;
- entry2-ae_symlinkset = entry-ae_symlinkset;
+ entry2-ae_set = entry-ae_set;
aes_copy(entry2-ae_uname, entry-ae_uname);
/* Copy ACL data over. */
@@ -455,12 +454,24 @@ archive_entry_atime_nsec(struct archive_
return (entry-ae_stat.aest_atime_nsec);
}
+int
+archive_entry_atime_is_set(struct archive_entry *entry)
+{
+ return (entry-ae_set AE_SET_ATIME);
+}
+
time_t
archive_entry_ctime(struct archive_entry *entry)
{
return (entry-ae_stat.aest_ctime);
}
+int
+archive_entry_ctime_is_set(struct archive_entry *entry)
+{
+ return (entry-ae_set AE_SET_CTIME);
+}
+
long
archive_entry_ctime_nsec(struct archive_entry *entry)
{
@@ -562,17 +573,17 @@ archive_entry_gname_w(struct archive_ent
const char *
archive_entry_hardlink(struct archive_entry *entry)
{
- if (!entry-ae_hardlinkset)
- return (NULL);
- return (aes_get_mbs(entry-ae_hardlink));
+ if (entry-ae_set AE_SET_HARDLINK)
+ return (aes_get_mbs(entry-ae_hardlink));
+ return (NULL);
}
const wchar_t *
archive_entry_hardlink_w(struct archive_entry *entry)
{
- if (!entry-ae_hardlinkset)
- return (NULL);
- return (aes_get_wcs(entry-ae_hardlink));
+ if (entry-ae_set AE_SET_HARDLINK)
+ return (aes_get_wcs(entry-ae_hardlink));
+ return (NULL);
}
ino_t
@@ -599,6 +610,12 @@ archive_entry_mtime_nsec(struct archive_
return (entry-ae_stat.aest_mtime_nsec);
}
+int
+archive_entry_mtime_is_set(struct archive_entry *entry)
+{
+ return (entry-ae_set AE_SET_MTIME);
+}
+
unsigned int
archive_entry_nlink(struct archive_entry *entry)
{
@@ -651,6 +668,12 @@ archive_entry_size(struct archive_entry
return (entry-ae_stat.aest_size);
}
+int
+archive_entry_size_is_set(struct archive_entry *entry)
+{
+ return (entry-ae_set AE_SET_SIZE);
+}
+
const char *
archive_entry_sourcepath(struct archive_entry *entry)
{
@@ -660,17 +683,17 @@ archive_entry_sourcepath(struct archive_
const char *
archive_entry_symlink(struct archive_entry *entry)
{
- if (!entry-ae_symlinkset)
- return (NULL);
- return (aes_get_mbs(entry-ae_symlink));
+ if (entry-ae_set AE_SET_SYMLINK)
+ return (aes_get_mbs(entry-ae_symlink));
+ return (NULL);
}
const wchar_t *
archive_entry_symlink_w(struct archive_entry *entry)
{
- if (!entry-ae_symlinkset)
- return (NULL);
- return (aes_get_wcs(entry-ae_symlink));
+ if (entry-ae_set AE_SET_SYMLINK)
+ return (aes_get_wcs(entry-ae_symlink));
+ return (NULL);
}
uid_t
@@ -773,7 +796,9 @@ archive_entry_set_hardlink(struct archiv
{
aes_set_mbs(entry-ae_hardlink, target);
if (target != NULL)
- entry-ae_hardlinkset = 1;
+ entry-ae_set |= AE_SET_HARDLINK;
+ else
+ entry-ae_set = ~AE_SET_HARDLINK;
}
void
@@ -781,7 +806,9 @@ archive_entry_copy_hardlink(struct archi
{
aes_copy_mbs(entry-ae_hardlink, target);
if (target
svn commit: r185409 - in releng/7.1/lib/libarchive: . test
Author: kientzle
Date: Fri Nov 28 20:09:48 2008
New Revision: 185409
URL: http://svn.freebsd.org/changeset/base/185409
Log:
MFC 182590,182778,182779,184109: Support for certain
archive_entry attributes to be explicitly unset.
This fixes a number of issues:
* Zip archives with length at end can now be
extracted correctly, since the Zip extractor
can simply mark the size as unknown.
* Extract-to-disk can now accurately handle
cases with partial time information (e.g.,
mtime is known but not atime)
* We get more accurate handling of different
hardlink extraction cases; sometimes a hardlink
entry has definitive size information and sometimes
not.
Approved by: re
Modified:
releng/7.1/lib/libarchive/ (props changed)
releng/7.1/lib/libarchive/archive_entry.c
releng/7.1/lib/libarchive/archive_entry.h
releng/7.1/lib/libarchive/archive_entry_private.h
releng/7.1/lib/libarchive/archive_read_support_format_zip.c
releng/7.1/lib/libarchive/archive_write_disk.c
releng/7.1/lib/libarchive/test/test_entry.c
releng/7.1/lib/libarchive/test/test_read_format_zip.c
releng/7.1/lib/libarchive/test/test_read_format_zip.zip.uu
releng/7.1/lib/libarchive/test/test_write_disk.c
releng/7.1/lib/libarchive/test/test_write_disk_hardlink.c
Modified: releng/7.1/lib/libarchive/archive_entry.c
==
--- releng/7.1/lib/libarchive/archive_entry.c Fri Nov 28 20:08:47 2008
(r185408)
+++ releng/7.1/lib/libarchive/archive_entry.c Fri Nov 28 20:09:48 2008
(r185409)
@@ -395,8 +395,7 @@ archive_entry_clone(struct archive_entry
aes_copy(entry2-ae_hardlink, entry-ae_hardlink);
aes_copy(entry2-ae_pathname, entry-ae_pathname);
aes_copy(entry2-ae_symlink, entry-ae_symlink);
- entry2-ae_hardlinkset = entry-ae_hardlinkset;
- entry2-ae_symlinkset = entry-ae_symlinkset;
+ entry2-ae_set = entry-ae_set;
aes_copy(entry2-ae_uname, entry-ae_uname);
/* Copy ACL data over. */
@@ -455,12 +454,24 @@ archive_entry_atime_nsec(struct archive_
return (entry-ae_stat.aest_atime_nsec);
}
+int
+archive_entry_atime_is_set(struct archive_entry *entry)
+{
+ return (entry-ae_set AE_SET_ATIME);
+}
+
time_t
archive_entry_ctime(struct archive_entry *entry)
{
return (entry-ae_stat.aest_ctime);
}
+int
+archive_entry_ctime_is_set(struct archive_entry *entry)
+{
+ return (entry-ae_set AE_SET_CTIME);
+}
+
long
archive_entry_ctime_nsec(struct archive_entry *entry)
{
@@ -562,17 +573,17 @@ archive_entry_gname_w(struct archive_ent
const char *
archive_entry_hardlink(struct archive_entry *entry)
{
- if (!entry-ae_hardlinkset)
- return (NULL);
- return (aes_get_mbs(entry-ae_hardlink));
+ if (entry-ae_set AE_SET_HARDLINK)
+ return (aes_get_mbs(entry-ae_hardlink));
+ return (NULL);
}
const wchar_t *
archive_entry_hardlink_w(struct archive_entry *entry)
{
- if (!entry-ae_hardlinkset)
- return (NULL);
- return (aes_get_wcs(entry-ae_hardlink));
+ if (entry-ae_set AE_SET_HARDLINK)
+ return (aes_get_wcs(entry-ae_hardlink));
+ return (NULL);
}
ino_t
@@ -599,6 +610,12 @@ archive_entry_mtime_nsec(struct archive_
return (entry-ae_stat.aest_mtime_nsec);
}
+int
+archive_entry_mtime_is_set(struct archive_entry *entry)
+{
+ return (entry-ae_set AE_SET_MTIME);
+}
+
unsigned int
archive_entry_nlink(struct archive_entry *entry)
{
@@ -651,6 +668,12 @@ archive_entry_size(struct archive_entry
return (entry-ae_stat.aest_size);
}
+int
+archive_entry_size_is_set(struct archive_entry *entry)
+{
+ return (entry-ae_set AE_SET_SIZE);
+}
+
const char *
archive_entry_sourcepath(struct archive_entry *entry)
{
@@ -660,17 +683,17 @@ archive_entry_sourcepath(struct archive_
const char *
archive_entry_symlink(struct archive_entry *entry)
{
- if (!entry-ae_symlinkset)
- return (NULL);
- return (aes_get_mbs(entry-ae_symlink));
+ if (entry-ae_set AE_SET_SYMLINK)
+ return (aes_get_mbs(entry-ae_symlink));
+ return (NULL);
}
const wchar_t *
archive_entry_symlink_w(struct archive_entry *entry)
{
- if (!entry-ae_symlinkset)
- return (NULL);
- return (aes_get_wcs(entry-ae_symlink));
+ if (entry-ae_set AE_SET_SYMLINK)
+ return (aes_get_wcs(entry-ae_symlink));
+ return (NULL);
}
uid_t
@@ -773,7 +796,9 @@ archive_entry_set_hardlink(struct archiv
{
aes_set_mbs(entry-ae_hardlink, target);
if (target != NULL)
- entry-ae_hardlinkset = 1;
+ entry-ae_set |= AE_SET_HARDLINK;
+ else
+ entry-ae_set = ~AE_SET_HARDLINK;
}
void
@@ -781,7 +806,9 @@ archive_entry_copy_hardlink(struct archi
{
aes_copy_mbs(entry-ae_hardlink,
svn commit: r185411 - releng/7.1/usr.bin/tar
Author: kientzle
Date: Fri Nov 28 20:14:41 2008
New Revision: 185411
URL: http://svn.freebsd.org/changeset/base/185411
Log:
MFC r185359: Non-zero exit when directories disappear
during the filesystem traversal.
Tested by:David Wolfskill
Approved by: re
Modified:
releng/7.1/usr.bin/tar/ (props changed)
releng/7.1/usr.bin/tar/write.c
Modified: releng/7.1/usr.bin/tar/write.c
==
--- releng/7.1/usr.bin/tar/write.c Fri Nov 28 20:13:23 2008
(r185410)
+++ releng/7.1/usr.bin/tar/write.c Fri Nov 28 20:14:41 2008
(r185411)
@@ -659,8 +659,10 @@ write_hierarchy(struct bsdtar *bsdtar, s
const struct stat *st = NULL, *lst = NULL;
int descend;
- if (tree_ret == TREE_ERROR_DIR)
+ if (tree_ret == TREE_ERROR_DIR) {
bsdtar_warnc(bsdtar, errno, %s: Couldn't visit
directory, name);
+ bsdtar-return_value = 1;
+ }
if (tree_ret != TREE_REGULAR)
continue;
lst = tree_current_lstat(tree);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185414 - stable/6/sys/conf
Author: kensmith
Date: Fri Nov 28 22:06:31 2008
New Revision: 185414
URL: http://svn.freebsd.org/changeset/base/185414
Log:
6.4-RELEASE is done so shift stable/6 over to 6.4-STABLE.
Approved by: re (implicit)
Modified:
stable/6/sys/conf/newvers.sh
Modified: stable/6/sys/conf/newvers.sh
==
--- stable/6/sys/conf/newvers.shFri Nov 28 20:47:48 2008
(r185413)
+++ stable/6/sys/conf/newvers.shFri Nov 28 22:06:31 2008
(r185414)
@@ -32,7 +32,7 @@
TYPE=FreeBSD
REVISION=6.4
-BRANCH=PRERELEASE
+BRANCH=STABLE
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 [EMAIL PROTECTED]
svn commit: r185415 - svnadmin/conf
Author: kensmith Date: Fri Nov 28 22:10:15 2008 New Revision: 185415 URL: http://svn.freebsd.org/changeset/base/185415 Log: Open stable/6 to normal developer activity. I had originally planned to do that much sooner but wound up holding it this long because of the new world order with SVN. People are still getting used to needing to commit to releng/X.Y in the post-branch phase so we needed to be able to diff stable/6 against releng/6.4 to make sure people did that. Once people get a bit more accustomed to SVN we should be able to go back to opening up the stable/X branch sooner in the release cycle. Approved by: core (implicit) Modified: svnadmin/conf/approvers Modified: svnadmin/conf/approvers == --- svnadmin/conf/approvers Fri Nov 28 22:06:31 2008(r185414) +++ svnadmin/conf/approvers Fri Nov 28 22:10:15 2008(r185415) @@ -18,7 +18,7 @@ # #^head/re ^stable/7/ re -^stable/6/ re +#^stable/6/re ^releng/7.1/ re ^releng/7.0/ (security-officer|so) ^releng/6.4/ re ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185419 - in head/sys: contrib/ipfilter/netinet net netgraph netinet netinet6 netipsec sys
Author: zec
Date: Fri Nov 28 23:30:51 2008
New Revision: 185419
URL: http://svn.freebsd.org/changeset/base/185419
Log:
Unhide declarations of network stack virtualization structs from
underneath #ifdef VIMAGE blocks.
This change introduces some churn in #include ordering and nesting
throughout the network stack and drivers but is not expected to cause
any additional issues.
In the next step this will allow us to instantiate the virtualization
container structures and switch from using global variables to their
containerized counterparts.
Reviewed by: bz, julian
Approved by: julian (mentor)
Obtained from://depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
Modified:
head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
head/sys/contrib/ipfilter/netinet/mlfk_ipl.c
head/sys/net/vnet.h
head/sys/netgraph/netgraph.h
head/sys/netgraph/ng_base.c
head/sys/netgraph/ng_eiface.c
head/sys/netinet/in.c
head/sys/netinet/ip_id.c
head/sys/netinet/ip_input.c
head/sys/netinet/ip_var.h
head/sys/netinet/tcp_hostcache.c
head/sys/netinet/vinet.h
head/sys/netinet6/in6_ifattach.c
head/sys/netinet6/vinet6.h
head/sys/netipsec/keysock.c
head/sys/netipsec/keysock.h
head/sys/netipsec/vipsec.h
head/sys/sys/param.h
Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==
--- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Fri Nov 28 22:27:26
2008(r185418)
+++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Fri Nov 28 23:30:51
2008(r185419)
@@ -121,7 +121,7 @@ static const char rcsid[] = @(#)$Id: ip
#endif
extern int ip_optcopy __P((struct ip *, struct ip *));
-#if (__FreeBSD_version 46)
+#if (__FreeBSD_version 46) (__FreeBSD_version 800055)
extern int path_mtu_discovery;
#endif
Modified: head/sys/contrib/ipfilter/netinet/mlfk_ipl.c
==
--- head/sys/contrib/ipfilter/netinet/mlfk_ipl.cFri Nov 28 22:27:26
2008(r185418)
+++ head/sys/contrib/ipfilter/netinet/mlfk_ipl.cFri Nov 28 23:30:51
2008(r185419)
@@ -43,7 +43,9 @@ static int sysctl_ipf_int ( SYSCTL_HANDL
static int ipf_modload(void);
static int ipf_modunload(void);
+#if __FreeBSD_version 800055
SYSCTL_DECL(_net_inet);
+#endif
#define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \
ptr, val, sysctl_ipf_int, I, descr);
Modified: head/sys/net/vnet.h
==
--- head/sys/net/vnet.h Fri Nov 28 22:27:26 2008(r185418)
+++ head/sys/net/vnet.h Fri Nov 28 23:30:51 2008(r185419)
@@ -33,9 +33,10 @@
#ifndef _NET_VNET_H_
#define _NET_VNET_H_
-#ifdef VIMAGE
#include opt_route.h
+#include sys/param.h
+#include sys/systm.h
#include sys/proc.h
#include sys/protosw.h
#include sys/socket.h
@@ -66,8 +67,6 @@ struct vnet_net {
int _ether_ipfw;
};
-#endif
-
/*
* Symbol translation macros
*/
Modified: head/sys/netgraph/netgraph.h
==
--- head/sys/netgraph/netgraph.hFri Nov 28 22:27:26 2008
(r185418)
+++ head/sys/netgraph/netgraph.hFri Nov 28 23:30:51 2008
(r185419)
@@ -1186,6 +1186,7 @@ typedef void *meta_p;
/* Hash related definitions */
#defineNG_ID_HASH_SIZE 128 /* most systems wont need even this many */
+#defineNG_NAME_HASH_SIZE 128 /* most systems wont need even this many
*/
/* Virtualization macros */
#defineINIT_VNET_NETGRAPH(vnet) \
@@ -1194,6 +1195,16 @@ typedef void *meta_p;
#defineVNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym)
+struct vnet_netgraph {
+ LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE];
+ LIST_HEAD(, ng_node) _ng_name_hash[NG_NAME_HASH_SIZE];
+ LIST_HEAD(, ng_node) _ng_nodelist;
+ ng_ID_t _nextID;
+ struct unrhdr *_ng_iface_unit;
+ struct unrhdr *_ng_eiface_unit;
+ struct unrhdr *_ng_wormhole_unit;
+};
+
/* Symbol translation macros */
#defineV_nextIDVNET_NETGRAPH(nextID)
#defineV_ng_ID_hashVNET_NETGRAPH(ng_ID_hash)
Modified: head/sys/netgraph/ng_base.c
==
--- head/sys/netgraph/ng_base.c Fri Nov 28 22:27:26 2008(r185418)
+++ head/sys/netgraph/ng_base.c Fri Nov 28 23:30:51 2008(r185419)
@@ -183,7 +183,6 @@ static struct mtx ng_idhash_mtx;
} \
} while (0)
-#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many
svn commit: r185420 - head/sys/netinet
Author: zec
Date: Fri Nov 28 23:39:25 2008
New Revision: 185420
URL: http://svn.freebsd.org/changeset/base/185420
Log:
Add an essential .h file that skipped from the last commit (r185419).
Pointy hat #1 on...
Pointed out by: bz
Added:
head/sys/netinet/tcp_hostcache.h (contents, props changed)
Added: head/sys/netinet/tcp_hostcache.h
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/netinet/tcp_hostcache.hFri Nov 28 23:39:25 2008
(r185420)
@@ -0,0 +1,82 @@
+/*-
+ * Copyright (c) 2002 Andre Oppermann, Internet Business Solutions AG
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *products derived from this software without specific prior written
+ *permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Many thanks to jlemon for basic structure of tcp_syncache which is being
+ * followed here.
+ */
+
+#ifndef _NETINET_TCP_HOSTCACHE_H_
+#define _NETINET_TCP_HOSTCACHE_H_
+
+TAILQ_HEAD(hc_qhead, hc_metrics);
+
+struct hc_head {
+ struct hc_qhead hch_bucket;
+ u_int hch_length;
+ struct mtx hch_mtx;
+};
+
+struct hc_metrics {
+ /* housekeeping */
+ TAILQ_ENTRY(hc_metrics) rmx_q;
+ struct hc_head *rmx_head; /* head of bucket tail queue */
+ struct in_addr ip4;/* IP address */
+ struct in6_addr ip6; /* IP6 address */
+ /* endpoint specific values for tcp */
+ u_long rmx_mtu;/* MTU for this path */
+ u_long rmx_ssthresh; /* outbound gateway buffer limit */
+ u_long rmx_rtt;/* estimated round trip time */
+ u_long rmx_rttvar; /* estimated rtt variance */
+ u_long rmx_bandwidth; /* estimated bandwidth */
+ u_long rmx_cwnd; /* congestion window */
+ u_long rmx_sendpipe; /* outbound delay-bandwidth product */
+ u_long rmx_recvpipe; /* inbound delay-bandwidth product */
+ /* TCP hostcache internal data */
+ int rmx_expire; /* lifetime for object */
+ u_long rmx_hits; /* number of hits */
+ u_long rmx_updates;/* number of updates */
+};
+
+struct tcp_hostcache {
+ struct hc_head *hashbase;
+ uma_zone_t zone;
+ u_int hashsize;
+ u_int hashmask;
+ u_int bucket_limit;
+ u_int cache_count;
+ u_int cache_limit;
+ int expire;
+ int prune;
+ int purgeall;
+};
+
+#endif /* !_NETINET_TCP_HOSTCACHE_H_*/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185421 - head/sys/dev/mii
Author: bz
Date: Fri Nov 28 23:44:13 2008
New Revision: 185421
URL: http://svn.freebsd.org/changeset/base/185421
Log:
Renamed the FRAMELEN macro to TRUEPHY_FRAMELEN as for powerpc
it seems to be possible to collide with FRAMELEN from machine/frame.h.
Found by: zec
Modified:
head/sys/dev/mii/truephy.c
Modified: head/sys/dev/mii/truephy.c
==
--- head/sys/dev/mii/truephy.c Fri Nov 28 23:39:25 2008(r185420)
+++ head/sys/dev/mii/truephy.c Fri Nov 28 23:44:13 2008(r185421)
@@ -57,7 +57,8 @@
#include miibus_if.h
-#define FRAMELEN(mtu) (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN + (mtu) +
ETHER_CRC_LEN)
+#defineTRUEPHY_FRAMELEN(mtu) \
+(ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN + (mtu) + ETHER_CRC_LEN)
static int truephy_service(struct mii_softc *, struct mii_data *, int);
static int truephy_attach(device_t);
@@ -298,7 +299,7 @@ truephy_reset(struct mii_softc *sc)
mii_phy_reset(sc);
- if (FRAMELEN(sc-mii_pdata-mii_ifp-if_mtu) 2048) {
+ if (TRUEPHY_FRAMELEN(sc-mii_pdata-mii_ifp-if_mtu) 2048) {
int conf;
conf = PHY_READ(sc, TRUEPHY_CONF);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185422 - head/sbin/mount_msdosfs
Author: imp
Date: Sat Nov 29 02:28:05 2008
New Revision: 185422
URL: http://svn.freebsd.org/changeset/base/185422
Log:
Noticed the following error message:
mount_msdosfs: /dev/cf0s1: : Operation not supported by device
and thought I'd fix it to be:
mount_msdosfs: /dev/cf0s1: Operation not supported by device
Not sure why errmsg isn't getting filled in, or why this error is even
happening at all... (fsck_msdosfs is clean, and I can mount this same
CF elsewhere).
Modified:
head/sbin/mount_msdosfs/mount_msdosfs.c
Modified: head/sbin/mount_msdosfs/mount_msdosfs.c
==
--- head/sbin/mount_msdosfs/mount_msdosfs.c Fri Nov 28 23:44:13 2008
(r185421)
+++ head/sbin/mount_msdosfs/mount_msdosfs.c Sat Nov 29 02:28:05 2008
(r185422)
@@ -218,8 +218,12 @@ main(int argc, char **argv)
build_iovec_argf(iov, iovlen, mask, %u, mask);
build_iovec_argf(iov, iovlen, dirmask, %u, dirmask);
- if (nmount(iov, iovlen, mntflags) 0)
- err(1, %s: %s, dev, errmsg);
+ if (nmount(iov, iovlen, mntflags) 0) {
+ if (errmsg[0])
+ err(1, %s: %s, dev, errmsg);
+ else
+ err(1, %s, dev);
+ }
exit (0);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185423 - stable/7/sys/fs/cd9660
Author: kientzle Date: Sat Nov 29 03:17:29 2008 New Revision: 185423 URL: http://svn.freebsd.org/changeset/base/185423 Log: MFC r185361: timezone value is signed PR: kern/128934 Submitted by: J.R. Oldroyd Approved by: re Modified: stable/7/sys/fs/cd9660/cd9660_node.c Modified: stable/7/sys/fs/cd9660/cd9660_node.c == --- stable/7/sys/fs/cd9660/cd9660_node.cSat Nov 29 02:28:05 2008 (r185422) +++ stable/7/sys/fs/cd9660/cd9660_node.cSat Nov 29 03:17:29 2008 (r185423) @@ -242,7 +242,7 @@ cd9660_tstamp_conv7(pi,pu,ftype) minute = pi[4]; second = pi[5]; if(ftype != ISO_FTYPE_HIGH_SIERRA) - tz = pi[6]; + tz = ((signed char *)pi)[6]; /* Timezone value is signed. */ else /* original high sierra misses timezone data */ tz = 0; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185424 - releng/7.1/sys/fs/cd9660
Author: kientzle Date: Sat Nov 29 03:21:25 2008 New Revision: 185424 URL: http://svn.freebsd.org/changeset/base/185424 Log: MFC r185361: Timezone value is signed. PR: kern/128934 Submitted by: J.R. Oldroyd Approved by: re Modified: releng/7.1/sys/fs/cd9660/cd9660_node.c Modified: releng/7.1/sys/fs/cd9660/cd9660_node.c == --- releng/7.1/sys/fs/cd9660/cd9660_node.c Sat Nov 29 03:17:29 2008 (r185423) +++ releng/7.1/sys/fs/cd9660/cd9660_node.c Sat Nov 29 03:21:25 2008 (r185424) @@ -242,7 +242,7 @@ cd9660_tstamp_conv7(pi,pu,ftype) minute = pi[4]; second = pi[5]; if(ftype != ISO_FTYPE_HIGH_SIERRA) - tz = pi[6]; + tz = ((signed char *)pi)[6]; /* Timezone value is signed. */ else /* original high sierra misses timezone data */ tz = 0; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185425 - releng/7.1/sys/fs/cd9660
Author: kientzle
Date: Sat Nov 29 05:08:49 2008
New Revision: 185425
URL: http://svn.freebsd.org/changeset/base/185425
Log:
MFC r185334: Recognize Rockridge extensions even when the
IEEE-standard extension name (as standardized in 1994) is used.
PR: kern/128942
Submitted by: J.R. Oldroyd
Approved by: re
Modified:
releng/7.1/sys/fs/cd9660/cd9660_rrip.c
Modified: releng/7.1/sys/fs/cd9660/cd9660_rrip.c
==
--- releng/7.1/sys/fs/cd9660/cd9660_rrip.c Sat Nov 29 03:21:25 2008
(r185424)
+++ releng/7.1/sys/fs/cd9660/cd9660_rrip.c Sat Nov 29 05:08:49 2008
(r185425)
@@ -467,8 +467,12 @@ cd9660_rrip_extref(p,ana)
ISO_RRIP_EXTREF *p;
ISO_RRIP_ANALYZE *ana;
{
- if (isonum_711(p-len_id) != 10
- || bcmp((char *)p + 8,RRIP_1991A,10)
+ if ( ! ((isonum_711(p-len_id) == 10
+ bcmp((char *)p + 8,RRIP_1991A,10) == 0)
+ || (isonum_711(p-len_id) == 10
+ bcmp((char *)p + 8,IEEE_P1282,10) == 0)
+ || (isonum_711(p-len_id) == 9
+ bcmp((char *)p + 8,IEEE_1282, 9) == 0))
|| isonum_711(p-version) != 1)
return 0;
ana-fields = ~ISO_SUSP_EXTREF;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185426 - stable/7/sys/fs/cd9660
Author: kientzle
Date: Sat Nov 29 05:10:30 2008
New Revision: 185426
URL: http://svn.freebsd.org/changeset/base/185426
Log:
MFC r185334: Recognize Rockridge extensions even when the
IEEE-standard extension name (as standardized in 1994) is used.
PR: kern/128942
Submitted by: J.R. Oldroyd
Approved by: re
Modified:
stable/7/sys/fs/cd9660/cd9660_rrip.c
Modified: stable/7/sys/fs/cd9660/cd9660_rrip.c
==
--- stable/7/sys/fs/cd9660/cd9660_rrip.cSat Nov 29 05:08:49 2008
(r185425)
+++ stable/7/sys/fs/cd9660/cd9660_rrip.cSat Nov 29 05:10:30 2008
(r185426)
@@ -467,8 +467,12 @@ cd9660_rrip_extref(p,ana)
ISO_RRIP_EXTREF *p;
ISO_RRIP_ANALYZE *ana;
{
- if (isonum_711(p-len_id) != 10
- || bcmp((char *)p + 8,RRIP_1991A,10)
+ if ( ! ((isonum_711(p-len_id) == 10
+ bcmp((char *)p + 8,RRIP_1991A,10) == 0)
+ || (isonum_711(p-len_id) == 10
+ bcmp((char *)p + 8,IEEE_P1282,10) == 0)
+ || (isonum_711(p-len_id) == 9
+ bcmp((char *)p + 8,IEEE_1282, 9) == 0))
|| isonum_711(p-version) != 1)
return 0;
ana-fields = ~ISO_SUSP_EXTREF;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to [EMAIL PROTECTED]
svn commit: r185427 - head/sys/mips/include
Author: imp Date: Sat Nov 29 05:16:14 2008 New Revision: 185427 URL: http://svn.freebsd.org/changeset/base/185427 Log: Unbreak mips build by taking first WAG at mb(), wmb() and rmb(). The latter two are likely pessimal... Modified: head/sys/mips/include/atomic.h Modified: head/sys/mips/include/atomic.h == --- head/sys/mips/include/atomic.h Sat Nov 29 05:10:30 2008 (r185426) +++ head/sys/mips/include/atomic.h Sat Nov 29 05:16:14 2008 (r185427) @@ -51,6 +51,10 @@ mips_sync(void) : : : memory); } +#define mb() mips_sync() +#define wmb() mips_sync() +#define rmb() mips_sync() + /* * Various simple arithmetic on memory which is atomic in the presence * of interrupts and SMP safe. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to [EMAIL PROTECTED]
