svn commit: r209027 - in projects/ppc64: . bin/sh contrib/llvm contrib/sendmail/mail.local etc/mtree lib lib/clang lib/libc/sys lib/libpmc lib/librpcsec_gss lib/msun/man release/doc/en_US.ISO8859-1...

Nathan Whitehorn nwhitehorn at FreeBSD.org
Fri Jun 11 03:00:50 UTC 2010


Author: nwhitehorn
Date: Fri Jun 11 03:00:48 2010
New Revision: 209027
URL: http://svn.freebsd.org/changeset/base/209027

Log:
  IFC @ 209023 - post clang import, pre tbemd merge

Added:
  projects/ppc64/contrib/llvm/
     - copied from r209023, head/contrib/llvm/
  projects/ppc64/lib/clang/
     - copied from r209023, head/lib/clang/
  projects/ppc64/share/man/man4/ng_patch.4
     - copied unchanged from r209023, head/share/man/man4/ng_patch.4
  projects/ppc64/sys/modules/netgraph/patch/
     - copied from r209023, head/sys/modules/netgraph/patch/
  projects/ppc64/sys/netgraph/ng_patch.c
     - copied unchanged from r209023, head/sys/netgraph/ng_patch.c
  projects/ppc64/sys/netgraph/ng_patch.h
     - copied unchanged from r209023, head/sys/netgraph/ng_patch.h
  projects/ppc64/sys/x86/x86/io_apic.c
     - copied unchanged from r209023, head/sys/x86/x86/io_apic.c
  projects/ppc64/sys/x86/x86/mca.c
     - copied unchanged from r209023, head/sys/x86/x86/mca.c
  projects/ppc64/sys/x86/x86/msi.c
     - copied unchanged from r209023, head/sys/x86/x86/msi.c
  projects/ppc64/tools/build/options/WITHOUT_CLANG
     - copied unchanged from r209023, head/tools/build/options/WITHOUT_CLANG
  projects/ppc64/tools/tools/vhba/
     - copied from r209023, head/tools/tools/vhba/
  projects/ppc64/usr.bin/clang/
     - copied from r209023, head/usr.bin/clang/
Deleted:
  projects/ppc64/sys/amd64/amd64/io_apic.c
  projects/ppc64/sys/amd64/amd64/mca.c
  projects/ppc64/sys/amd64/amd64/msi.c
  projects/ppc64/sys/i386/i386/io_apic.c
  projects/ppc64/sys/i386/i386/mca.c
  projects/ppc64/sys/i386/i386/msi.c
Modified:
  projects/ppc64/Makefile.inc1
  projects/ppc64/bin/sh/jobs.c
  projects/ppc64/contrib/sendmail/mail.local/mail.local.8
  projects/ppc64/etc/mtree/BSD.include.dist
  projects/ppc64/lib/Makefile
  projects/ppc64/lib/libc/sys/flock.2
  projects/ppc64/lib/libc/sys/getitimer.2
  projects/ppc64/lib/libc/sys/getrusage.2
  projects/ppc64/lib/libc/sys/mq_close.2
  projects/ppc64/lib/libc/sys/mq_getattr.2
  projects/ppc64/lib/libc/sys/mq_notify.2
  projects/ppc64/lib/libc/sys/mq_open.2
  projects/ppc64/lib/libc/sys/mq_receive.2
  projects/ppc64/lib/libc/sys/mq_send.2
  projects/ppc64/lib/libc/sys/mq_setattr.2
  projects/ppc64/lib/libpmc/pmc.corei7.3
  projects/ppc64/lib/libpmc/pmc.corei7uc.3
  projects/ppc64/lib/libpmc/pmc.westmereuc.3
  projects/ppc64/lib/librpcsec_gss/rpc_gss_seccreate.3
  projects/ppc64/lib/msun/man/atan2.3
  projects/ppc64/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  projects/ppc64/sbin/geom/misc/subr.c
  projects/ppc64/share/man/man4/Makefile
  projects/ppc64/share/man/man5/a.out.5
  projects/ppc64/share/man/man5/src.conf.5
  projects/ppc64/share/man/man5/stab.5
  projects/ppc64/share/mk/bsd.own.mk
  projects/ppc64/sys/amd64/amd64/fpu.c
  projects/ppc64/sys/amd64/amd64/pmap.c
  projects/ppc64/sys/amd64/linux32/linux32_machdep.c
  projects/ppc64/sys/arm/arm/pmap.c
  projects/ppc64/sys/cam/cam_debug.h
  projects/ppc64/sys/cam/cam_xpt.c
  projects/ppc64/sys/cam/cam_xpt_internal.h
  projects/ppc64/sys/cam/scsi/scsi_all.c
  projects/ppc64/sys/cam/scsi/scsi_all.h
  projects/ppc64/sys/cam/scsi/scsi_ch.h
  projects/ppc64/sys/cam/scsi/scsi_da.c
  projects/ppc64/sys/cam/scsi/scsi_xpt.c
  projects/ppc64/sys/conf/NOTES
  projects/ppc64/sys/conf/files
  projects/ppc64/sys/conf/files.amd64
  projects/ppc64/sys/conf/files.i386
  projects/ppc64/sys/conf/files.pc98
  projects/ppc64/sys/conf/options
  projects/ppc64/sys/dev/acpica/acpi.c
  projects/ppc64/sys/dev/ahci/ahci.c
  projects/ppc64/sys/dev/bge/if_bgereg.h
  projects/ppc64/sys/dev/cxgb/cxgb_main.c
  projects/ppc64/sys/dev/isp/isp_freebsd.c
  projects/ppc64/sys/dev/isp/isp_library.c
  projects/ppc64/sys/dev/sound/pci/hda/hdac.c
  projects/ppc64/sys/dev/twa/tw_cl.h
  projects/ppc64/sys/dev/twa/tw_cl_fwif.h
  projects/ppc64/sys/dev/twa/tw_cl_init.c
  projects/ppc64/sys/dev/twa/tw_cl_intr.c
  projects/ppc64/sys/dev/twa/tw_cl_io.c
  projects/ppc64/sys/dev/twa/tw_cl_misc.c
  projects/ppc64/sys/dev/twa/tw_cl_share.h
  projects/ppc64/sys/dev/twa/tw_osl.h
  projects/ppc64/sys/dev/twa/tw_osl_cam.c
  projects/ppc64/sys/dev/twa/tw_osl_externs.h
  projects/ppc64/sys/dev/twa/tw_osl_freebsd.c
  projects/ppc64/sys/dev/twa/tw_osl_inline.h
  projects/ppc64/sys/dev/twa/tw_osl_share.h
  projects/ppc64/sys/dev/xen/netfront/netfront.c
  projects/ppc64/sys/fs/devfs/devfs.h
  projects/ppc64/sys/fs/devfs/devfs_devs.c
  projects/ppc64/sys/fs/devfs/devfs_vnops.c
  projects/ppc64/sys/geom/geom_event.c
  projects/ppc64/sys/geom/geom_io.c
  projects/ppc64/sys/i386/i386/pmap.c
  projects/ppc64/sys/i386/linux/linux_machdep.c
  projects/ppc64/sys/i386/xen/pmap.c
  projects/ppc64/sys/ia64/ia64/pmap.c
  projects/ppc64/sys/kern/kern_intr.c
  projects/ppc64/sys/kern/kern_sx.c
  projects/ppc64/sys/kern/sched_ule.c
  projects/ppc64/sys/kern/subr_bus.c
  projects/ppc64/sys/kern/vfs_bio.c
  projects/ppc64/sys/mips/mips/pmap.c
  projects/ppc64/sys/modules/netgraph/Makefile
  projects/ppc64/sys/net80211/ieee80211_hwmp.c
  projects/ppc64/sys/net80211/ieee80211_sta.c
  projects/ppc64/sys/netinet/sctp_constants.h
  projects/ppc64/sys/netinet/sctp_indata.c
  projects/ppc64/sys/netinet/sctp_input.c
  projects/ppc64/sys/netinet/sctp_lock_bsd.h
  projects/ppc64/sys/netinet/sctp_pcb.c
  projects/ppc64/sys/netinet/sctp_sysctl.c
  projects/ppc64/sys/netinet/sctputil.c
  projects/ppc64/sys/powerpc/aim/mmu_oea.c
  projects/ppc64/sys/powerpc/aim/mmu_oea64.c
  projects/ppc64/sys/powerpc/booke/pmap.c
  projects/ppc64/sys/sparc64/sparc64/pmap.c
  projects/ppc64/sys/sun4v/sun4v/pmap.c
  projects/ppc64/sys/sys/nlist_aout.h
  projects/ppc64/sys/sys/param.h
  projects/ppc64/sys/sys/proc.h
  projects/ppc64/sys/vm/vm_page.c
  projects/ppc64/sys/vm/vm_page.h
  projects/ppc64/sys/vm/vm_pageout.c
  projects/ppc64/tools/tools/netrate/tcpp/tcpp.c
  projects/ppc64/tools/tools/netrate/tcpp/tcpp.h
  projects/ppc64/tools/tools/netrate/tcpp/tcpp_client.c
  projects/ppc64/tools/tools/netrate/tcpp/tcpp_server.c
  projects/ppc64/usr.bin/Makefile
  projects/ppc64/usr.bin/calendar/locale.c
  projects/ppc64/usr.bin/dc/bcode.c
  projects/ppc64/usr.bin/dc/dc.c
  projects/ppc64/usr.bin/gzip/gzip.c
  projects/ppc64/usr.bin/ipcs/ipc.c
  projects/ppc64/usr.bin/unzip/unzip.c
  projects/ppc64/usr.sbin/nfsdumpstate/nfsdumpstate.8
  projects/ppc64/usr.sbin/sysinstall/tcpip.c
  projects/ppc64/usr.sbin/timed/timed/timed.8
Directory Properties:
  projects/ppc64/   (props changed)
  projects/ppc64/cddl/contrib/opensolaris/   (props changed)
  projects/ppc64/contrib/ee/   (props changed)
  projects/ppc64/contrib/expat/   (props changed)
  projects/ppc64/contrib/file/   (props changed)
  projects/ppc64/contrib/gdb/   (props changed)
  projects/ppc64/contrib/gnu-sort/   (props changed)
  projects/ppc64/contrib/groff/   (props changed)
  projects/ppc64/contrib/less/   (props changed)
  projects/ppc64/contrib/libpcap/   (props changed)
  projects/ppc64/contrib/ncurses/   (props changed)
  projects/ppc64/contrib/one-true-awk/   (props changed)
  projects/ppc64/contrib/openbsm/   (props changed)
  projects/ppc64/contrib/openpam/   (props changed)
  projects/ppc64/contrib/pf/   (props changed)
  projects/ppc64/contrib/tcpdump/   (props changed)
  projects/ppc64/contrib/tcsh/   (props changed)
  projects/ppc64/contrib/tzcode/stdtime/   (props changed)
  projects/ppc64/contrib/tzcode/zic/   (props changed)
  projects/ppc64/contrib/tzdata/   (props changed)
  projects/ppc64/contrib/wpa/   (props changed)
  projects/ppc64/lib/libutil/   (props changed)
  projects/ppc64/lib/libz/   (props changed)
  projects/ppc64/sbin/   (props changed)
  projects/ppc64/sbin/ipfw/   (props changed)
  projects/ppc64/sys/   (props changed)
  projects/ppc64/sys/amd64/include/xen/   (props changed)
  projects/ppc64/sys/cddl/contrib/opensolaris/   (props changed)
  projects/ppc64/sys/contrib/dev/acpica/   (props changed)
  projects/ppc64/sys/contrib/x86emu/   (props changed)
  projects/ppc64/sys/dev/xen/xenpci/   (props changed)
  projects/ppc64/usr.bin/csup/   (props changed)
  projects/ppc64/usr.bin/procstat/   (props changed)

Modified: projects/ppc64/Makefile.inc1
==============================================================================
--- projects/ppc64/Makefile.inc1	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/Makefile.inc1	Fri Jun 11 03:00:48 2010	(r209027)
@@ -970,6 +970,13 @@ _gensnmptree=	usr.sbin/bsnmpd/gensnmptre
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
+# XXX: There is no way to specify bootstrap tools depending on MK-flags
+# with different per-architecture default values. Always build tblgen.
+_clang_tblgen= \
+	lib/clang/libllvmsupport \
+	lib/clang/libllvmsystem \
+	usr.bin/clang/tblgen
+
 .if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
@@ -977,6 +984,7 @@ _dtrace_tools= cddl/usr.bin/sgsmsg cddl/
 
 bootstrap-tools:
 .for _tool in \
+    ${_clang_tblgen} \
     ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \

Modified: projects/ppc64/bin/sh/jobs.c
==============================================================================
--- projects/ppc64/bin/sh/jobs.c	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/bin/sh/jobs.c	Fri Jun 11 03:00:48 2010	(r209027)
@@ -866,6 +866,7 @@ waitforjob(struct job *jp, int *origstat
 {
 #if JOBS
 	pid_t mypgrp = getpgrp();
+	int propagate_int = jp->jobctl && jp->foreground;
 #endif
 	int status;
 	int st;
@@ -903,6 +904,11 @@ waitforjob(struct job *jp, int *origstat
 		else
 			CLEAR_PENDING_INT;
 	}
+#if JOBS
+	else if (rootshell && iflag && propagate_int &&
+			WIFSIGNALED(status) && WTERMSIG(status) == SIGINT)
+		kill(getpid(), SIGINT);
+#endif
 	INTON;
 	return st;
 }

Modified: projects/ppc64/contrib/sendmail/mail.local/mail.local.8
==============================================================================
--- projects/ppc64/contrib/sendmail/mail.local/mail.local.8	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/contrib/sendmail/mail.local/mail.local.8	Fri Jun 11 03:00:48 2010	(r209027)
@@ -39,9 +39,7 @@ The options are as follows:
 Do not advertise 8BITMIME support in LMTP mode.
 .TP 
 .B \-B
-Turn off the attempts to notify the
-.Dq biff
-service.
+Turn off the attempts to notify the ``biff'' service.
 .TP 
 .B \-b
 Return a permanent error instead of a temporary error
@@ -63,11 +61,8 @@ Specify the sender's name.
 Turn on LMTP mode.
 .TP
 .B \-s
-Turn off the
-.Xr fsync 2
-call that forces the mailbox to be committed to disk before returning a
-.Dq success
-status.
+Turn off the fsync(2) call that forces the mailbox to be committed
+to disk before returning a "success" status.
 .TP 
 .BI \-r " from"
 Specify the sender's name (for backward compatibility).

Modified: projects/ppc64/etc/mtree/BSD.include.dist
==============================================================================
--- projects/ppc64/etc/mtree/BSD.include.dist	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/etc/mtree/BSD.include.dist	Fri Jun 11 03:00:48 2010	(r209027)
@@ -83,6 +83,10 @@
         scsi
         ..
     ..
+    clang
+        2.0
+        ..
+    ..
     crypto
     ..
     dev

Modified: projects/ppc64/lib/Makefile
==============================================================================
--- projects/ppc64/lib/Makefile	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/Makefile	Fri Jun 11 03:00:48 2010	(r209027)
@@ -108,7 +108,8 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libwrap \
 	liby \
 	libz \
-	${_bind}
+	${_bind} \
+	${_clang}
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
 _csu=csu/${MACHINE_ARCH}-elf
@@ -137,6 +138,10 @@ _libsdp=	libsdp
 _libbsnmp=	libbsnmp
 .endif
 
+.if ${MK_CLANG} != "no"
+_clang=		clang
+.endif
+
 .if ${MK_GPIB} != "no"
 _libgpib=	libgpib
 .endif

Modified: projects/ppc64/lib/libc/sys/flock.2
==============================================================================
--- projects/ppc64/lib/libc/sys/flock.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/flock.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -38,10 +38,10 @@
 .Lb libc
 .Sh SYNOPSIS
 .In sys/file.h
-.Fd "#define	LOCK_SH		0x01		/* shared file lock */"
-.Fd "#define	LOCK_EX		0x02		/* exclusive file lock */"
-.Fd "#define	LOCK_NB		0x04		/* do not block when locking */"
-.Fd "#define	LOCK_UN		0x08		/* unlock file */"
+.Fd "#define   LOCK_SH        0x01      /* shared file lock */"
+.Fd "#define   LOCK_EX        0x02      /* exclusive file lock */"
+.Fd "#define   LOCK_NB        0x04      /* do not block when locking */"
+.Fd "#define   LOCK_UN        0x08      /* unlock file */"
 .Ft int
 .Fn flock "int fd" "int operation"
 .Sh DESCRIPTION

Modified: projects/ppc64/lib/libc/sys/getitimer.2
==============================================================================
--- projects/ppc64/lib/libc/sys/getitimer.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/getitimer.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -39,9 +39,9 @@
 .Lb libc
 .Sh SYNOPSIS
 .In sys/time.h
-.Fd "#define ITIMER_REAL		0"
-.Fd "#define ITIMER_VIRTUAL	1"
-.Fd "#define ITIMER_PROF		2"
+.Fd "#define ITIMER_REAL      0"
+.Fd "#define ITIMER_VIRTUAL   1"
+.Fd "#define ITIMER_PROF      2"
 .Ft int
 .Fn getitimer "int which" "struct itimerval *value"
 .Ft int

Modified: projects/ppc64/lib/libc/sys/getrusage.2
==============================================================================
--- projects/ppc64/lib/libc/sys/getrusage.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/getrusage.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -40,9 +40,9 @@
 .In sys/types.h
 .In sys/time.h
 .In sys/resource.h
-.Fd "#define	RUSAGE_SELF	 0"
-.Fd "#define	RUSAGE_CHILDREN	-1"
-.Fd "#define	RUSAGE_THREAD	1"
+.Fd "#define    RUSAGE_SELF      0"
+.Fd "#define    RUSAGE_CHILDREN -1"
+.Fd "#define    RUSAGE_THREAD   1"
 .Ft int
 .Fn getrusage "int who" "struct rusage *rusage"
 .Sh DESCRIPTION

Modified: projects/ppc64/lib/libc/sys/mq_close.2
==============================================================================
--- projects/ppc64/lib/libc/sys/mq_close.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/mq_close.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -102,4 +102,4 @@ Electrical and Electronics Engineers, In
 event of any discrepancy between this version and the original IEEE and
 The Open Group Standard, the original IEEE and The Open Group Standard is
 the referee document.  The original Standard can be obtained online at
-	http://www.opengroup.org/unix/online.html.
+http://www.opengroup.org/unix/online.html.

Modified: projects/ppc64/lib/libc/sys/mq_getattr.2
==============================================================================
--- projects/ppc64/lib/libc/sys/mq_getattr.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/mq_getattr.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -124,4 +124,4 @@ Electrical and Electronics Engineers, In
 event of any discrepancy between this version and the original IEEE and
 The Open Group Standard, the original IEEE and The Open Group Standard is
 the referee document.  The original Standard can be obtained online at
-	http://www.opengroup.org/unix/online.html.
+http://www.opengroup.org/unix/online.html.

Modified: projects/ppc64/lib/libc/sys/mq_notify.2
==============================================================================
--- projects/ppc64/lib/libc/sys/mq_notify.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/mq_notify.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -148,4 +148,4 @@ Electrical and Electronics Engineers, In
 event of any discrepancy between this version and the original IEEE and
 The Open Group Standard, the original IEEE and The Open Group Standard is
 the referee document.  The original Standard can be obtained online at
-	http://www.opengroup.org/unix/online.html.
+http://www.opengroup.org/unix/online.html.

Modified: projects/ppc64/lib/libc/sys/mq_open.2
==============================================================================
--- projects/ppc64/lib/libc/sys/mq_open.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/mq_open.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -320,4 +320,4 @@ Electrical and Electronics Engineers, In
 event of any discrepancy between this version and the original IEEE and
 The Open Group Standard, the original IEEE and The Open Group Standard is
 the referee document.  The original Standard can be obtained online at
-	http://www.opengroup.org/unix/online.html.
+http://www.opengroup.org/unix/online.html.

Modified: projects/ppc64/lib/libc/sys/mq_receive.2
==============================================================================
--- projects/ppc64/lib/libc/sys/mq_receive.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/mq_receive.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -214,4 +214,4 @@ Electrical and Electronics Engineers, In
 event of any discrepancy between this version and the original IEEE and
 The Open Group Standard, the original IEEE and The Open Group Standard is
 the referee document.  The original Standard can be obtained online at
-	http://www.opengroup.org/unix/online.html.
+http://www.opengroup.org/unix/online.html.

Modified: projects/ppc64/lib/libc/sys/mq_send.2
==============================================================================
--- projects/ppc64/lib/libc/sys/mq_send.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/mq_send.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -233,4 +233,4 @@ Electrical and Electronics Engineers, In
 event of any discrepancy between this version and the original IEEE and
 The Open Group Standard, the original IEEE and The Open Group Standard is
 the referee document.  The original Standard can be obtained online at
-	http://www.opengroup.org/unix/online.html.
+http://www.opengroup.org/unix/online.html.

Modified: projects/ppc64/lib/libc/sys/mq_setattr.2
==============================================================================
--- projects/ppc64/lib/libc/sys/mq_setattr.2	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libc/sys/mq_setattr.2	Fri Jun 11 03:00:48 2010	(r209027)
@@ -120,4 +120,4 @@ Electrical and Electronics Engineers, In
 event of any discrepancy between this version and the original IEEE and
 The Open Group Standard, the original IEEE and The Open Group Standard is
 the referee document.  The original Standard can be obtained online at
-	http://www.opengroup.org/unix/online.html.
+http://www.opengroup.org/unix/online.html.

Modified: projects/ppc64/lib/libpmc/pmc.corei7.3
==============================================================================
--- projects/ppc64/lib/libpmc/pmc.corei7.3	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libpmc/pmc.corei7.3	Fri Jun 11 03:00:48 2010	(r209027)
@@ -613,7 +613,7 @@ Counter 0, 1 only
 .It Li L1D_CACHE_LOCK.HIT
 .Pq Event 42H , Umask 01H
 Counts retired load locks that hit in the L1 data cache or hit in an already
-allocated fill buffer.	The lock portion of the load lock transaction must
+allocated fill buffer. The lock portion of the load lock transaction must
 hit in the L1D.
 The initial load will pull the lock into the L1 data cache. Counter 0, 1
 only

Modified: projects/ppc64/lib/libpmc/pmc.corei7uc.3
==============================================================================
--- projects/ppc64/lib/libpmc/pmc.corei7uc.3	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libpmc/pmc.corei7uc.3	Fri Jun 11 03:00:48 2010	(r209027)
@@ -151,14 +151,14 @@ count is divided by this count to obtain
 .Pq Event 03H , Umask 08H
 Counts the number of GQ read tracker entries that are allocated in the read
 tracker, have missed in the L3 and have not acquired a Request Transaction
-ID.	The GQ read tracker L3 miss to RTID acquired occupancy count is
+ID. The GQ read tracker L3 miss to RTID acquired occupancy count is
 divided by this count to obtain the average latency for a read L3 miss to
 acquire an RTID.
 .It Li GQ_ALLOC.WT_TO_RTID_ACQUIRED
 .Pq Event 03H , Umask 10H
 Counts the number of GQ write tracker entries that are allocated in the
 write tracker, have missed in the L3 and have not acquired a Request
-Transaction ID.	The GQ write tracker L3 miss to RTID occupancy count is
+Transaction ID. The GQ write tracker L3 miss to RTID occupancy count is
 divided by this count to obtain the average latency for a write L3 miss to
 acquire an RTID.
 .It Li GQ_ALLOC.WRITE_TRACKER

Modified: projects/ppc64/lib/libpmc/pmc.westmereuc.3
==============================================================================
--- projects/ppc64/lib/libpmc/pmc.westmereuc.3	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/libpmc/pmc.westmereuc.3	Fri Jun 11 03:00:48 2010	(r209027)
@@ -157,14 +157,14 @@ count is divided by this count to obtain
 .Pq Event 03H , Umask 08H
 Counts the number of GQ read tracker entries that are allocated in the read
 tracker, have missed in the L3 and have not acquired a Request Transaction
-ID.	The GQ read tracker L3 miss to RTID acquired occupancy count is
+ID. The GQ read tracker L3 miss to RTID acquired occupancy count is
 divided by this count to obtain the average latency for a read L3 miss to
 acquire an RTID.
 .It Li GQ_ALLOC.WT_TO_RTID_ACQUIRED
 .Pq Event 03H , Umask 10H
 Counts the number of GQ write tracker entries that are allocated in the
 write tracker, have missed in the L3 and have not acquired a Request
-Transaction ID.	The GQ write tracker L3 miss to RTID occupancy count is
+Transaction ID. The GQ write tracker L3 miss to RTID occupancy count is
 divided by this count to obtain the average latency for a write L3 miss to
 acquire an RTID.
 .It Li GQ_ALLOC.WRITE_TRACKER

Modified: projects/ppc64/lib/librpcsec_gss/rpc_gss_seccreate.3
==============================================================================
--- projects/ppc64/lib/librpcsec_gss/rpc_gss_seccreate.3	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/librpcsec_gss/rpc_gss_seccreate.3	Fri Jun 11 03:00:48 2010	(r209027)
@@ -74,7 +74,7 @@ RPC headers and data are integrity prote
 RPC headers are integrity protected by a checksum and data is encrypted.
 .El
 .It qop
-Desired	quality of protection or NULL for the default.
+Desired quality of protection or NULL for the default.
 Available values are listed in /etc/gss/qop
 .It options_req
 Extra security context options to be passed to the underlying GSS-API

Modified: projects/ppc64/lib/msun/man/atan2.3
==============================================================================
--- projects/ppc64/lib/msun/man/atan2.3	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/lib/msun/man/atan2.3	Fri Jun 11 03:00:48 2010	(r209027)
@@ -66,12 +66,6 @@ functions compute the principal value of
 .Fa y/ Ns Ar x ,
 using the signs of both arguments to determine the quadrant of
 the return value.
-.ie '\*[.T]'utf8' \{\
-.  ds Th \[*h]
-.\}
-.el \{\
-.  ds Th theta
-.\}
 .Pp
 The
 .Fn carg ,
@@ -80,8 +74,8 @@ and
 .Fn cargl
 functions compute the complex argument (or phase angle) of
 .Fa z .
-The complex argument is the number \*(Th such that
-.Li z = r * e^(I * \*(Th) ,
+The complex argument is the number theta such that
+.Li z = r * e^(I * theta) ,
 where
 .Li r = cabs(z) .
 The call

Modified: projects/ppc64/release/doc/en_US.ISO8859-1/relnotes/article.sgml
==============================================================================
--- projects/ppc64/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Fri Jun 11 03:00:48 2010	(r209027)
@@ -313,6 +313,11 @@
         &man.clear.locks.8; command has been added to clear locks held
         on behalf of an NFS client.</para>
 
+      <para role="merged">The <application>ZFS</application> file system
+        has been upgraded to version 14.  Additional changes include
+        support for NFSv4 ACLs, a speedup of zfs send and an improved L2ARC.
+        New statistics for prefetch and L2ARC have been introduced.</para>
+
     </sect3>
   </sect2>
 

Modified: projects/ppc64/sbin/geom/misc/subr.c
==============================================================================
--- projects/ppc64/sbin/geom/misc/subr.c	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/sbin/geom/misc/subr.c	Fri Jun 11 03:00:48 2010	(r209027)
@@ -436,6 +436,7 @@ gctl_delete_param(struct gctl_req *req, 
 	if (i == req->narg)
 		return (ENOENT);
 
+	free(ap->name);
 	req->narg--;
 	while (i < req->narg) {
 		req->arg[i] = req->arg[i + 1];

Modified: projects/ppc64/share/man/man4/Makefile
==============================================================================
--- projects/ppc64/share/man/man4/Makefile	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/share/man/man4/Makefile	Fri Jun 11 03:00:48 2010	(r209027)
@@ -274,6 +274,7 @@ MAN=	aac.4 \
 	ng_nat.4 \
 	ng_netflow.4 \
 	ng_one2many.4 \
+	ng_patch.4 \
 	ng_ppp.4 \
 	ng_pppoe.4 \
 	ng_pptpgre.4 \

Copied: projects/ppc64/share/man/man4/ng_patch.4 (from r209023, head/share/man/man4/ng_patch.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ppc64/share/man/man4/ng_patch.4	Fri Jun 11 03:00:48 2010	(r209027, copy of r209023, head/share/man/man4/ng_patch.4)
@@ -0,0 +1,235 @@
+.\" Copyright (c) 2010 Maxim Ignatenko <gelraen.ua at gmail.com>
+.\" Copyright (c) 2010 Vadim Goncharov <vadimnuclight at tpu.ru>
+.\" 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.
+.\"
+.\" 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$
+.\"
+.Dd June 9, 2010
+.Dt NG_PATCH 4
+.Os
+.Sh NAME
+.Nm ng_patch
+.Nd "trivial mbuf data modifying netgraph node type"
+.Sh SYNOPSIS
+.In netgraph/ng_patch.h
+.Sh DESCRIPTION
+The
+.Nm patch
+node performs data modification of packets passing through it.
+Modifications are restricted to a subset of C language operations
+on unsigned integers of 8, 16, 32 or 64 bit size.
+These are: set to new value (=), addition (+=), subtraction (-=),
+multiplication (*=), division (/=), negation (= -),
+bitwise AND (&=), bitwise OR (|=), bitwise eXclusive OR (^=),
+shift left (<<=), shift right (>>=).
+A negation operation is the one exception: integer is treated as signed
+and second operand (the
+.Va value )
+is not used.
+There may be several modification operations, they are all applied
+to a packet sequentially in order they were specified by user.
+Data payload of packet is viewed as array of bytes, with zero offset
+corresponding to the very first byte of packet headers, and
+.Va length
+bytes beginning from
+.Va offset
+are taken as a single integer in network byte order.
+.Sh HOOKS
+This node type has two hooks:
+.Bl -tag -width indent
+.It Va in
+Packets received on this hook are modified according to rules specified
+in config and then forwarded to
+.Ar out
+hook, if it exists and connected.
+Otherwise they are reflected back to the
+.Ar in
+hook.
+.It Va out
+Packets received on this hook are forwarded to
+.Ar in
+hook without any changes.
+.El
+.Sh CONTROL MESSAGES
+This node type supports the generic control messages, plus the following:
+.Bl -tag -width indent
+.It Dv NGM_PATCH_SETCONFIG Pq Li setconfig
+This command sets the sequence of modify operations
+that will be applied to incoming data on a hook.
+The following
+.Vt "struct ng_patch_config"
+must be supplied as an argument:
+.Bd -literal -offset 4n
+struct ng_patch_op {
+	uint64_t	value;
+	uint32_t	offset;
+	uint16_t	length; /* 1,2,4 or 8 bytes */
+	uint16_t	mode;
+};
+/* Patching modes */
+#define NG_PATCH_MODE_SET	1
+#define NG_PATCH_MODE_ADD	2
+#define NG_PATCH_MODE_SUB	3
+#define NG_PATCH_MODE_MUL	4
+#define NG_PATCH_MODE_DIV	5
+#define NG_PATCH_MODE_NEG	6
+#define NG_PATCH_MODE_AND	7
+#define NG_PATCH_MODE_OR	8
+#define NG_PATCH_MODE_XOR	9
+#define NG_PATCH_MODE_SHL	10
+#define NG_PATCH_MODE_SHR	11
+
+struct ng_patch_config {
+	uint32_t	count;
+	uint32_t	csum_flags;
+	struct ng_patch_op ops[];
+};
+.Ed
+.Pp
+The
+.Va csum_flags
+can be set to any combination of CSUM_IP, CSUM_TCP, CSUM_SCTP and CSUM_UDP
+(other values are ignored) for instructing the IP stack to recalculate the
+corresponding checksum before transmitting packet on output interface.
+The
+.Nm
+node does not do any checksum correction by itself.
+.It Dv NGM_PATCH_GETCONFIG Pq Li getconfig
+This control message obtains current set of modify operations,
+returned as
+.Vt "struct ng_patch_config" .
+.It Dv NGM_PATCH_GET_STATS Pq Li getstats
+Returns node statistics as a
+.Vt "struct ng_patch_stats" .
+.It Dv NGM_PATCH_CLR_STATS Pq Li clrstats
+Clear node statistics.
+.It Dv NGM_PATCH_GETCLR_STATS Pq Li getclrstats
+This command is identical to
+.Dv NGM_PATCH_GET_STATS ,
+except that the statistics are also atomically cleared.
+.El
+.Sh SHUTDOWN
+This node shuts down upon receipt of a
+.Dv NGM_SHUTDOWN
+control message, or when all hooks have been disconnected.
+.Sh EXAMPLES
+The
+.Nm
+node allows to modify TTL and TOS/DSCP fields in IP packets.
+Suppose you have two adjacent simplex links to remote network
+(e.g.\& satellite), so that the packets expiring in between
+will generate unwanted ICMP-replies which have to go forth, not back.
+Thus you need to raise TTL of every packet entering link link by 2
+to ensure the TTL will not reach zero there.
+So you setup
+.Xr ipfw 8
+rule with
+.Cm netgraph
+action to inject packets going to other end of simplex link by the
+following
+.Xr ngctl 8
+script:
+.Bd -literal -offset 4n
+/usr/sbin/ngctl -f- <<-SEQ
+	mkpeer ipfw: patch 200 in
+	name ipfw:200 ttl_add
+	msg ttl_add: setconfig { count=1 csum_flags=1 ops=[	\e
+		{ mode=2 value=3 length=1 offset=8 } ] }
+SEQ
+/sbin/ipfw add 150 netgraph 200 ip from any to simplex.remote.net
+.Ed
+.Pp
+Here
+.Dq Li ttl_add
+node of type
+.Nm
+configured to add (mode 
+.Dv NG_PATCH_MODE_ADD )
+a
+.Va value
+of 3 to a one-byte TTL field, which is 9th byte of IP packet header.
+.Pp
+Another example would be two consecutive modifications of packet TOS
+field: say, you need to clear the
+.Dv IPTOS_THROUGHPUT
+bit and set the
+.Dv IPTOS_MINCOST
+bit.
+So you do:
+.Bd -literal -offset 4n
+/usr/sbin/ngctl -f- <<-SEQ
+	mkpeer ipfw: patch 300 in
+	name ipfw:300 tos_chg
+	msg tos_chg: setconfig { count=2 csum_flags=1 ops=[	\e
+		{ mode=7 value=0xf7 length=1 offset=1 }		\e
+		{ mode=8 value=0x02 length=1 offset=1 } ] }
+SEQ
+/sbin/ipfw add 160 netgraph 600 ip from any to any not dst-port 80
+.Ed
+.Pp
+This first does
+.Dv NG_PATCH_MODE_AND
+clearing the fourth bit and then
+.Dv NG_PATCH_MODE_OR
+setting the third bit.
+.Pp
+In both examples the
+.Va csum_flags
+field indicates that IP checksum (but not TCP or UDP checksum) should be
+recalculated before transmit.
+.Pp
+Note: one should ensure that packets are returned to ipfw after processing
+inside
+.Xr netgraph 4 ,
+by setting appropriate
+.Xr sysctl 8
+variable:
+.Bd -literal -offset 4n
+sysctl net.inet.ip.fw.one_pass=0
+.Ed
+.Sh SEE ALSO
+.Xr netgraph 4 ,
+.Xr ng_ipfw 4 ,
+.Xr ngctl 8
+.Sh HISTORY
+The
+.Nm
+node type was implemented in
+.Fx 8.1 .
+.Sh AUTHORS
+.An "Maxim Ignatenko" Aq gelraen.ua at gmail.com .
+This manual page was written by
+.An "Vadim Goncharov" Aq vadimnuclight at tpu.ru .
+.Sh BUGS
+Node blindly tries to apply every patching operation to each packet
+(except those which offset if greater than length of the packet),
+so be sure that you supply only the right packets to it (e.g. changing
+bytes in the ARP packets meant to be in IP header could corrupt
+them and make your machine unreachable from the network).
+.Pp
+.Em !!! WARNING !!!
+.Pp
+Output path of the IP stack assumes correct fields and lengths in the
+packets - changing them by mistake to incorrect values can cause
+unpredictable results including kernel panics.

Modified: projects/ppc64/share/man/man5/a.out.5
==============================================================================
--- projects/ppc64/share/man/man5/a.out.5	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/share/man/man5/a.out.5	Fri Jun 11 03:00:48 2010	(r209027)
@@ -35,7 +35,7 @@
 .\"	@(#)a.out.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd June 5, 1993
+.Dd June 10, 2010
 .Dt A.OUT 5
 .Os
 .Sh NAME
@@ -307,13 +307,13 @@ structures:
 .Bd -literal -offset indent
 struct nlist {
 	union {
-		char	*n_name;
-		long	n_strx;
+		const char	*n_name;
+		long		n_strx;
 	} n_un;
-	unsigned char	n_type;
-	char		n_other;
-	short		n_desc;
-	unsigned long	n_value;
+	unsigned char		n_type;
+	char			n_other;
+	short			n_desc;
+	unsigned long		n_value;
 };
 .Ed
 .Pp

Modified: projects/ppc64/share/man/man5/src.conf.5
==============================================================================
--- projects/ppc64/share/man/man5/src.conf.5	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/share/man/man5/src.conf.5	Fri Jun 11 03:00:48 2010	(r209027)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm
 .\" $FreeBSD$
-.Dd May 19, 2010
+.Dd June 10, 2010
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -247,6 +247,9 @@ When set, it also enforces the following
 .It
 .Va WITHOUT_ZFS
 .El
+.It Va WITHOUT_CLANG
+.\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG 208971 2010-06-10 06:20:26Z ed
+Set to not build the Clang C/C++ compiler.
 .It Va WITHOUT_CPP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru
 Set to not build
@@ -297,6 +300,10 @@ dynamically.
 .\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru
 Set to avoid installing examples to
 .Pa /usr/share/examples/ .
+.It Va WITH_FDT
+.\" from FreeBSD: head/tools/build/options/WITH_FDT 208537 2010-05-25 15:12:21Z raj
+Set to build Flattened Device Tree support as part of the base system. This
+includes the device tree compiler (dtc) and libfdt support library.
 .It Va WITHOUT_FLOPPY
 .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 183306 2008-09-23 16:15:42Z sam
 Set to not build or install programs 
@@ -799,6 +806,8 @@ When set, it also enforces the following
 .Pp
 .Bl -item -compact
 .It
+.Va WITHOUT_CLANG
+.It
 .Va WITHOUT_GDB
 .El
 .It Va WITHOUT_USB

Modified: projects/ppc64/share/man/man5/stab.5
==============================================================================
--- projects/ppc64/share/man/man5/stab.5	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/share/man/man5/stab.5	Fri Jun 11 03:00:48 2010	(r209027)
@@ -32,7 +32,7 @@
 .\"     @(#)stab.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd June 5, 1993
+.Dd June 10, 2010
 .Dt STAB 5
 .Os
 .Sh NAME
@@ -79,7 +79,7 @@ consists of the following structure:
 
 struct nlist {
 	union {
-		char	*n_name;	/* for use when in-core */
+		const char *n_name;	/* for use when in-core */
 		long	n_strx;		/* index into file string table */
 	} n_un;
 	unsigned char	n_type;		/* type flag */

Modified: projects/ppc64/share/mk/bsd.own.mk
==============================================================================
--- projects/ppc64/share/mk/bsd.own.mk	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/share/mk/bsd.own.mk	Fri Jun 11 03:00:48 2010	(r209027)
@@ -288,6 +288,18 @@ _no_fdt= FDT
 .endif
 
 #
+# Default behaviour of MK_CLANG depends on the architecture.
+#
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "powerpc"
+_clang_yes=CLANG
+_clang_no=
+.else
+_clang_yes=
+_clang_no=CLANG
+.endif
+
+#
 # MK_* options which default to "yes".
 #
 .for var in \
@@ -314,6 +326,7 @@ _no_fdt= FDT
     BZIP2 \
     CALENDAR \
     CDDL \
+    ${_clang_yes} \
     CPP \
     CRYPT \
     CTM \
@@ -417,6 +430,7 @@ MK_${var}:=	yes
     BIND_LIBS \
     BIND_SIGCHASE \
     BIND_XML \
+    ${_clang_no} \
     ${_no_fdt} \
     HESIOD \
     IDEA
@@ -497,6 +511,7 @@ MK_GROFF:=	no
 .endif
 
 .if ${MK_TOOLCHAIN} == "no"
+MK_CLANG:=	no
 MK_GDB:=	no
 .endif
 

Modified: projects/ppc64/sys/amd64/amd64/fpu.c
==============================================================================
--- projects/ppc64/sys/amd64/amd64/fpu.c	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/sys/amd64/amd64/fpu.c	Fri Jun 11 03:00:48 2010	(r209027)
@@ -453,8 +453,8 @@ fpudrop()
 int
 fpugetuserregs(struct thread *td, struct savefpu *addr)
 {
-	register_t s;
 	struct pcb *pcb;
+	register_t s;
 
 	pcb = td->td_pcb;
 	if ((pcb->pcb_flags & PCB_USERFPUINITDONE) == 0) {
@@ -477,8 +477,8 @@ fpugetuserregs(struct thread *td, struct
 int
 fpugetregs(struct thread *td, struct savefpu *addr)
 {
-	register_t s;
 	struct pcb *pcb;
+	register_t s;
 
 	pcb = td->td_pcb;
 	if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) {
@@ -504,8 +504,8 @@ fpugetregs(struct thread *td, struct sav
 void
 fpusetuserregs(struct thread *td, struct savefpu *addr)
 {
-	register_t s;
 	struct pcb *pcb;
+	register_t s;
 
 	pcb = td->td_pcb;
 	s = intr_disable();
@@ -525,8 +525,8 @@ fpusetuserregs(struct thread *td, struct
 void
 fpusetregs(struct thread *td, struct savefpu *addr)
 {
-	register_t s;
 	struct pcb *pcb;
+	register_t s;
 
 	pcb = td->td_pcb;
 	s = intr_disable();

Modified: projects/ppc64/sys/amd64/amd64/pmap.c
==============================================================================
--- projects/ppc64/sys/amd64/amd64/pmap.c	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/sys/amd64/amd64/pmap.c	Fri Jun 11 03:00:48 2010	(r209027)
@@ -3899,30 +3899,35 @@ pmap_page_exists_quick(pmap_t pmap, vm_p
 	struct md_page *pvh;
 	pv_entry_t pv;
 	int loops = 0;
+	boolean_t rv;
 
-	if (m->flags & PG_FICTITIOUS)
-		return (FALSE);
-
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0,
+	    ("pmap_page_exists_quick: page %p is not managed", m));
+	rv = FALSE;
+	vm_page_lock_queues();
 	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
 		if (PV_PMAP(pv) == pmap) {
-			return (TRUE);
+			rv = TRUE;
+			break;
 		}
 		loops++;
 		if (loops >= 16)
 			break;
 	}
-	if (loops < 16) {
+	if (!rv && loops < 16) {
 		pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 		TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) {
-			if (PV_PMAP(pv) == pmap)
-				return (TRUE);
+			if (PV_PMAP(pv) == pmap) {
+				rv = TRUE;
+				break;
+			}
 			loops++;
 			if (loops >= 16)
 				break;
 		}
 	}
-	return (FALSE);
+	vm_page_unlock_queues();
+	return (rv);
 }
 
 /*
@@ -4335,10 +4340,10 @@ pmap_ts_referenced(vm_page_t m)
 	vm_offset_t va;
 	int rtval = 0;
 
-	if (m->flags & PG_FICTITIOUS)
-		return (rtval);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0,
+	    ("pmap_ts_referenced: page %p is not managed", m));
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
+	vm_page_lock_queues();
 	TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, pvn) {
 		pmap = PV_PMAP(pv);
 		PMAP_LOCK(pmap);
@@ -4362,7 +4367,7 @@ pmap_ts_referenced(vm_page_t m)
 					rtval++;
 					if (rtval > 4) {
 						PMAP_UNLOCK(pmap);
-						return (rtval);
+						goto out;
 					}
 				}
 			}
@@ -4391,6 +4396,8 @@ pmap_ts_referenced(vm_page_t m)
 			PMAP_UNLOCK(pmap);
 		} while ((pv = pvn) != NULL && pv != pvf);
 	}
+out:
+	vm_page_unlock_queues();
 	return (rtval);
 }
 

Modified: projects/ppc64/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- projects/ppc64/sys/amd64/linux32/linux32_machdep.c	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/sys/amd64/linux32/linux32_machdep.c	Fri Jun 11 03:00:48 2010	(r209027)
@@ -835,9 +835,13 @@ linux_mmap_common(struct thread *td, l_u
 		bsd_args.flags |= MAP_PRIVATE;
 	if (flags & LINUX_MAP_FIXED)
 		bsd_args.flags |= MAP_FIXED;
-	if (flags & LINUX_MAP_ANON)
+	if (flags & LINUX_MAP_ANON) {
+		/* Enforce pos to be on page boundary, then ignore. */
+		if ((pos & PAGE_MASK) != 0)
+			return (EINVAL);
+		pos = 0;
 		bsd_args.flags |= MAP_ANON;
-	else
+	} else
 		bsd_args.flags |= MAP_NOSYNC;
 	if (flags & LINUX_MAP_GROWSDOWN)
 		bsd_args.flags |= MAP_STACK;

Modified: projects/ppc64/sys/arm/arm/pmap.c
==============================================================================
--- projects/ppc64/sys/arm/arm/pmap.c	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/sys/arm/arm/pmap.c	Fri Jun 11 03:00:48 2010	(r209027)
@@ -1423,7 +1423,7 @@ pmap_clearbit(struct vm_page *pg, u_int 
 	u_int oflags;
 	int count = 0;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	vm_page_lock_queues();
 
 	if (maskbits & PVF_WRITE)
 		maskbits |= PVF_MOD;
@@ -1433,6 +1433,7 @@ pmap_clearbit(struct vm_page *pg, u_int 
 	pg->md.pvh_attrs &= ~(maskbits & (PVF_MOD | PVF_REF));
 
 	if (TAILQ_EMPTY(&pg->md.pv_list)) {
+		vm_page_unlock_queues();
 		return (0);
 	}
 
@@ -1568,6 +1569,7 @@ pmap_clearbit(struct vm_page *pg, u_int 
 
 	if (maskbits & PVF_WRITE)
 		vm_page_flag_clear(pg, PG_WRITEABLE);
+	vm_page_unlock_queues();
 	return (count);
 }
 
@@ -4417,24 +4419,23 @@ pmap_page_exists_quick(pmap_t pmap, vm_p
 {
 	pv_entry_t pv;
 	int loops = 0;
+	boolean_t rv;
 	
-	if (m->flags & PG_FICTITIOUS)
-		return (FALSE);
-		
-	/*
-	 * Not found, check current mappings returning immediately
-	 */
-	for (pv = TAILQ_FIRST(&m->md.pv_list);
-	    pv;
-	    pv = TAILQ_NEXT(pv, pv_list)) {
+	KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0,
+	    ("pmap_page_exists_quick: page %p is not managed", m));
+	rv = FALSE;
+	vm_page_lock_queues();
+	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
 	    	if (pv->pv_pmap == pmap) {
-	    		return (TRUE);
+			rv = TRUE;
+			break;
 	    	}
 		loops++;
 		if (loops >= 16)
 			break;
 	}
-	return (FALSE);
+	vm_page_unlock_queues();
+	return (rv);
 }
 
 /*
@@ -4469,8 +4470,8 @@ int
 pmap_ts_referenced(vm_page_t m)
 {
 
-	if (m->flags & PG_FICTITIOUS)
-		return (0);
+	KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0,
+	    ("pmap_ts_referenced: page %p is not managed", m));
 	return (pmap_clearbit(m, PVF_REF));
 }
 
@@ -4508,10 +4509,8 @@ pmap_clear_modify(vm_page_t m)
 	 */
 	if ((m->flags & PG_WRITEABLE) == 0)
 		return;
-	vm_page_lock_queues();
 	if (m->md.pvh_attrs & PVF_MOD)
 		pmap_clearbit(m, PVF_MOD);
-	vm_page_unlock_queues();
 }
 
 
@@ -4541,10 +4540,8 @@ pmap_clear_reference(vm_page_t m)
 
 	KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0,
 	    ("pmap_clear_reference: page %p is not managed", m));
-	vm_page_lock_queues();
 	if (m->md.pvh_attrs & PVF_REF) 
 		pmap_clearbit(m, PVF_REF);
-	vm_page_unlock_queues();
 }
 
 
@@ -4565,11 +4562,8 @@ pmap_remove_write(vm_page_t m)
 	 */
 	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if ((m->oflags & VPO_BUSY) != 0 ||
-	    (m->flags & PG_WRITEABLE) != 0) {
-		vm_page_lock_queues();
+	    (m->flags & PG_WRITEABLE) != 0)
 		pmap_clearbit(m, PVF_WRITE);
-		vm_page_unlock_queues();
-	}
 }
 
 

Modified: projects/ppc64/sys/cam/cam_debug.h
==============================================================================
--- projects/ppc64/sys/cam/cam_debug.h	Fri Jun 11 03:00:32 2010	(r209026)
+++ projects/ppc64/sys/cam/cam_debug.h	Fri Jun 11 03:00:48 2010	(r209027)
@@ -40,7 +40,8 @@ typedef enum {
 	CAM_DEBUG_SUBTRACE	= 0x04,	/* internal to routine flows */
 	CAM_DEBUG_CDB		= 0x08, /* print out SCSI CDBs only */
 	CAM_DEBUG_XPT		= 0x10,	/* print out xpt scheduling */
-	CAM_DEBUG_PERIPH	= 0x20  /* print out peripheral calls */
+	CAM_DEBUG_PERIPH	= 0x20, /* print out peripheral calls */
+	CAM_DEBUG_PROBE		= 0x40  /* print out probe actions */
 } cam_debug_flags;
 
 #if defined(CAMDEBUG) && defined(_KERNEL)
@@ -58,6 +59,7 @@ extern u_int32_t cam_debug_delay;
 	 && (cam_dpath != NULL)				\
 	 && (xpt_path_comp(cam_dpath, path) >= 0)	\
 	 && (xpt_path_comp(cam_dpath, path) < 2))
+
 #define	CAM_DEBUG(path, flag, printfargs)		\
 	if ((cam_dflags & (flag))			\
 	 && (cam_dpath != NULL)				\
@@ -68,6 +70,7 @@ extern u_int32_t cam_debug_delay;
 		if (cam_debug_delay != 0)		\
 			DELAY(cam_debug_delay);		\
 	}
+
 #define	CAM_DEBUG_PRINT(flag, printfargs)		\
 	if (cam_dflags & (flag)) {			\
 		printf("cam_debug: ");			\
@@ -76,11 +79,20 @@ extern u_int32_t cam_debug_delay;
 			DELAY(cam_debug_delay);		\
 	}
 
+#define	CAM_DEBUG_PATH_PRINT(flag, path, printfargs)	\
+	if (cam_dflags & (flag)) {			\
+		xpt_print(path, "cam_debug: ");		\
+ 		printf printfargs;			\
+		if (cam_debug_delay != 0)		\
+			DELAY(cam_debug_delay);		\
+	}
+
 #else /* !CAMDEBUG || !_KERNEL */
 
 #define	CAM_DEBUGGED(A, B)	0
 #define	CAM_DEBUG(A, B, C)
 #define	CAM_DEBUG_PRINT(A, B)
+#define	CAM_DEBUG_PATH_PRINT(A, B, C)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-projects mailing list