Date: Thu, 18 Oct 2007 02:25:07 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 127651 for review Message-ID: <200710180225.l9I2P7SU085329@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=127651 Change 127651 by imp@imp_paco-paco on 2007/10/18 02:24:37 IFC @127644 Affected files ... .. //depot/projects/arm/src/etc/nscd.conf#1 branch .. //depot/projects/arm/src/lib/libc/gen/sysctl.3#5 integrate .. //depot/projects/arm/src/lib/libc/net/nscache.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_pspinlock.c#5 integrate .. //depot/projects/arm/src/libexec/rtld-elf/sparc64/reloc.c#4 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#23 integrate .. //depot/projects/arm/src/share/mk/bsd.cpu.mk#8 integrate .. //depot/projects/arm/src/share/mk/version_gen.awk#4 integrate .. //depot/projects/arm/src/share/termcap/termcap.src#2 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#36 integrate .. //depot/projects/arm/src/sys/ddb/db_ps.c#8 integrate .. //depot/projects/arm/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#21 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/fs/portalfs/portal_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs.c#8 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#14 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#9 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#3 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#27 integrate .. //depot/projects/arm/src/sys/kern/subr_param.c#3 integrate .. //depot/projects/arm/src/sys/modules/Makefile#50 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#19 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#22 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#23 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#23 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#23 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#18 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#17 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#23 integrate .. //depot/projects/arm/src/sys/netinet/sctp_var.h#14 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#26 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#15 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/elf_machdep.c#6 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#16 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#25 integrate .. //depot/projects/arm/src/sys/vm/vm_param.h#3 integrate .. //depot/projects/arm/src/usr.bin/fmt/fmt.c#2 integrate .. //depot/projects/arm/src/usr.bin/locate/locate/locate.rc#3 integrate .. //depot/projects/arm/src/usr.bin/locate/locate/updatedb.sh#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/sctp.c#5 integrate .. //depot/projects/arm/src/usr.bin/tail/read.c#2 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/lib/lib.h#3 integrate Differences ... ==== //depot/projects/arm/src/lib/libc/gen/sysctl.3#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.72 2007/10/15 20:00:19 netchild Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.74 2007/10/16 11:29:13 ru Exp $ .\" -.Dd April 10, 2007 +.Dd October 16, 2007 .Dt SYSCTL 3 .Os .Sh NAME @@ -280,10 +280,11 @@ .It "HW_PHYSMEM integer no" .It "HW_USERMEM integer no" .It "HW_PAGESIZE integer no" -.It "HW_FLOATINGPOINT integer no" -.It "HW_MACHINE_ARCH string no" .\".It "HW_DISKNAMES integer no" .\".It "HW_DISKSTATS integer no" +.It "HW_FLOATINGPT integer no" +.It "HW_MACHINE_ARCH string no" +.It "HW_REALMEM integer no" .El .Pp .Bl -tag -width 6n @@ -301,12 +302,14 @@ The bytes of non-kernel memory. .It Li HW_PAGESIZE The software page size. -.It Li HW_FLOATINGPOINT +.\".It Fa HW_DISKNAMES +.\".It Fa HW_DISKSTATS +.It Li HW_FLOATINGPT Nonzero if the floating point support is in hardware. .It Li HW_MACHINE_ARCH The machine dependent architecture type. -.\".It Fa HW_DISKNAMES -.\".It Fa HW_DISKSTATS +.It Li HW_REALMEM +The bytes of real memory. .El .Ss CTL_KERN The string and integer information available for the CTL_KERN level @@ -739,7 +742,7 @@ .Bl -column "Second level nameXXXXXX" "struct loadavgXXX" -offset indent .It Sy "Second level name Type Changeable" .It "VM_LOADAVG struct loadavg no" -.It "VM_METER struct vmtotal no" +.It "VM_TOTAL struct vmtotal no" .It "VM_PAGEOUT_ALGORITHM integer yes" .It "VM_SWAPPING_ENABLED integer maybe" .It "VM_V_CACHE_MAX integer yes" @@ -756,7 +759,7 @@ Return the load average history. The returned data consists of a .Va struct loadavg . -.It Li VM_METER +.It Li VM_TOTAL Return the system wide virtual memory statistics. The returned data consists of a .Va struct vmtotal . ==== //depot/projects/arm/src/lib/libc/net/nscache.c#2 (text) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/nscache.c,v 1.1 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/nscache.c,v 1.2 2007/10/17 23:20:49 tmclaugh Exp $"); #include "namespace.h" #include <nsswitch.h> @@ -42,7 +42,7 @@ #define NSS_CACHE_BUFFER_INITIAL_SIZE (1024) #define NSS_CACHE_BUFFER_SIZE_LIMIT (NSS_CACHE_BUFFER_INITIAL_SIZE << 8) -#define CACHED_SOCKET_PATH "/var/run/cached" +#define CACHED_SOCKET_PATH "/var/run/nscd" int __nss_cache_handler(void *retval, void *mdata, va_list ap) ==== //depot/projects/arm/src/lib/libthr/thread/thr_once.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/lib/libthr/thread/thr_once.c,v 1.5 2006/02/15 23:05:03 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_once.c,v 1.6 2007/10/16 07:46:15 davidxu Exp $ * */ @@ -64,6 +64,7 @@ int _pthread_once(pthread_once_t *once_control, void (*init_routine) (void)) { + struct pthread *curthread; int wakeup = 0; if (once_control->state == ONCE_DONE) @@ -78,9 +79,10 @@ if (*(volatile int *)&(once_control->state) == ONCE_NEVER_DONE) { once_control->state = ONCE_IN_PROGRESS; _pthread_mutex_unlock(&_thr_once_lock); - _pthread_cleanup_push(once_cancel_handler, once_control); + curthread = _get_curthread(); + THR_CLEANUP_PUSH(curthread, once_cancel_handler, once_control); init_routine(); - _pthread_cleanup_pop(0); + THR_CLEANUP_POP(curthread, 0); _pthread_mutex_lock(&_thr_once_lock); once_control->state = ONCE_DONE; wakeup = 1; ==== //depot/projects/arm/src/lib/libthr/thread/thr_pspinlock.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.5 2006/12/15 11:52:01 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.6 2007/10/16 07:36:02 davidxu Exp $ */ #include "namespace.h" @@ -104,7 +104,7 @@ count = SPIN_COUNT; while ((ret = THR_UMUTEX_TRYLOCK(curthread, &lck->s_lock)) != 0) { while (lck->s_lock.m_owner) { - if (_thr_is_smp) { + if (!_thr_is_smp) { _pthread_yield(); } else { CPU_SPINWAIT; ==== //depot/projects/arm/src/libexec/rtld-elf/sparc64/reloc.c#4 (text+ko) ==== @@ -35,10 +35,11 @@ * 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: src/libexec/rtld-elf/sparc64/reloc.c,v 1.15 2007/07/13 16:18:43 kensmith Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/libexec/rtld-elf/sparc64/reloc.c,v 1.16 2007/10/16 19:17:48 marius Exp $"); + #include <sys/param.h> #include <sys/mman.h> @@ -73,7 +74,7 @@ #define _RF_U 0x04000000 /* Unaligned */ #define _RF_SZ(s) (((s) & 0xff) << 8) /* memory target size */ #define _RF_RS(s) ( (s) & 0xff) /* right shift */ -static int reloc_target_flags[] = { +static const int reloc_target_flags[] = { 0, /* NONE */ _RF_S|_RF_A| _RF_SZ(8) | _RF_RS(0), /* RELOC_8 */ _RF_S|_RF_A| _RF_SZ(16) | _RF_RS(0), /* RELOC_16 */ @@ -157,7 +158,7 @@ #define RELOC_TARGET_SIZE(t) ((reloc_target_flags[t] >> 8) & 0xff) #define RELOC_VALUE_RIGHTSHIFT(t) (reloc_target_flags[t] & 0xff) -static long reloc_target_bitmask[] = { +static const long reloc_target_bitmask[] = { #define _BM(x) (~(-(1ULL << (x)))) 0, /* NONE */ _BM(8), _BM(16), _BM(32), /* RELOC_8, _16, _32 */ @@ -173,7 +174,7 @@ _BM(22), _BM(10), /* _HIPLT22, LOPLT10 */ _BM(32), _BM(22), _BM(10), /* _PCPLT32, _PCPLT22, _PCPLT10 */ _BM(10), _BM(11), -1, /* _10, _11, _64 */ - _BM(10), _BM(22), /* _OLO10, _HH22 */ + _BM(13), _BM(22), /* _OLO10, _HH22 */ _BM(10), _BM(22), /* _HM10, _LM22 */ _BM(22), _BM(10), _BM(22), /* _PC_HH22, _PC_HM10, _PC_LM22 */ _BM(16), _BM(19), /* _WDISP16, _WDISP19 */ @@ -296,7 +297,7 @@ defobj = NULL; def = NULL; - type = ELF_R_TYPE(rela->r_info); + type = ELF64_R_TYPE_ID(rela->r_info); if (type == R_SPARC_NONE) return (0); @@ -311,7 +312,8 @@ /* * Note: R_SPARC_UA16 must be numerically largest relocation type. */ - if (type > R_SPARC_UA16) + if (type >= sizeof(reloc_target_bitmask) / + sizeof(*reloc_target_bitmask)) return (-1); value = rela->r_addend; @@ -342,6 +344,9 @@ value += (Elf_Addr)(defobj->relocbase + def->st_value); } + if (type == R_SPARC_OLO10) + value = (value & 0x3ff) + ELF64_R_TYPE_DATA(rela->r_info); + if (RELOC_PC_RELATIVE(type)) value -= (Elf_Addr)where; @@ -411,7 +416,7 @@ for (rela = obj->pltrela; rela < relalim; rela++) { if (rela->r_addend == 0) continue; - assert(ELF_R_TYPE(rela->r_info) == R_SPARC_JMP_SLOT); + assert(ELF64_R_TYPE_ID(rela->r_info) == R_SPARC_JMP_SLOT); where = (Elf_Addr *)(obj->relocbase + rela->r_offset); def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true, NULL); @@ -455,7 +460,7 @@ relalim = (const Elf_Rela *)((char *)obj->pltrela + obj->pltrelasize); for (rela = obj->pltrela; rela < relalim; rela++) { - assert(ELF_R_TYPE(rela->r_info) == R_SPARC_JMP_SLOT); + assert(ELF64_R_TYPE_ID(rela->r_info) == R_SPARC_JMP_SLOT); where = (Elf_Addr *)(obj->relocbase + rela->r_offset); def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true, NULL); ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#23 (text+ko) ==== @@ -20,7 +20,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1069 2007/10/11 20:44:38 delphij Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1070 2007/10/17 17:52:31 delphij Exp $</pubdate> <copyright> <year>2000</year> @@ -2314,7 +2314,7 @@ 4.1.8 to 4.1.23.</para> <para><application>less</application> has been updated from v381 - to v408. &merged;</para> + to v409. &merged;</para> <para><application>libpcap</application> has been updated from 0.9.1 to 0.9.4. &merged;</para> ==== //depot/projects/arm/src/share/mk/bsd.cpu.mk#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.62 2007/05/21 08:39:44 cognet Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.63 2007/10/16 18:32:37 cognet Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -103,7 +103,9 @@ _CPUCFLAGS = -march=${CPUTYPE} . elif ${MACHINE_ARCH} == "arm" . if ${CPUTYPE} == "xscale" -_CPUCFLAGS = -mcpu=xscale +#XXX: gcc doesn't seem to like -mcpu=xscale, and dies while rebuilding itself +#_CPUCFLAGS = -mcpu=xscale +_CPUCFLAGS = -march=armv5te -D__XSCALE__ . else _CPUCFLAGS = -mcpu=${CPUTYPE} . endif ==== //depot/projects/arm/src/share/mk/version_gen.awk#4 (text) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/share/mk/version_gen.awk,v 1.3 2007/07/21 20:52:32 kan Exp $ +# $FreeBSD: src/share/mk/version_gen.awk,v 1.4 2007/10/17 20:09:56 yar Exp $ # # @@ -34,6 +34,8 @@ # version name. # symbols[][] - array index by [version name, symbol index], contains # names of symbols defined for each version. +# names[] - array index is symbol name and value is count, +# used to check for duplicate symbols and warn about them. # BEGIN { brackets = 0; @@ -45,10 +47,13 @@ # Strip comments. sub("#.*$", "", $0); - # Strip trailing spaces. - sub(" *$", "", $0); + # Strip leading and trailing whitespace. + sub("^[ \t]+", "", $0); + sub("[ \t]+$", "", $0); - if (/^[ \t]*[a-zA-Z0-9._]+ *{/) { + if (/^[a-zA-Z0-9._]+[ \t]*{$/) { + # Strip brace. + sub("{", "", $1); brackets++; symver = $1; versions[symver] = 1; @@ -56,39 +61,56 @@ generated[symver] = 0; version_count++; } - else if (/^[ \t]*} *[a-zA-Z0-9._]+ *;/) { + else if (/^}[ \t]*[a-zA-Z0-9._]+[ \t]*;$/) { + v = $1 != "}" ? $1 : $2; + # Strip brace. + sub("}", "", v); # Strip semicolon. - gsub(";", "", $2); - if (symver == "") - printf("Unmatched bracket.\n"); - else if (versions[$2] != 1) - printf("File %s: %s has unknown " \ - "successor %s\n", vfile, symver, $2); + sub(";", "", v); + if (symver == "") { + printf("File %s: Unmatched bracket.\n", + vfile) > stderr; + errors++; + } + else if (versions[v] != 1) { + printf("File %s: `%s' has unknown " \ + "successor `%s'.\n", + vfile, symver, v) > stderr; + errors++; + } else - successors[symver] = $2; + successors[symver] = v; brackets--; } - else if (/^[ \t]*};/) { - if (symver == "") + else if (/^}[ \t]*;$/) { + if (symver == "") { printf("File %s: Unmatched bracket.\n", vfile) > stderr; + errors++; + } # No successor brackets--; } - else if (/^[ \t]*}/) { - printf("File %s: Missing ending semi-colon.\n", + else if (/^}$/) { + printf("File %s: Missing final semicolon.\n", vfile) > stderr; + errors++; } else if (/^$/) ; # Ignore blank lines. - else - printf("File %s: Unknown directive: %s\n", + else { + printf("File %s: Unknown directive: `%s'.\n", vfile, $0) > stderr; + errors++; + } } brackets = 0; } -/.*/ { +{ + # Set meaningful filename for diagnostics. + filename = FILENAME != "" ? FILENAME : "<stdin>"; + # Delete comments, preceding and trailing whitespace, then # consume blank lines. sub("#.*$", "", $0); @@ -98,15 +120,18 @@ next; } -/^[a-zA-Z0-9._]+ +{$/ { +/^[a-zA-Z0-9._]+[ \t]*{$/ { # Strip bracket from version name. sub("{", "", $1); - if (current_version != "") + if (current_version != "") { printf("File %s, line %d: Illegal nesting detected.\n", - FILENAME, FNR) > stderr; + filename, FNR) > stderr; + errors++; + } else if (versions[$1] == 0) { printf("File %s, line %d: Undefined " \ - "library version %s\n", FILENAME, FNR, $1) > stderr; + "library version `%s'.\n", filename, FNR, $1) > stderr; + errors++; # Remove this entry from the versions. delete versions[$1]; } @@ -116,20 +141,34 @@ next; } -/^[a-zA-Z0-9._]+ *;$/ { +/^[a-zA-Z0-9._]+[ \t]*;$/ { + # Strip semicolon. + sub(";", "", $1); if (current_version != "") { count = versions[current_version]; versions[current_version]++; symbols[current_version, count] = $1; + if (names[$1]++) { + printf("File %s, line %d: Duplicated symbol `%s'. " \ + "Did you forget to move it to ObsoleteVersions?\n", + filename, FNR, $1) > stderr; + errors++; + } } + else { + printf("File %s, line %d: Symbol `%s' outside version scope.\n", + filename, FNR, $1) > stderr; + errors++; + } next; } -/^} *;$/ { +/^}[ \t]*;$/ { brackets--; if (brackets < 0) { printf("File %s, line %d: Unmatched bracket.\n", - FILENAME, FNR, $1) > stderr; + filename, FNR, $1) > stderr; + errors++; brackets = 0; # Reset } current_version = ""; @@ -137,9 +176,10 @@ } -/.*/ { - printf("File %s, line %d: Unknown directive: '%s'\n", - FILENAME, FNR, $0) > stderr; +{ + printf("File %s, line %d: Unknown directive: `%s'.\n", + filename, FNR, $0) > stderr; + errors++; } function print_version(v) @@ -162,7 +202,7 @@ for (i = 1; i < versions[v]; i++) { if (i == 1) printf("global:\n"); - printf("\t%s\n", symbols[v, i]); + printf("\t%s;\n", symbols[v, i]); } version_count--; @@ -178,7 +218,13 @@ generated[v] = 1; } + END { + if (errors) { + printf("%d errors total.\n", errors) > stderr; + exit(1); + } + # OK, no errors. for (v in versions) { print_version(v); } ==== //depot/projects/arm/src/share/termcap/termcap.src#2 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 8.2 (Berkeley) 11/17/93 -# $FreeBSD: src/share/termcap/termcap.src,v 1.148 2006/04/30 09:05:56 matteo Exp $ +# $FreeBSD: src/share/termcap/termcap.src,v 1.149 2007/10/17 19:58:50 yar Exp $ # Termcap source file # John Kunze, Berkeley @@ -2821,7 +2821,7 @@ :eA=\E(B\E)0:as=\E(0:ae=\E(B:ml=\El:mu=\Em:up=\E[A:nd=\E[C:\ :md=\E[1m:me=\E[m:mr=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:\ :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\ - :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:\ + :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm: # The xterm-xfree86 description has all of the features, but is not completely # compatible with vt220. If you are using a Sun or PC keyboard, set the ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#36 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.86 2007/09/22 22:47:48 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.87 2007/10/16 20:40:04 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -4114,9 +4114,23 @@ void pmap_zero_page_xscale(vm_paddr_t phys, int off, int size) { +#ifdef ARM_USE_SMALL_ALLOC + char *dstpg; +#endif + if (_arm_bzero && size >= _min_bzero_size && _arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0) return; +#ifdef ARM_USE_SMALL_ALLOC + dstpg = (char *)arm_ptovirt(phys); + if (off || size != PAGE_SIZE) { + bzero(dstpg + off, size); + cpu_dcache_wbinv_range((vm_offset_t)(dstpg + off), size); + } else { + bzero_page((vm_offset_t)dstpg); + cpu_dcache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE); + } +#else mtx_lock(&cmtx); /* * Hook in the page, zero it, and purge the cache for that @@ -4134,6 +4148,7 @@ bzero_page(cdstp); mtx_unlock(&cmtx); xscale_cache_clean_minidata(); +#endif } /* ==== //depot/projects/arm/src/sys/ddb/db_ps.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.66 2007/09/17 05:27:19 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.67 2007/10/16 17:52:59 marcel Exp $"); #include <sys/param.h> #include <sys/cons.h> @@ -295,6 +295,8 @@ db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); if (td->td_name[0] != '\0') db_printf(" name: %s\n", td->td_name); + db_printf(" stack: %p-%p\n", (void *)td->td_kstack, + (void *)(td->td_kstack + td->td_kstack_pages * PAGE_SIZE - 1)); db_printf(" flags: %#x ", td->td_flags); db_printf(" pflags: %#x\n", td->td_pflags); db_printf(" state: "); ==== //depot/projects/arm/src/sys/fs/cd9660/cd9660_vfsops.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_vfsops.c,v 1.150 2007/03/13 01:50:22 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_vfsops.c,v 1.151 2007/10/16 10:54:51 alfred Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -375,7 +375,7 @@ brelse(pribp); pribp = NULL; - mp->mnt_data = (qaddr_t)isomp; + mp->mnt_data = isomp; mp->mnt_stat.f_fsid.val[0] = dev2udev(dev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; mp->mnt_maxsymlinklen = 0; @@ -488,7 +488,7 @@ } if (isomp) { free((caddr_t)isomp, M_ISOFSMNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; } return error; } @@ -530,7 +530,7 @@ PICKUP_GIANT(); vrele(isomp->im_devvp); free((caddr_t)isomp, M_ISOFSMNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/coda/coda_vfsops.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.67 2007/07/20 11:14:51 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.68 2007/10/16 10:54:52 alfred Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -168,7 +168,7 @@ } /* No initialization (here) of mi_vcomm! */ - vfsp->mnt_data = (qaddr_t)mi; + vfsp->mnt_data = mi; vfs_getnewfsid (vfsp); mi->mi_vfsp = vfsp; ==== //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vfsops.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.56 2007/04/04 09:11:32 rwatson Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.57 2007/10/16 10:54:52 alfred Exp $ */ /* @@ -96,7 +96,7 @@ fmp->f_root = rvp; /* XXX -- don't mark as local to work around fts() problems */ /*mp->mnt_flag |= MNT_LOCAL;*/ - mp->mnt_data = (qaddr_t) fmp; + mp->mnt_data = fmp; vfs_getnewfsid(mp); vfs_mountedfrom(mp, "fdescfs"); ==== //depot/projects/arm/src/sys/fs/hpfs/hpfs_vfsops.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.60 2007/03/13 01:50:22 tegge Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.61 2007/10/16 10:54:52 alfred Exp $ */ @@ -281,7 +281,7 @@ goto failed; } - mp->mnt_data = (qaddr_t)hpmp; + mp->mnt_data = hpmp; hpmp->hpm_devvp = devvp; hpmp->hpm_dev = devvp->v_rdev; hpmp->hpm_mp = mp; @@ -322,7 +322,7 @@ failed: if (bp) brelse (bp); - mp->mnt_data = (qaddr_t)NULL; + mp->mnt_data = NULL; g_vfs_close(cp, td); return (error); } @@ -359,7 +359,7 @@ dprintf(("hpfs_umount: freeing memory...\n")); hpfs_cpdeinit(hpmp); hpfs_bmdeinit(hpmp); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#21 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.174 2007/08/15 17:40:09 jhb Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.175 2007/10/16 10:54:52 alfred Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -719,7 +719,7 @@ goto error_exit; pmp->pm_fmod = 1; } - mp->mnt_data = (qaddr_t) pmp; + mp->mnt_data = pmp; mp->mnt_stat.f_fsid.val[0] = dev2udev(dev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; MNT_ILOCK(mp); @@ -745,7 +745,7 @@ if (pmp->pm_inusemap) free(pmp->pm_inusemap, M_MSDOSFSFAT); free(pmp, M_MSDOSFSMNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; } return (error); } @@ -811,7 +811,7 @@ msdosfs_fileno_free(mp); } free(pmp, M_MSDOSFSMNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/ntfs/ntfs_vfsops.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.88 2007/09/21 23:50:15 rodrigc Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.89 2007/10/16 10:54:53 alfred Exp $ */ @@ -353,7 +353,7 @@ else ntfs_u28_init(ntmp, ntmp->ntm_82u, cs_local, cs_ntfs); - mp->mnt_data = (qaddr_t)ntmp; + mp->mnt_data = ntmp; dprintf(("ntfs_mountfs(): case-%s,%s uid: %d, gid: %d, mode: %o\n", (ntmp->ntm_flag & NTFS_MFLAG_CASEINS)?"insens.":"sens.", @@ -521,7 +521,7 @@ dprintf(("ntfs_umount: freeing memory...\n")); ntfs_u28_uninit(ntmp); ntfs_82u_uninit(ntmp); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.83 2007/05/29 11:28:28 rwatson Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.84 2007/10/16 10:54:53 alfred Exp $ */ /* @@ -185,7 +185,7 @@ MNT_ILOCK(mp); mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE; MNT_IUNLOCK(mp); - mp->mnt_data = (qaddr_t) xmp; + mp->mnt_data = xmp; vfs_getnewfsid(mp); vfs_mountedfrom(mp, target); ==== //depot/projects/arm/src/sys/fs/nwfs/nwfs_vfsops.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.44 2006/09/26 04:12:46 tegge Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.45 2007/10/16 10:54:53 alfred Exp $ */ #include <sys/param.h> @@ -198,7 +198,7 @@ error = ENOMEM; goto bad; } - mp->mnt_data = (qaddr_t)nmp; + mp->mnt_data = nmp; nmp->connh = handle; nmp->n_root = NULL; nmp->n_id = nwfsid++; @@ -263,7 +263,7 @@ if(ncp_conn_free(conn)) ncp_conn_unlock(conn, td); } - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; if (nmp->m.flags & NWFS_MOUNT_HAVE_NLS) free(nmp->m.nls.to_lower, M_NWFSDATA); free(nmp, M_NWFSDATA); ==== //depot/projects/arm/src/sys/fs/portalfs/portal_vfsops.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.60 2007/03/13 01:50:23 tegge Exp $ + * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.61 2007/10/16 10:54:53 alfred Exp $ */ /* @@ -156,7 +156,7 @@ MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; MNT_IUNLOCK(mp); - mp->mnt_data = (qaddr_t) fmp; + mp->mnt_data = fmp; vfs_getnewfsid(mp); vfs_mountedfrom(mp, p); ==== //depot/projects/arm/src/sys/fs/pseudofs/pseudofs.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.32 2007/04/15 17:10:01 des Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.33 2007/10/16 10:54:53 alfred Exp $"); #include "opt_pseudofs.h" @@ -310,7 +310,7 @@ mp->mnt_flag |= MNT_LOCAL; mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); - mp->mnt_data = (qaddr_t)pi; + mp->mnt_data = pi; vfs_getnewfsid(mp); sbp = &mp->mnt_stat; ==== //depot/projects/arm/src/sys/fs/smbfs/smbfs_vfsops.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.41 2006/09/26 04:12:46 tegge Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.42 2007/10/16 10:54:53 alfred Exp $ */ #include <sys/param.h> @@ -188,7 +188,7 @@ goto bad; } bzero(smp, sizeof(*smp)); - mp->mnt_data = (qaddr_t)smp; + mp->mnt_data = smp; smp->sm_hash = hashinit(desiredvnodes, M_SMBFSHASH, &smp->sm_hashlen); if (smp->sm_hash == NULL) goto bad; @@ -308,7 +308,7 @@ if (error) return error; smb_share_put(smp->sm_share, &scred); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; if (smp->sm_hash) free(smp->sm_hash, M_SMBFSHASH); ==== //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.48 2007/03/13 01:50:24 tegge Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.49 2007/10/16 10:54:54 alfred Exp $ */ /* udf_vfsops.c */ @@ -339,7 +339,7 @@ goto bail; } - mp->mnt_data = (qaddr_t)udfmp; + mp->mnt_data = udfmp; mp->mnt_stat.f_fsid.val[0] = dev2udev(devvp->v_rdev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; MNT_ILOCK(mp); @@ -534,7 +534,7 @@ FREE(udfmp, M_UDFMOUNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.86 2007/10/14 13:55:38 daichi Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.87 2007/10/16 10:54:54 alfred Exp $ */ #include <sys/param.h> @@ -309,7 +309,7 @@ (upperrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE)) mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); - mp->mnt_data = (qaddr_t)ump; + mp->mnt_data = ump; /* * Copy upper layer's RDONLY flag. ==== //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vfsops.c,v 1.165 2007/08/15 17:40:09 jhb Exp $ + * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vfsops.c,v 1.166 2007/10/16 10:54:54 alfred Exp $ */ /*- @@ -687,7 +687,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710180225.l9I2P7SU085329>