svn commit: r221562 - in projects/largeSMP: bin/sh
contrib/llvm/lib/Support/Unix contrib/one-true-awk
contrib/top lib/libc/net lib/libutil release release/amd64
release/i386 release/ia64 release/pc...
Attilio Rao
attilio at FreeBSD.org
Fri May 6 22:45:34 UTC 2011
Author: attilio
Date: Fri May 6 22:45:33 2011
New Revision: 221562
URL: http://svn.freebsd.org/changeset/base/221562
Log:
MFC
Deleted:
projects/largeSMP/contrib/one-true-awk/proctab.c
projects/largeSMP/sys/nfsclient/nfs_kdtrace.h
projects/largeSMP/tools/build/options/WITH_GPIO
Modified:
projects/largeSMP/bin/sh/mksyntax.c
projects/largeSMP/bin/sh/parser.c
projects/largeSMP/bin/sh/parser.h
projects/largeSMP/bin/sh/sh.1
projects/largeSMP/contrib/llvm/lib/Support/Unix/Host.inc
projects/largeSMP/contrib/one-true-awk/FIXES
projects/largeSMP/contrib/one-true-awk/main.c
projects/largeSMP/lib/libc/net/sctp_sys_calls.c
projects/largeSMP/lib/libutil/libutil.h
projects/largeSMP/release/amd64/mkisoimages.sh
projects/largeSMP/release/generate-release.sh
projects/largeSMP/release/i386/mkisoimages.sh
projects/largeSMP/release/ia64/mkisoimages.sh
projects/largeSMP/release/pc98/mkisoimages.sh
projects/largeSMP/release/powerpc/mkisoimages.sh
projects/largeSMP/share/man/man4/Makefile
projects/largeSMP/share/man/man9/Makefile
projects/largeSMP/sys/amd64/amd64/mp_machdep.c
projects/largeSMP/sys/amd64/include/specialreg.h
projects/largeSMP/sys/boot/i386/boot2/Makefile
projects/largeSMP/sys/dev/ahci/ahci.c
projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416.h
projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
projects/largeSMP/sys/dev/bm/if_bm.c
projects/largeSMP/sys/dev/coretemp/coretemp.c
projects/largeSMP/sys/dev/cxgbe/t4_main.c
projects/largeSMP/sys/dev/e1000/if_em.c
projects/largeSMP/sys/dev/xl/if_xl.c
projects/largeSMP/sys/fs/nfs/nfs.h
projects/largeSMP/sys/fs/nfsclient/nfs_clvfsops.c
projects/largeSMP/sys/fs/nfsserver/nfs_nfsdport.c
projects/largeSMP/sys/geom/geom_map.c
projects/largeSMP/sys/i386/i386/mp_machdep.c
projects/largeSMP/sys/i386/include/specialreg.h
projects/largeSMP/sys/ia64/isa/isa.c
projects/largeSMP/sys/isa/isa_common.c
projects/largeSMP/sys/isa/isa_common.h
projects/largeSMP/sys/mips/atheros/ar71xx_gpio.c
projects/largeSMP/sys/mips/atheros/ar71xx_gpiovar.h
projects/largeSMP/sys/mips/atheros/ar724xreg.h
projects/largeSMP/sys/mips/atheros/ar91xxreg.h
projects/largeSMP/sys/net/if_tun.c
projects/largeSMP/sys/netinet/ipfw/ip_dn_glue.c
projects/largeSMP/sys/netinet/ipfw/ip_dummynet.c
projects/largeSMP/sys/netinet/sctp_auth.h
projects/largeSMP/sys/nfsclient/nfs_bio.c
projects/largeSMP/sys/nfsclient/nfs_kdtrace.c
projects/largeSMP/sys/nfsclient/nfs_subs.c
projects/largeSMP/sys/nfsclient/nfs_vnops.c
projects/largeSMP/sys/powerpc/conf/GENERIC
projects/largeSMP/sys/powerpc/mpc85xx/isa.c
projects/largeSMP/sys/powerpc/powermac/macio.c
projects/largeSMP/sys/powerpc/powermac/maciovar.h
projects/largeSMP/sys/sparc64/isa/isa.c
projects/largeSMP/sys/sys/stdint.h
projects/largeSMP/sys/sys/types.h
projects/largeSMP/sys/x86/isa/isa.c
projects/largeSMP/sys/x86/x86/local_apic.c
projects/largeSMP/tools/build/options/WITHOUT_ACCT
projects/largeSMP/tools/build/options/WITHOUT_FDT
projects/largeSMP/tools/build/options/WITHOUT_FLOPPY
projects/largeSMP/usr.sbin/makefs/cd9660/cd9660_eltorito.c
Directory Properties:
projects/largeSMP/ (props changed)
projects/largeSMP/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/contrib/bind9/ (props changed)
projects/largeSMP/contrib/binutils/ (props changed)
projects/largeSMP/contrib/bzip2/ (props changed)
projects/largeSMP/contrib/dialog/ (props changed)
projects/largeSMP/contrib/ee/ (props changed)
projects/largeSMP/contrib/expat/ (props changed)
projects/largeSMP/contrib/file/ (props changed)
projects/largeSMP/contrib/gcc/ (props changed)
projects/largeSMP/contrib/gdb/ (props changed)
projects/largeSMP/contrib/gdtoa/ (props changed)
projects/largeSMP/contrib/gnu-sort/ (props changed)
projects/largeSMP/contrib/groff/ (props changed)
projects/largeSMP/contrib/less/ (props changed)
projects/largeSMP/contrib/libpcap/ (props changed)
projects/largeSMP/contrib/libstdc++/ (props changed)
projects/largeSMP/contrib/llvm/ (props changed)
projects/largeSMP/contrib/llvm/tools/clang/ (props changed)
projects/largeSMP/contrib/ncurses/ (props changed)
projects/largeSMP/contrib/netcat/ (props changed)
projects/largeSMP/contrib/ntp/ (props changed)
projects/largeSMP/contrib/one-true-awk/ (props changed)
projects/largeSMP/contrib/openbsm/ (props changed)
projects/largeSMP/contrib/openpam/ (props changed)
projects/largeSMP/contrib/pf/ (props changed)
projects/largeSMP/contrib/sendmail/ (props changed)
projects/largeSMP/contrib/tcpdump/ (props changed)
projects/largeSMP/contrib/tcsh/ (props changed)
projects/largeSMP/contrib/top/ (props changed)
projects/largeSMP/contrib/top/install-sh (props changed)
projects/largeSMP/contrib/tzcode/stdtime/ (props changed)
projects/largeSMP/contrib/tzcode/zic/ (props changed)
projects/largeSMP/contrib/tzdata/ (props changed)
projects/largeSMP/contrib/wpa/ (props changed)
projects/largeSMP/contrib/xz/ (props changed)
projects/largeSMP/crypto/openssh/ (props changed)
projects/largeSMP/crypto/openssl/ (props changed)
projects/largeSMP/gnu/lib/ (props changed)
projects/largeSMP/gnu/usr.bin/binutils/ (props changed)
projects/largeSMP/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/largeSMP/gnu/usr.bin/gdb/ (props changed)
projects/largeSMP/lib/libc/ (props changed)
projects/largeSMP/lib/libc/stdtime/ (props changed)
projects/largeSMP/lib/libutil/ (props changed)
projects/largeSMP/lib/libz/ (props changed)
projects/largeSMP/sbin/ (props changed)
projects/largeSMP/sbin/ipfw/ (props changed)
projects/largeSMP/share/mk/bsd.arch.inc.mk (props changed)
projects/largeSMP/share/zoneinfo/ (props changed)
projects/largeSMP/sys/ (props changed)
projects/largeSMP/sys/amd64/include/xen/ (props changed)
projects/largeSMP/sys/boot/ (props changed)
projects/largeSMP/sys/boot/i386/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/ski/ (props changed)
projects/largeSMP/sys/boot/powerpc/boot1.chrp/ (props changed)
projects/largeSMP/sys/boot/powerpc/ofw/ (props changed)
projects/largeSMP/sys/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/sys/conf/ (props changed)
projects/largeSMP/sys/contrib/dev/acpica/ (props changed)
projects/largeSMP/sys/contrib/octeon-sdk/ (props changed)
projects/largeSMP/sys/contrib/pf/ (props changed)
projects/largeSMP/sys/contrib/x86emu/ (props changed)
projects/largeSMP/usr.bin/calendar/ (props changed)
projects/largeSMP/usr.bin/csup/ (props changed)
projects/largeSMP/usr.bin/procstat/ (props changed)
projects/largeSMP/usr.sbin/ndiscvt/ (props changed)
projects/largeSMP/usr.sbin/zic/ (props changed)
Modified: projects/largeSMP/bin/sh/mksyntax.c
==============================================================================
--- projects/largeSMP/bin/sh/mksyntax.c Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/bin/sh/mksyntax.c Fri May 6 22:45:33 2011 (r221562)
@@ -64,6 +64,7 @@ struct synclass synclass[] = {
{ "CWORD", "character is nothing special" },
{ "CNL", "newline character" },
{ "CBACK", "a backslash character" },
+ { "CSBACK", "a backslash character in single quotes" },
{ "CSQUOTE", "single quote" },
{ "CDQUOTE", "double quote" },
{ "CENDQUOTE", "a terminating quote" },
@@ -224,6 +225,7 @@ main(int argc __unused, char **argv __un
init();
fputs("\n/* syntax table used when in single quotes */\n", cfile);
add("\n", "CNL");
+ add("\\", "CSBACK");
add("'", "CENDQUOTE");
/* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */
add("!*?[=~:/-", "CCTL");
Modified: projects/largeSMP/bin/sh/parser.c
==============================================================================
--- projects/largeSMP/bin/sh/parser.c Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/bin/sh/parser.c Fri May 6 22:45:33 2011 (r221562)
@@ -1127,6 +1127,127 @@ done:
/*
+ * Called to parse a backslash escape sequence inside $'...'.
+ * The backslash has already been read.
+ */
+static char *
+readcstyleesc(char *out)
+{
+ int c, v, i, n;
+
+ c = pgetc();
+ switch (c) {
+ case '\0':
+ synerror("Unterminated quoted string");
+ case '\n':
+ plinno++;
+ if (doprompt)
+ setprompt(2);
+ else
+ setprompt(0);
+ return out;
+ case '\\':
+ case '\'':
+ case '"':
+ v = c;
+ break;
+ case 'a': v = '\a'; break;
+ case 'b': v = '\b'; break;
+ case 'e': v = '\033'; break;
+ case 'f': v = '\f'; break;
+ case 'n': v = '\n'; break;
+ case 'r': v = '\r'; break;
+ case 't': v = '\t'; break;
+ case 'v': v = '\v'; break;
+ case 'x':
+ v = 0;
+ for (;;) {
+ c = pgetc();
+ if (c >= '0' && c <= '9')
+ v = (v << 4) + c - '0';
+ else if (c >= 'A' && c <= 'F')
+ v = (v << 4) + c - 'A' + 10;
+ else if (c >= 'a' && c <= 'f')
+ v = (v << 4) + c - 'a' + 10;
+ else
+ break;
+ }
+ pungetc();
+ break;
+ case '0': case '1': case '2': case '3':
+ case '4': case '5': case '6': case '7':
+ v = c - '0';
+ c = pgetc();
+ if (c >= '0' && c <= '7') {
+ v <<= 3;
+ v += c - '0';
+ c = pgetc();
+ if (c >= '0' && c <= '7') {
+ v <<= 3;
+ v += c - '0';
+ } else
+ pungetc();
+ } else
+ pungetc();
+ break;
+ case 'c':
+ c = pgetc();
+ if (c < 0x3f || c > 0x7a || c == 0x60)
+ synerror("Bad escape sequence");
+ if (c == '\\' && pgetc() != '\\')
+ synerror("Bad escape sequence");
+ if (c == '?')
+ v = 127;
+ else
+ v = c & 0x1f;
+ break;
+ case 'u':
+ case 'U':
+ n = c == 'U' ? 8 : 4;
+ v = 0;
+ for (i = 0; i < n; i++) {
+ c = pgetc();
+ if (c >= '0' && c <= '9')
+ v = (v << 4) + c - '0';
+ else if (c >= 'A' && c <= 'F')
+ v = (v << 4) + c - 'A' + 10;
+ else if (c >= 'a' && c <= 'f')
+ v = (v << 4) + c - 'a' + 10;
+ else
+ synerror("Bad escape sequence");
+ }
+ if (v == 0 || (v >= 0xd800 && v <= 0xdfff))
+ synerror("Bad escape sequence");
+ /* We really need iconv here. */
+ if (v > 127)
+ v = '?';
+ break;
+ default:
+ synerror("Bad escape sequence");
+ }
+ v = (char)v;
+ /*
+ * We can't handle NUL bytes.
+ * POSIX says we should skip till the closing quote.
+ */
+ if (v == '\0') {
+ while ((c = pgetc()) != '\'') {
+ if (c == '\\')
+ c = pgetc();
+ if (c == PEOF)
+ synerror("Unterminated quoted string");
+ }
+ pungetc();
+ return out;
+ }
+ if (SQSYNTAX[v] == CCTL)
+ USTPUTC(CTLESC, out);
+ USTPUTC(v, out);
+ return out;
+}
+
+
+/*
* If eofmark is NULL, read a word or a redirection symbol. If eofmark
* is not NULL, read a here document. In the latter case, eofmark is the
* word which marks the end of the document and striptabs is true if
@@ -1158,6 +1279,7 @@ readtoken1(int firstc, char const *initi
struct tokenstate state_static[MAXNEST_static];
int maxnest = MAXNEST_static;
struct tokenstate *state = state_static;
+ int sqiscstyle = 0;
startlinno = plinno;
quotef = 0;
@@ -1188,6 +1310,12 @@ readtoken1(int firstc, char const *initi
setprompt(0);
c = pgetc();
goto loop; /* continue outer loop */
+ case CSBACK:
+ if (sqiscstyle) {
+ out = readcstyleesc(out);
+ break;
+ }
+ /* FALLTHROUGH */
case CWORD:
USTPUTC(c, out);
break;
@@ -1232,6 +1360,7 @@ readtoken1(int firstc, char const *initi
case CSQUOTE:
USTPUTC(CTLQUOTEMARK, out);
state[level].syntax = SQSYNTAX;
+ sqiscstyle = 0;
break;
case CDQUOTE:
USTPUTC(CTLQUOTEMARK, out);
@@ -1450,11 +1579,7 @@ parsesub: {
int c1;
c = pgetc();
- if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) &&
- !is_special(c)) {
- USTPUTC('$', out);
- pungetc();
- } else if (c == '(') { /* $(command) or $((arith)) */
+ if (c == '(') { /* $(command) or $((arith)) */
if (pgetc() == '(') {
PARSEARITH();
} else {
@@ -1465,7 +1590,7 @@ parsesub: {
state[level].syntax == DQSYNTAX ||
state[level].syntax == ARISYNTAX);
}
- } else {
+ } else if (c == '{' || is_name(c) || is_special(c)) {
USTPUTC(CTLVAR, out);
typeloc = out - stackblock();
USTPUTC(VSNORMAL, out);
@@ -1612,6 +1737,14 @@ varname:
newvarnest++;
}
}
+ } else if (c == '\'' && state[level].syntax == BASESYNTAX) {
+ /* $'cstylequotes' */
+ USTPUTC(CTLQUOTEMARK, out);
+ state[level].syntax = SQSYNTAX;
+ sqiscstyle = 1;
+ } else {
+ USTPUTC('$', out);
+ pungetc();
}
goto parsesub_return;
}
Modified: projects/largeSMP/bin/sh/parser.h
==============================================================================
--- projects/largeSMP/bin/sh/parser.h Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/bin/sh/parser.h Fri May 6 22:45:33 2011 (r221562)
@@ -34,16 +34,16 @@
*/
/* control characters in argument strings */
-#define CTLESC '\201'
-#define CTLVAR '\202'
-#define CTLENDVAR '\203'
-#define CTLBACKQ '\204'
+#define CTLESC '\300'
+#define CTLVAR '\301'
+#define CTLENDVAR '\371'
+#define CTLBACKQ '\372'
#define CTLQUOTE 01 /* ored with CTLBACKQ code if in quotes */
/* CTLBACKQ | CTLQUOTE == '\205' */
-#define CTLARI '\206'
-#define CTLENDARI '\207'
-#define CTLQUOTEMARK '\210'
-#define CTLQUOTEEND '\211' /* only for ${v+-...} */
+#define CTLARI '\374'
+#define CTLENDARI '\375'
+#define CTLQUOTEMARK '\376'
+#define CTLQUOTEEND '\377' /* only for ${v+-...} */
/* variable substitution byte (follows CTLVAR) */
#define VSTYPE 0x0f /* type of variable substitution */
Modified: projects/largeSMP/bin/sh/sh.1
==============================================================================
--- projects/largeSMP/bin/sh/sh.1 Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/bin/sh/sh.1 Fri May 6 22:45:33 2011 (r221562)
@@ -32,7 +32,7 @@
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
.\" $FreeBSD$
.\"
-.Dd March 20, 2011
+.Dd May 5, 2011
.Dt SH 1
.Os
.Sh NAME
@@ -396,13 +396,82 @@ Quoting is used to remove the special me
or words to the shell, such as operators, whitespace, keywords,
or alias names.
.Pp
-There are three types of quoting: matched single quotes,
+There are four types of quoting: matched single quotes,
+dollar-single quotes,
matched double quotes, and backslash.
.Bl -tag -width indent
.It Single Quotes
Enclosing characters in single quotes preserves the literal
meaning of all the characters (except single quotes, making
it impossible to put single-quotes in a single-quoted string).
+.It Dollar-Single Quotes
+Enclosing characters between
+.Li $'
+and
+.Li '
+preserves the literal meaning of all characters
+except backslashes and single quotes.
+A backslash introduces a C-style escape sequence:
+.Bl -tag -width xUnnnnnnnn
+.It \ea
+Alert (ring the terminal bell)
+.It \eb
+Backspace
+.It \ec Ns Ar c
+The control character denoted by
+.Li ^ Ns Ar c
+in
+.Xr stty 1 .
+If
+.Ar c
+is a backslash, it must be doubled.
+.It \ee
+The ESC character
+.Tn ( ASCII
+0x1b)
+.It \ef
+Formfeed
+.It \en
+Newline
+.It \er
+Carriage return
+.It \et
+Horizontal tab
+.It \ev
+Vertical tab
+.It \e\e
+Literal backslash
+.It \e\&'
+Literal single-quote
+.It \e\&"
+Literal double-quote
+.It \e Ns Ar nnn
+The byte whose octal value is
+.Ar nnn
+(one to three digits)
+.It \ex Ns Ar nn
+The byte whose hexadecimal value is
+.Ar nn
+(one or more digits only the last two of which are used)
+.It \eu Ns Ar nnnn
+The Unicode code point
+.Ar nnnn
+(four hexadecimal digits)
+.It \eU Ns Ar nnnnnnnn
+The Unicode code point
+.Ar nnnnnnnn
+(eight hexadecimal digits)
+.El
+.Pp
+The sequences for Unicode code points currently only provide useful results
+for values below 128.
+They reject code point 0 and UTF-16 surrogates.
+.Pp
+If an escape sequence would produce a byte with value 0,
+that byte and the rest of the string until the matching single-quote
+are ignored.
+.Pp
+Any other string starting with a backslash is an error.
.It Double Quotes
Enclosing characters within double quotes preserves the literal
meaning of all characters except dollar sign
Modified: projects/largeSMP/contrib/llvm/lib/Support/Unix/Host.inc
==============================================================================
--- projects/largeSMP/contrib/llvm/lib/Support/Unix/Host.inc Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/contrib/llvm/lib/Support/Unix/Host.inc Fri May 6 22:45:33 2011 (r221562)
@@ -35,6 +35,9 @@ static std::string getOSVersion() {
}
std::string sys::getHostTriple() {
+#ifdef __FreeBSD__
+ return LLVM_HOSTTRIPLE;
+#else
// FIXME: Derive directly instead of relying on the autoconf generated
// variable.
@@ -91,4 +94,5 @@ std::string sys::getHostTriple() {
}
return Triple;
+#endif
}
Modified: projects/largeSMP/contrib/one-true-awk/FIXES
==============================================================================
--- projects/largeSMP/contrib/one-true-awk/FIXES Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/contrib/one-true-awk/FIXES Fri May 6 22:45:33 2011 (r221562)
@@ -25,6 +25,11 @@ THIS SOFTWARE.
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+May 6, 2011:
+ added #ifdef for isblank.
+ now allows -ffoo as well as -f foo arguments.
+ (thanks, ruslan)
+
May 1, 2011:
after advice from todd miller, kevin lo, ruslan ermilov,
and arnold robbins, changed srand() to return the previous
Modified: projects/largeSMP/contrib/one-true-awk/main.c
==============================================================================
--- projects/largeSMP/contrib/one-true-awk/main.c Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/contrib/one-true-awk/main.c Fri May 6 22:45:33 2011 (r221562)
@@ -25,7 +25,7 @@ THIS SOFTWARE.
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-const char *version = "version 20110501 (FreeBSD)";
+const char *version = "version 20110506 (FreeBSD)";
#define DEBUG
#include <stdio.h>
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
safe = 1;
break;
case 'f': /* next argument is program filename */
- if (argv[1][2] != 0) { /* arg is -fsomething */
+ if (argv[1][2] != 0) { /* arg is -fsomething */
if (npfile >= MAX_PFILE - 1)
FATAL("too many -f options");
pfile[npfile++] = &argv[1][2];
Modified: projects/largeSMP/lib/libc/net/sctp_sys_calls.c
==============================================================================
--- projects/largeSMP/lib/libc/net/sctp_sys_calls.c Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/lib/libc/net/sctp_sys_calls.c Fri May 6 22:45:33 2011 (r221562)
@@ -1,33 +1,35 @@
-/* $KAME: sctp_sys_calls.c,v 1.9 2004/08/17 06:08:53 itojun Exp $ */
-
-/*
- * Copyright (C) 2002-2007 Cisco Systems Inc,
- * All rights reserved.
+/*-
+ * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2008-2011, by Randall Stewart. All rights reserved.
+ * Copyright (c) 2008-2011, by Michael Tuexen. 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. Neither the name of the project nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * a) Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * b) 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.
+ *
+ * c) Neither the name of Cisco Systems, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
*/
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <stdio.h>
@@ -58,7 +60,6 @@ __FBSDID("$FreeBSD$");
#define SCTP_CONTROL_VEC_SIZE_SND 8192
#define SCTP_CONTROL_VEC_SIZE_RCV 16384
#define SCTP_STACK_BUF_SIZE 2048
-#define SCTP_SMALL_IOVEC_SIZE 2
#ifdef SCTP_DEBUG_PRINT_ADDRESS
@@ -398,6 +399,9 @@ sctp_opt_info(int sd, sctp_assoc_t id, i
case SCTP_LOCAL_AUTH_CHUNKS:
((struct sctp_authchunks *)arg)->gauth_assoc_id = id;
break;
+ case SCTP_TIMEOUTS:
+ ((struct sctp_timeouts *)arg)->stimo_assoc_id = id;
+ break;
default:
break;
}
@@ -551,11 +555,10 @@ sctp_sendmsg(int s,
return (syscall(SYS_sctp_generic_sendmsg, s,
data, len, to, tolen, &sinfo, 0));
#else
-
ssize_t sz;
struct msghdr msg;
struct sctp_sndrcvinfo *s_info;
- struct iovec iov[SCTP_SMALL_IOVEC_SIZE];
+ struct iovec iov;
char controlVector[SCTP_CONTROL_VEC_SIZE_RCV];
struct cmsghdr *cmsg;
struct sockaddr *who = NULL;
@@ -564,20 +567,8 @@ sctp_sendmsg(int s,
struct sockaddr_in6 in6;
} addr;
-/*
- fprintf(io, "sctp_sendmsg(sd:%d, data:%x, len:%d, to:%x, tolen:%d, ppid:%x, flags:%x str:%d ttl:%d ctx:%x\n",
- s,
- (u_int)data,
- (int)len,
- (u_int)to,
- (int)tolen,
- ppid, flags,
- (int)stream_no,
- (int)timetolive,
- (u_int)context);
- fflush(io);
-*/
- if ((tolen > 0) && ((to == NULL) || (tolen < sizeof(struct sockaddr)))) {
+ if ((tolen > 0) &&
+ ((to == NULL) || (tolen < sizeof(struct sockaddr)))) {
errno = EINVAL;
return -1;
}
@@ -587,7 +578,8 @@ sctp_sendmsg(int s,
errno = EINVAL;
return -1;
}
- if ((to->sa_len > 0) && (to->sa_len != sizeof(struct sockaddr_in))) {
+ if ((to->sa_len > 0) &&
+ (to->sa_len != sizeof(struct sockaddr_in))) {
errno = EINVAL;
return -1;
}
@@ -598,7 +590,8 @@ sctp_sendmsg(int s,
errno = EINVAL;
return -1;
}
- if ((to->sa_len > 0) && (to->sa_len != sizeof(struct sockaddr_in6))) {
+ if ((to->sa_len > 0) &&
+ (to->sa_len != sizeof(struct sockaddr_in6))) {
errno = EINVAL;
return -1;
}
@@ -610,10 +603,8 @@ sctp_sendmsg(int s,
}
who = (struct sockaddr *)&addr;
}
- iov[0].iov_base = (char *)data;
- iov[0].iov_len = len;
- iov[1].iov_base = NULL;
- iov[1].iov_len = 0;
+ iov.iov_base = (char *)data;
+ iov.iov_len = len;
if (who) {
msg.msg_name = (caddr_t)who;
@@ -622,7 +613,7 @@ sctp_sendmsg(int s,
msg.msg_name = (caddr_t)NULL;
msg.msg_namelen = 0;
}
- msg.msg_iov = iov;
+ msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = (caddr_t)controlVector;
@@ -681,7 +672,7 @@ sctp_send(int sd, const void *data, size
#else
ssize_t sz;
struct msghdr msg;
- struct iovec iov[SCTP_SMALL_IOVEC_SIZE];
+ struct iovec iov;
struct sctp_sndrcvinfo *s_info;
char controlVector[SCTP_CONTROL_VEC_SIZE_SND];
struct cmsghdr *cmsg;
@@ -690,14 +681,12 @@ sctp_send(int sd, const void *data, size
errno = EINVAL;
return (-1);
}
- iov[0].iov_base = (char *)data;
- iov[0].iov_len = len;
- iov[1].iov_base = NULL;
- iov[1].iov_len = 0;
+ iov.iov_base = (char *)data;
+ iov.iov_len = len;
msg.msg_name = 0;
msg.msg_namelen = 0;
- msg.msg_iov = iov;
+ msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = (caddr_t)controlVector;
@@ -736,7 +725,7 @@ sctp_sendx(int sd, const void *msg, size
return (-1);
}
#ifdef SYS_sctp_generic_sendmsg
- if (addrcnt < SCTP_SMALL_IOVEC_SIZE) {
+ if (addrcnt == 1) {
socklen_t l;
/*
@@ -846,18 +835,18 @@ sctp_recvmsg(int s,
int *msg_flags)
{
#ifdef SYS_sctp_generic_recvmsg
- struct iovec iov[SCTP_SMALL_IOVEC_SIZE];
+ struct iovec iov;
- iov[0].iov_base = dbuf;
- iov[0].iov_len = len;
+ iov.iov_base = dbuf;
+ iov.iov_len = len;
return (syscall(SYS_sctp_generic_recvmsg, s,
- iov, 1, from, fromlen, sinfo, msg_flags));
+ &iov, 1, from, fromlen, sinfo, msg_flags));
#else
struct sctp_sndrcvinfo *s_info;
ssize_t sz;
int sinfo_found = 0;
struct msghdr msg;
- struct iovec iov[SCTP_SMALL_IOVEC_SIZE];
+ struct iovec iov;
char controlVector[SCTP_CONTROL_VEC_SIZE_RCV];
struct cmsghdr *cmsg;
@@ -866,30 +855,28 @@ sctp_recvmsg(int s,
return (-1);
}
msg.msg_flags = 0;
- iov[0].iov_base = dbuf;
- iov[0].iov_len = len;
- iov[1].iov_base = NULL;
- iov[1].iov_len = 0;
+ iov.iov_base = dbuf;
+ iov.iov_len = len;
msg.msg_name = (caddr_t)from;
if (fromlen == NULL)
msg.msg_namelen = 0;
else
msg.msg_namelen = *fromlen;
- msg.msg_iov = iov;
+ msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = (caddr_t)controlVector;
msg.msg_controllen = sizeof(controlVector);
errno = 0;
sz = recvmsg(s, &msg, *msg_flags);
- if (sz <= 0)
+ *msg_flags = msg.msg_flags;
+ if (sz <= 0) {
return (sz);
-
+ }
s_info = NULL;
len = sz;
- *msg_flags = msg.msg_flags;
- if (sinfo)
+ if (sinfo) {
sinfo->sinfo_assoc_id = 0;
-
+ }
if ((msg.msg_controllen) && sinfo) {
/*
* parse through and see if we find the sctp_sndrcvinfo (if
@@ -940,7 +927,7 @@ int
sctp_peeloff(int sd, sctp_assoc_t assoc_id)
{
struct sctp_peeloff_opt peeloff;
- int error;
+ int result;
socklen_t optlen;
/* set in the socket option params */
@@ -948,10 +935,9 @@ sctp_peeloff(int sd, sctp_assoc_t assoc_
peeloff.s = sd;
peeloff.assoc_id = assoc_id;
optlen = sizeof(peeloff);
- error = getsockopt(sd, IPPROTO_SCTP, SCTP_PEELOFF, (void *)&peeloff,
- &optlen);
- if (error) {
- errno = error;
+ result = getsockopt(sd, IPPROTO_SCTP, SCTP_PEELOFF, (void *)&peeloff, &optlen);
+
+ if (result < 0) {
return (-1);
} else {
return (peeloff.new_sd);
@@ -984,4 +970,3 @@ sctp_peeloff(int sd, sctp_assoc_t assoc_
#undef SCTP_CONTROL_VEC_SIZE_SND
#undef SCTP_CONTROL_VEC_SIZE_RCV
#undef SCTP_STACK_BUF_SIZE
-#undef SCTP_SMALL_IOVEC_SIZE
Modified: projects/largeSMP/lib/libutil/libutil.h
==============================================================================
--- projects/largeSMP/lib/libutil/libutil.h Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/lib/libutil/libutil.h Fri May 6 22:45:33 2011 (r221562)
@@ -41,22 +41,13 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
+#include <sys/_stdint.h>
#ifndef _GID_T_DECLARED
typedef __gid_t gid_t;
#define _GID_T_DECLARED
#endif
-#ifndef _INT64_T_DECLARED
-typedef __int64_t int64_t;
-#define _INT64_T_DECLARED
-#endif
-
-#ifndef _UINT64_T_DECLARED
-typedef __uint64_t uint64_t;
-#define _UINT64_T_DECLARED
-#endif
-
#ifndef _PID_T_DECLARED
typedef __pid_t pid_t;
#define _PID_T_DECLARED
Modified: projects/largeSMP/release/amd64/mkisoimages.sh
==============================================================================
--- projects/largeSMP/release/amd64/mkisoimages.sh Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/release/amd64/mkisoimages.sh Fri May 6 22:45:33 2011 (r221562)
@@ -23,7 +23,6 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
-publisher="The FreeBSD Project. http://www.freebsd.org/"
if [ "x$1" = "x-b" ]; then
# This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
Modified: projects/largeSMP/release/generate-release.sh
==============================================================================
--- projects/largeSMP/release/generate-release.sh Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/release/generate-release.sh Fri May 6 22:45:33 2011 (r221562)
@@ -21,7 +21,9 @@
#
mkdir -p $2/usr/src
-svn co ${SVNROOT:-svn://svn.freebsd.org/base}/$1 $2/usr/src || exit 1
+set -e # Everything must succeed
+
+svn co ${SVNROOT:-svn://svn.freebsd.org/base}/$1 $2/usr/src
if [ ! -z $CVSUP_HOST ]; then
cat > $2/docports-supfile << EOF
*default host=$CVSUP_HOST
@@ -35,32 +37,33 @@ if [ ! -z $CVSUP_HOST ]; then
EOF
elif [ ! -z $CVSROOT ]; then
cd $2/usr
- cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} ports || exit 1
- cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} doc || exit 1
+ cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} ports
+ cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} doc
fi
cd $2/usr/src
-make $MAKE_FLAGS buildworld || exit 1
-make installworld distribution DESTDIR=$2 || exit 1
+make $MAKE_FLAGS buildworld
+make installworld distribution DESTDIR=$2
mount -t devfs devfs $2/dev
+trap "umount $2/dev" EXIT # Clean up devfs mount on exit
if [ ! -z $CVSUP_HOST ]; then
cp /etc/resolv.conf $2/etc/resolv.conf
# Checkout ports and doc trees
- chroot $2 /usr/bin/csup /docports-supfile || exit 1
+ chroot $2 /usr/bin/csup /docports-supfile
fi
if [ -d $2/usr/doc ]; then
cp /etc/resolv.conf $2/etc/resolv.conf
# Build ports to build the docs, then build the docs
- chroot $2 /bin/sh -c 'pkg_add -r docproj || (cd /usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes)' || exit 1
- chroot $2 /bin/sh -c "cd /usr/doc && make $MAKE_FLAGS 'FORMATS=html html-split txt' URLS_ABSOLUTE=YES" || exit 1
+ chroot $2 /bin/sh -c 'pkg_add -r docproj || (cd /usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes)'
+ chroot $2 make -C /usr/doc $MAKE_FLAGS 'FORMATS=html html-split txt' URLS_ABSOLUTE=YES
fi
-chroot $2 /bin/sh -c "cd /usr/src && make $MAKE_FLAGS buildworld buildkernel" || exit 1
-chroot $2 /bin/sh -c "cd /usr/src/release && make obj" || exit 1
-chroot $2 /bin/sh -c "cd /usr/src/release && make release" || exit 1
-chroot $2 /bin/sh -c "cd /usr/src/release && make install DESTDIR=/R" || exit 1
+chroot $2 make -C /usr/src $MAKE_FLAGS buildworld buildkernel
+chroot $2 make -C /usr/src/release obj
+chroot $2 make -C /usr/src/release release
+chroot $2 make -C /usr/src/release install DESTDIR=/R
Modified: projects/largeSMP/release/i386/mkisoimages.sh
==============================================================================
--- projects/largeSMP/release/i386/mkisoimages.sh Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/release/i386/mkisoimages.sh Fri May 6 22:45:33 2011 (r221562)
@@ -23,7 +23,6 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
-publisher="The FreeBSD Project. http://www.freebsd.org/"
if [ "x$1" = "x-b" ]; then
# This is highly x86-centric and will be used directly below.
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
Modified: projects/largeSMP/release/ia64/mkisoimages.sh
==============================================================================
--- projects/largeSMP/release/ia64/mkisoimages.sh Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/release/ia64/mkisoimages.sh Fri May 6 22:45:33 2011 (r221562)
@@ -41,27 +41,6 @@ LABEL=$1; shift
NAME=$1; shift
BASE=$1; shift
-MKISOFS=mkisofs
-MKISOFS_PKG=cdrtools
-MKISOFS_PORT=/usr/ports/sysutils/${MKISOFS_PKG}
-
-if ! which ${MKISOFS} > /dev/null; then
- echo -n "${MKISOFS}(8) does not exist: "
- if [ -f ${MKISOFS_PORT}/Makefile ]; then
- echo building the port...
- if ! (cd ${MKISOFS_PORT} && make install BATCH=yes && make clean); then
- echo "error: cannot build ${MKISOFS}(8). Bailing out..."
- exit 2
- fi
- else
- echo fetching the package...
- if ! pkg_add -r ${MKISOFS_PKG}; then
- echo "error: cannot fetch ${MKISOFS}(8). Bailing out..."
- exit 2
- fi
- fi
-fi
-
EFIPART=efipart.sys
# To create a bootable CD under EFI, the boot image should be an EFI
@@ -84,15 +63,13 @@ if [ $bootable = yes ]; then
mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi
umount $MNT
mdconfig -d -u $md
- BOOTOPTS="-b $EFIPART -no-emul-boot"
+ BOOTOPTS="-b bootimage=i386;$EFIPART -o no-emul-boot"
else
BOOTOPTS=""
fi
-publisher="The FreeBSD Project. http://www.freebsd.org/"
-
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
-$MKISOFS $BOOTOPTS -r -J -V $LABEL -publisher "$publisher" -o $NAME $BASE $*
+makefs -t cd9660 $BOOTOPTS -o rockridge -o label=$LABEL $NAME $BASE $*
rm -f $BASE/$EFIPART
rm $1/etc/fstab
exit 0
Modified: projects/largeSMP/release/pc98/mkisoimages.sh
==============================================================================
--- projects/largeSMP/release/pc98/mkisoimages.sh Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/release/pc98/mkisoimages.sh Fri May 6 22:45:33 2011 (r221562)
@@ -23,7 +23,6 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
-publisher="The FreeBSD Project. http://www.freebsd.org/"
if [ "x$1" = "x-b" ]; then
# This is highly x86-centric and will be used directly below.
bootable="-o generic-bootimage=$4/boot/cdboot"
Modified: projects/largeSMP/release/powerpc/mkisoimages.sh
==============================================================================
--- projects/largeSMP/release/powerpc/mkisoimages.sh Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/release/powerpc/mkisoimages.sh Fri May 6 22:45:33 2011 (r221562)
@@ -23,13 +23,11 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
-publisher="The FreeBSD Project. http://www.freebsd.org/"
if [ "x$1" = "x-b" ]; then
uudecode -o /tmp/hfs-boot-block.bz2 `dirname $0`/hfs-boot.bz2.uu
bzip2 -d /tmp/hfs-boot-block.bz2
OFFSET=$(hd /tmp/hfs-boot-block | grep 'Loader START' | cut -f 1 -d ' ')
OFFSET=0x$(echo 0x$OFFSET | awk '{printf("%x\n",$1/512);}')
- echo dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc
dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc
bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"
Modified: projects/largeSMP/share/man/man4/Makefile
==============================================================================
--- projects/largeSMP/share/man/man4/Makefile Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/share/man/man4/Makefile Fri May 6 22:45:33 2011 (r221562)
@@ -134,6 +134,7 @@ MAN= aac.4 \
geom.4 \
geom_fox.4 \
geom_linux_lvm.4 \
+ geom_map.4 \
geom_uzip.4 \
gif.4 \
gpib.4 \
Modified: projects/largeSMP/share/man/man9/Makefile
==============================================================================
--- projects/largeSMP/share/man/man9/Makefile Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/share/man/man9/Makefile Fri May 6 22:45:33 2011 (r221562)
@@ -781,6 +781,7 @@ MLINKS+=make_dev.9 destroy_dev.9 \
make_dev.9 destroy_dev_sched_cb.9 \
make_dev.9 dev_depends.9 \
make_dev.9 make_dev_alias.9 \
+ make_dev.9 make_dev_alias_p.9 \
make_dev.9 make_dev_cred.9 \
make_dev.9 make_dev_credf.9 \
make_dev.9 make_dev_p.9
Modified: projects/largeSMP/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- projects/largeSMP/sys/amd64/amd64/mp_machdep.c Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/sys/amd64/amd64/mp_machdep.c Fri May 6 22:45:33 2011 (r221562)
@@ -177,11 +177,34 @@ mem_range_AP_init(void)
static void
topo_probe_amd(void)
{
+ int core_id_bits;
+ int id;
/* AMD processors do not support HTT. */
- cpu_cores = (amd_feature2 & AMDID2_CMP) != 0 ?
- (cpu_procinfo2 & AMDID_CMP_CORES) + 1 : 1;
cpu_logical = 1;
+
+ if ((amd_feature2 & AMDID2_CMP) == 0) {
+ cpu_cores = 1;
+ return;
+ }
+
+ core_id_bits = (cpu_procinfo2 & AMDID_COREID_SIZE) >>
+ AMDID_COREID_SIZE_SHIFT;
+ if (core_id_bits == 0) {
+ cpu_cores = (cpu_procinfo2 & AMDID_CMP_CORES) + 1;
+ return;
+ }
+
+ /* Fam 10h and newer should get here. */
+ for (id = 0; id <= MAX_APIC_ID; id++) {
+ /* Check logical CPU availability. */
+ if (!cpu_info[id].cpu_present || cpu_info[id].cpu_disabled)
+ continue;
+ /* Check if logical CPU has the same package ID. */
+ if ((id >> core_id_bits) != (boot_cpu_id >> core_id_bits))
+ continue;
+ cpu_cores++;
+ }
}
/*
Modified: projects/largeSMP/sys/amd64/include/specialreg.h
==============================================================================
--- projects/largeSMP/sys/amd64/include/specialreg.h Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/sys/amd64/include/specialreg.h Fri May 6 22:45:33 2011 (r221562)
@@ -228,6 +228,8 @@
* AMD extended function 8000_0008h ecx info
*/
#define AMDID_CMP_CORES 0x000000ff
+#define AMDID_COREID_SIZE 0x0000f000
+#define AMDID_COREID_SIZE_SHIFT 12
/*
* CPUID manufacturers identifiers
Modified: projects/largeSMP/sys/boot/i386/boot2/Makefile
==============================================================================
--- projects/largeSMP/sys/boot/i386/boot2/Makefile Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/sys/boot/i386/boot2/Makefile Fri May 6 22:45:33 2011 (r221562)
@@ -43,7 +43,8 @@ CFLAGS= -Os \
-Winline --param max-inline-insns-single=100
.if ${CC:T:Mclang} == "clang"
-CFLAGS+= -mllvm -stack-alignment=8 -mllvm -inline-threshold=3
+CFLAGS+= -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \
+ -mllvm -enable-load-pre=false
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS+= ${.IMPSRC:T:Mboot1.S:C/^.+$/-no-integrated-as/}
.endif
Modified: projects/largeSMP/sys/dev/ahci/ahci.c
==============================================================================
--- projects/largeSMP/sys/dev/ahci/ahci.c Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/sys/dev/ahci/ahci.c Fri May 6 22:45:33 2011 (r221562)
@@ -184,6 +184,7 @@ static struct {
{0x91201b4b, 0x00, "Marvell 88SE912x", AHCI_Q_EDGEIS|AHCI_Q_NOBSYRES},
{0x91231b4b, 0x11, "Marvell 88SE912x", AHCI_Q_NOBSYRES},
{0x91231b4b, 0x00, "Marvell 88SE912x", AHCI_Q_EDGEIS|AHCI_Q_SATA2|AHCI_Q_NOBSYRES},
+ {0x91821b4b, 0x00, "Marvell 88SE9182", AHCI_Q_NOBSYRES},
{0x06201103, 0x00, "HighPoint RocketRAID 620", AHCI_Q_NOBSYRES},
{0x06201b4b, 0x00, "HighPoint RocketRAID 620", AHCI_Q_NOBSYRES},
{0x06221103, 0x00, "HighPoint RocketRAID 622", AHCI_Q_NOBSYRES},
Modified: projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416.h
==============================================================================
--- projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416.h Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416.h Fri May 6 22:45:33 2011 (r221562)
@@ -199,6 +199,7 @@ extern HAL_STATUS ar5416GetCapability(st
extern HAL_BOOL ar5416GetDiagState(struct ath_hal *ah, int request,
const void *args, uint32_t argsize,
void **result, uint32_t *resultsize);
+extern HAL_BOOL ar5416SetRifsDelay(struct ath_hal *ah, HAL_BOOL enable);
extern HAL_BOOL ar5416SetPowerMode(struct ath_hal *ah, HAL_POWER_MODE mode,
int setChip);
Modified: projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==============================================================================
--- projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Fri May 6 22:45:33 2011 (r221562)
@@ -368,6 +368,25 @@ typedef struct {
uint8_t qcu_complete_state;
} hal_mac_hang_check_t;
+HAL_BOOL
+ar5416SetRifsDelay(struct ath_hal *ah, HAL_BOOL enable)
+{
+ uint32_t val;
+
+ /* Only support disabling RIFS delay for now */
+ HALASSERT(enable == AH_FALSE);
+
+ if (enable == AH_TRUE)
+ return AH_FALSE;
+
+ /* Change RIFS init delay to 0 */
+ val = OS_REG_READ(ah, AR_PHY_HEAVY_CLIP_FACTOR_RIFS);
+ val &= ~AR_PHY_RIFS_INIT_DELAY;
+ OS_REG_WRITE(ah, AR_PHY_HEAVY_CLIP_FACTOR_RIFS, val);
+
+ return AH_TRUE;
+}
+
static HAL_BOOL
ar5416CompareDbgHang(struct ath_hal *ah, const mac_dbg_regs_t *regs,
const hal_mac_hang_check_t *check)
Modified: projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Fri May 6 22:45:13 2011 (r221561)
+++ projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Fri May 6 22:45:33 2011 (r221562)
@@ -2520,11 +2520,8 @@ ar5416OverrideIni(struct ath_hal *ah, co
* Disable RIFS search on some chips to avoid baseband
* hang issues.
*/
- if (AR_SREV_HOWL(ah) || AR_SREV_SOWL(ah)) {
- val = OS_REG_READ(ah, AR_PHY_HEAVY_CLIP_FACTOR_RIFS);
- val &= ~AR_PHY_RIFS_INIT_DELAY;
- OS_REG_WRITE(ah, AR_PHY_HEAVY_CLIP_FACTOR_RIFS, val);
- }
+ if (AR_SREV_HOWL(ah) || AR_SREV_SOWL(ah))
+ (void) ar5416SetRifsDelay(ah, AH_FALSE);
}
struct ini {
Modified: projects/largeSMP/sys/dev/bm/if_bm.c
==============================================================================
--- projects/largeSMP/sys/dev/bm/if_bm.c Fri May 6 22:45:13 2011 (r221561)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list