PERFORCE change 74975 for review

David Xu davidxu at FreeBSD.org
Tue Apr 12 05:07:38 PDT 2005


http://perforce.freebsd.org/chv.cgi?CH=74975

Change 74975 by davidxu at davidxu_alona on 2005/04/12 12:06:52

	IFC

Affected files ...

.. //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#10 integrate
.. //depot/projects/davidxu_thread/src/etc/rc.d/random#2 integrate
.. //depot/projects/davidxu_thread/src/games/fortune/datfiles/fortunes#8 integrate
.. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#12 integrate
.. //depot/projects/davidxu_thread/src/include/pthread.h#4 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/Makefile.inc#4 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bcmp.S#2 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/strcat.S#1 branch
.. //depot/projects/davidxu_thread/src/lib/libc/amd64/string/strcpy.S#1 branch
.. //depot/projects/davidxu_thread/src/lib/libthr/Makefile#5 integrate
.. //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#10 integrate
.. //depot/projects/davidxu_thread/src/lib/libthr/thread/Makefile.inc#4 integrate
.. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#10 integrate
.. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#12 integrate
.. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_exit.c#7 integrate
.. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_init.c#9 integrate
.. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_list.c#5 integrate
.. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#17 integrate
.. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#9 integrate
.. //depot/projects/davidxu_thread/src/lib/libthread_db/libc_r_db.c#3 integrate
.. //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#8 integrate
.. //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#12 integrate
.. //depot/projects/davidxu_thread/src/lib/libthread_db/thread_db.h#5 integrate
.. //depot/projects/davidxu_thread/src/lib/libutil/humanize_number.3#2 integrate
.. //depot/projects/davidxu_thread/src/libexec/save-entropy/save-entropy.sh#2 integrate
.. //depot/projects/davidxu_thread/src/share/man/man4/cpufreq.4#4 integrate
.. //depot/projects/davidxu_thread/src/share/man/man4/mac_bsdextended.4#2 integrate
.. //depot/projects/davidxu_thread/src/share/misc/bsd-family-tree#4 integrate
.. //depot/projects/davidxu_thread/src/share/mk/bsd.files.mk#2 integrate
.. //depot/projects/davidxu_thread/src/share/mk/bsd.incs.mk#2 integrate
.. //depot/projects/davidxu_thread/src/share/mk/bsd.init.mk#4 integrate
.. //depot/projects/davidxu_thread/src/share/mk/bsd.lib.mk#4 integrate
.. //depot/projects/davidxu_thread/src/share/mk/bsd.nls.mk#5 integrate
.. //depot/projects/davidxu_thread/src/share/mk/bsd.obj.mk#4 integrate
.. //depot/projects/davidxu_thread/src/share/mk/bsd.own.mk#3 integrate
.. //depot/projects/davidxu_thread/src/share/mk/bsd.prog.mk#4 integrate
.. //depot/projects/davidxu_thread/src/sys/amd64/amd64/support.S#2 integrate
.. //depot/projects/davidxu_thread/src/sys/amd64/include/asm.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/hal_var.h#4 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/kern_ndis.c#7 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/kern_windrv.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/ndis_var.h#7 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/ntoskrnl_var.h#5 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/pe_var.h#4 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/subr_hal.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/subr_ndis.c#7 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/subr_ntoskrnl.c#7 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/subr_usbd.c#2 integrate
.. //depot/projects/davidxu_thread/src/sys/compat/ndis/winx32_wrap.S#1 branch
.. //depot/projects/davidxu_thread/src/sys/conf/files.i386#11 integrate
.. //depot/projects/davidxu_thread/src/sys/conf/kmod.mk#7 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_cpu.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_throttle.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpivar.h#10 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#6 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-chipset.c#8 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/if_ndis/if_ndis.c#8 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/pccard/pccard.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/pccard/pccardvar.h#3 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/pci/pci.c#10 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/usb/ucom.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/fs/nullfs/null_subr.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/fs/nullfs/null_vfsops.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/fs/smbfs/smbfs_vnops.c#8 integrate
.. //depot/projects/davidxu_thread/src/sys/geom/geom_sunlabel.c#2 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/cpufreq/est.c#4 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/cpufreq/p4tcc.c#2 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/kern_cpu.c#4 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/kern_lock.c#9 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/kern_shutdown.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/kern_sig.c#9 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/subr_bus.c#10 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/subr_rman.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/vfs_subr.c#11 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/vfs_vnops.c#9 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/vnode_if.src#5 integrate
.. //depot/projects/davidxu_thread/src/sys/modules/ndis/Makefile#4 integrate
.. //depot/projects/davidxu_thread/src/sys/netgraph/netflow/netflow.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/tcp_input.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/tcp_sack.c#7 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/tcp_seq.h#3 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/tcp_subr.c#8 integrate
.. //depot/projects/davidxu_thread/src/sys/netipx/README#5 integrate
.. //depot/projects/davidxu_thread/src/sys/netipx/ipx_input.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/include/apicreg.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/include/apicvar.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/include/ioctl_bt848.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/include/ioctl_meteor.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/include/pcaudioio.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/include/pcvt_ioctl.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/include/smptests.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/sys/bus.h#8 integrate
.. //depot/projects/davidxu_thread/src/sys/sys/rman.h#3 integrate
.. //depot/projects/davidxu_thread/src/sys/sys/vnode.h#10 integrate
.. //depot/projects/davidxu_thread/src/sys/tools/vnode_if.awk#5 integrate
.. //depot/projects/davidxu_thread/src/tools/tools/syscall_timing/syscall_timing.c#2 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.freebsd#11 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/make/cond.c#8 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/make/cond.h#3 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/make/for.c#8 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/make/for.h#2 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/make/main.c#10 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/make/parse.c#12 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/make/parse.h#3 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/netstat/inet.c#5 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/printf/printf.c#3 integrate
.. //depot/projects/davidxu_thread/src/usr.sbin/mount_portalfs/mount_portalfs.8#4 integrate
.. //depot/projects/davidxu_thread/src/usr.sbin/powerd/powerd.8#3 integrate
.. //depot/projects/davidxu_thread/src/usr.sbin/powerd/powerd.c#2 integrate
.. //depot/projects/davidxu_thread/src/usr.sbin/sysinstall/config.c#2 integrate

Differences ...

==== //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#10 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.244 2005/04/03 21:45:20 njl Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.246 2005/04/11 02:45:05 dougb Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -459,7 +459,7 @@
 update_motd="YES"	# update version info in /etc/motd (or NO)
 unaligned_print="YES"	# print unaligned access warnings on the alpha (or NO).
 entropy_file="/entropy"	# Set to NO to disable caching entropy through reboots.
-			# /var/db/entropy is preferred if / is not available.
+			# /var/db/entropy-file is preferred if / is not avail.
 entropy_dir="/var/db/entropy" # Set to NO to disable caching entropy via cron.
 entropy_save_sz="2048"	# Size of the entropy cache files.
 entropy_save_num="8"	# Number of entropy cache files to save.
@@ -474,9 +474,9 @@
 devfs_set_rulesets=""	# A list of /mount/dev=ruleset_name settings to
 			# apply (must be mounted already, i.e. fstab(5))
 performance_cx_lowest="HIGH"		# Online CPU idle state
-performance_cpu_freq="HIGH"		# Online CPU frequency
+performance_cpu_freq="NONE"		# Online CPU frequency
 economy_cx_lowest="HIGH"		# Offline CPU idle state
-economy_cpu_freq="HIGH"			# Offline CPU frequency
+economy_cpu_freq="NONE"			# Offline CPU frequency
 virecover_enable="YES"	# Perform housekeeping for the vi(1) editor
 ugidfw_enable="NO"	# Load mac_bsdextended(4) rules on boot
 bsdextended_script="/etc/rc.bsdextended"	# Default mac_bsdextended(4)

==== //depot/projects/davidxu_thread/src/etc/rc.d/random#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/random,v 1.7 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/random,v 1.8 2005/04/11 02:45:05 dougb Exp $
 #
 
 # PROVIDE: random
@@ -68,15 +68,14 @@
 		else
 			# Try this as a reasonable alternative for read-only
 			# roots, diskless workstations, etc.
-			rm -f /var/db/entropy
-			if touch /var/db/entropy; then
-				entropy_file_confirmed=/var/db/entropy
+			rm -f /var/db/entropy-file
+			if touch /var/db/entropy-file; then
+				entropy_file_confirmed=/var/db/entropy-file
 			fi
 		fi
 		case ${entropy_file_confirmed} in
 		'')
-			err 1 '${entropy_file_confirmed}:' \
-			    ' entropy file write failed.'
+			err 1 'entropy file write failed.'
 			;;
 		*)
 			dd if=/dev/random of=${entropy_file_confirmed} \

==== //depot/projects/davidxu_thread/src/games/fortune/datfiles/fortunes#8 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.173 2005/03/22 07:41:22 phk Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.174 2005/04/10 10:53:26 schweikh Exp $
 
 %
 =======================================================================
@@ -45695,7 +45695,7 @@
 The cart has no place where a fifth wheel could be used.
 		-- Herbert von Fritzlar
 %
-The Celts invented two things, Whiskey and self-distruction.
+The Celts invented two things, Whiskey and self-destruction.
 %
 "The chain which can be yanked is not the eternal chain."
 		-- G. Fitch
@@ -45713,7 +45713,7 @@
 The chief danger in life is that you may take too many precautions.
 		-- Alfred Adler
 %
-The chief enemy of creativity is "good" sense
+The chief enemy of creativity is "good" sense.
 		-- Picasso
 %
 The church is near but the road is icy,

==== //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#12 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.10 2005/04/05 11:40:58 davidxu Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.11 2005/04/12 03:04:04 davidxu Exp $ */
 /* FreeBSD libthread_db assisted debugging support.
    Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
 

==== //depot/projects/davidxu_thread/src/include/pthread.h#4 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/pthread.h,v 1.34 2005/04/03 23:55:02 davidxu Exp $
+ * $FreeBSD: src/include/pthread.h,v 1.35 2005/04/11 03:47:42 davidxu Exp $
  */
 #ifndef _PTHREAD_H_
 #define _PTHREAD_H_
@@ -50,7 +50,7 @@
  */
 #define PTHREAD_DESTRUCTOR_ITERATIONS		4
 #define PTHREAD_KEYS_MAX			256
-#define PTHREAD_STACK_MIN			1024
+#define PTHREAD_STACK_MIN			MINSIGSTKSZ
 #define PTHREAD_THREADS_MAX			ULONG_MAX
 #define PTHREAD_BARRIER_SERIAL_THREAD		-1
 

==== //depot/projects/davidxu_thread/src/lib/libc/amd64/string/Makefile.inc#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/amd64/string/Makefile.inc,v 1.3 2005/04/09 20:47:08 alc Exp $
+# $FreeBSD: src/lib/libc/amd64/string/Makefile.inc,v 1.5 2005/04/10 18:58:49 alc Exp $
 
 MDSRCS+= bcmp.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \
-	strcmp.S
+	strcat.S strcmp.S strcpy.S

==== //depot/projects/davidxu_thread/src/lib/libc/amd64/string/bcmp.S#2 (text+ko) ====

@@ -1,12 +1,11 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcmp.S,v 1.1 2005/04/08 05:15:55 alc Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcmp.S,v 1.2 2005/04/10 18:12:06 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: bcmp.S,v 1.1 2001/06/19 00:25:04 fvdl Exp $")
 #endif
 
 ENTRY(bcmp)
-	xorl	%eax,%eax		/* clear return value */
 	cld				/* set compare direction forward */
 
 	movq	%rdx,%rcx		/* compare by words */
@@ -19,7 +18,7 @@
 	andq	$7,%rcx
 	repe
 	cmpsb
-	je	L2
-
-L1:	incl	%eax
-L2:	ret
+L1:
+	setne	%al
+	movsbl	%al,%eax
+	ret

==== //depot/projects/davidxu_thread/src/lib/libthr/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.10 2005/04/06 13:48:11 davidxu Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.11 2005/04/12 03:00:28 davidxu Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does

==== //depot/projects/davidxu_thread/src/lib/libthr/pthread.map#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/pthread.map,v 1.2 2005/04/03 23:52:29 davidxu Exp $
+# $FreeBSD: src/lib/libthr/pthread.map,v 1.3 2005/04/12 03:00:28 davidxu Exp $
 LIBPTHREAD_1_0 {
 global:
 	___creat;
@@ -353,8 +353,8 @@
 	_thread_max_keys;
 	_thread_off_attr_flags;
 	_thread_off_dtv;
+	_thread_off_event_buf;
 	_thread_off_event_mask;
-	_thread_off_event_buf;
 	_thread_off_key_allocated;
 	_thread_off_key_destructor;
 	_thread_off_linkmap;

==== //depot/projects/davidxu_thread/src/lib/libthr/thread/Makefile.inc#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.9 2005/04/02 01:20:00 davidxu Exp $
+# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.10 2005/04/12 03:00:28 davidxu Exp $
 
 # thr sources
 .PATH: ${.CURDIR}/thread

==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#10 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.20 2005/04/02 01:20:00 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.21 2005/04/12 03:00:28 davidxu Exp $
  */
 
 #include <errno.h>

==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_event.c#12 (text+ko) ====


==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_exit.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/lib/libthr/thread/thr_exit.c,v 1.17 2005/04/02 01:20:00 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.18 2005/04/12 03:00:28 davidxu Exp $
  */
 
 #include <errno.h>

==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_init.c#9 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.21 2005/04/06 13:57:31 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.23 2005/04/12 03:13:49 davidxu Exp $
  */
 
 /* Allocate space for global thread variables here: */
@@ -309,7 +309,8 @@
 		_thr_initial = curthread;
 		SIGDELSET(oldset, SIGCANCEL);
 		__sys_sigprocmask(SIG_SETMASK, &oldset, NULL);
-		_thr_report_create(curthread, curthread);
+		if (_thread_event_mask & TD_CREATE)
+			_thr_report_creation(curthread, curthread);
 	}
 }
 

==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_list.c#5 (text+ko) ====

@@ -24,7 +24,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_list.c,v 1.3 2005/04/07 06:09:17 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_list.c,v 1.4 2005/04/12 03:00:28 davidxu Exp $
  */
 
 #include <sys/types.h>

==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#17 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.45 2005/04/06 13:57:31 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.46 2005/04/12 03:00:28 davidxu Exp $
  */
 
 #ifndef _THR_PRIVATE_H

==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_symbols.c#9 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_symbols.c,v 1.1 2005/04/02 01:20:00 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_symbols.c,v 1.2 2005/04/12 03:00:28 davidxu Exp $
  */
 
 #include <stddef.h>

==== //depot/projects/davidxu_thread/src/lib/libthread_db/libc_r_db.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libthread_db/libc_r_db.c,v 1.1 2004/07/18 04:17:13 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libc_r_db.c,v 1.2 2005/04/12 03:03:16 davidxu Exp $");
 
 #include <machine/setjmp.h>
 #include <proc_service.h>

==== //depot/projects/davidxu_thread/src/lib/libthread_db/libpthread_db.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libthread_db/libpthread_db.c,v 1.7 2005/04/05 11:38:30 davidxu Exp $");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libpthread_db.c,v 1.8 2005/04/12 03:03:16 davidxu Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>

==== //depot/projects/davidxu_thread/src/lib/libthread_db/libthr_db.c#12 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.4 2005/04/05 11:38:30 davidxu Exp $");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.5 2005/04/12 03:03:16 davidxu Exp $");
 
 #include <proc_service.h>
 #include <stddef.h>
@@ -57,7 +57,6 @@
 	psaddr_t	thread_event_mask_addr;
 	psaddr_t	thread_bp_create_addr;
 	psaddr_t	thread_bp_death_addr;
-	int		thread_inited;
 	int		thread_off_dtv;
 	int		thread_off_tlsindex;
 	int		thread_off_attr_flags;
@@ -72,6 +71,7 @@
 	int		thread_off_key_destructor;
 	int		thread_off_report_events;
 	int		thread_off_event_mask;
+	int		thread_off_event_buf;
 	int		thread_state_zoombie;
 	int		thread_state_running;
 	struct pt_map	*map;
@@ -136,7 +136,7 @@
 			              sizeof(struct pt_map) * ta->map_len * 2);
 			if (new == NULL)
 				return (-1);
-			memset(new + ta->map_len, '\0', sizeof(struct pt_map) *
+			memset(new + ta->map_len, 0, sizeof(struct pt_map) *
 			       ta->map_len);
 			first = ta->map_len;
 			ta->map = new;
@@ -218,9 +218,9 @@
 	LOOKUP_VAL(ph, "_thread_off_key_destructor", &ta->thread_off_key_destructor);
 	LOOKUP_VAL(ph, "_thread_state_running", &ta->thread_state_running);
 	LOOKUP_VAL(ph, "_thread_state_zoombie", &ta->thread_state_zoombie);
-	LOOKUP_VAL(ph, "_thread_off_report_events",
-			&ta->thread_off_report_events);
+	LOOKUP_VAL(ph, "_thread_off_report_events", &ta->thread_off_report_events);
 	LOOKUP_VAL(ph, "_thread_off_event_mask", &ta->thread_off_event_mask);
+	LOOKUP_VAL(ph, "_thread_off_event_buf", &ta->thread_off_event_buf);
 	dbg = getpid();
 	/*
 	 * If this fails it probably means we're debugging a core file and
@@ -488,21 +488,30 @@
 {
 	static td_thrhandle_t handle;
 
-	psaddr_t pt;
+	psaddr_t pt, pt_temp;
 	long lwp;
 	int ret;
-	int tmp;
+	td_thr_events_e	tmp;
 
 	TDBG_FUNC();
 
-	ret = ps_pread(ta->ph, ta->thread_event_addr, msg, sizeof(*msg));
+	ret = ps_pread(ta->ph, ta->thread_last_event_addr, &pt, sizeof(pt));
+	if (ret != 0)
+		return (P2T(ret));
+	if (pt == NULL)
+		return (TD_NOMSG);
+	/* At the time, libthr only reports event once a time. */
+	pt_temp = NULL;
+	ps_pwrite(ta->ph, ta->thread_last_event_addr, &pt_temp, sizeof(pt_temp));
+
+	ret = ps_pread(ta->ph, pt + ta->thread_off_event_buf, msg, sizeof(*msg));
 	if (ret != 0)
 		return (P2T(ret));
 	if (msg->event == 0)
 		return (TD_NOMSG);
 	/* clear event */
 	tmp = 0;
-	ps_pwrite(ta->ph, ta->thread_event_addr, &tmp, sizeof(int));
+	ps_pwrite(ta->ph, pt + ta->thread_off_event_buf, &tmp, sizeof(tmp));
 	pt = (psaddr_t)msg->th_p;
 	ret = ps_pread(ta->ph, pt + ta->thread_off_tid, &lwp, sizeof(lwp));
 	if (ret != 0)
@@ -715,8 +724,41 @@
 static td_err_e
 pt_thr_event_getmsg(const td_thrhandle_t *th, td_event_msg_t *msg)
 {
+	static td_thrhandle_t handle;
+	td_thragent_t *ta = (td_thragent_t *)th->th_ta;
+	psaddr_t pt, pt_temp;
+	long lwp;
+	int ret;
+	td_thr_events_e	tmp;
+
 	TDBG_FUNC();
-	return (TD_NOMSG);
+	pt = th->th_thread;
+	ret = ps_pread(ta->ph, ta->thread_last_event_addr, &pt_temp, sizeof(pt_temp));
+	if (ret != 0)
+		return (P2T(ret));
+	/* get event */
+	ret = ps_pread(ta->ph, pt + ta->thread_off_event_buf, msg, sizeof(*msg));
+	if (ret != 0)
+		return (P2T(ret));
+	if (msg->event == 0)
+		return (TD_NOMSG);
+	/* clear event, at the time, libthr only reports event once a time. */
+	if (pt == pt_temp) {
+		pt_temp = NULL;
+		ps_pwrite(ta->ph, ta->thread_last_event_addr, &pt_temp, sizeof(pt_temp));
+	}
+	tmp = 0;
+	ps_pwrite(ta->ph, pt + ta->thread_off_event_buf, &tmp, sizeof(tmp));
+	/* convert event */
+	pt = (psaddr_t)msg->th_p;
+	ret = ps_pread(ta->ph, pt + ta->thread_off_tid, &lwp, sizeof(lwp));
+	if (ret != 0)
+		return (P2T(ret));
+	handle.th_ta = ta;
+	handle.th_tid = pt_map_thread(ta, lwp, pt);
+	handle.th_thread = pt;
+	msg->th_p = &handle;
+	return (0);
 }
 
 static td_err_e

==== //depot/projects/davidxu_thread/src/lib/libthread_db/thread_db.h#5 (text+ko) ====

@@ -24,7 +24,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/libthread_db/thread_db.h,v 1.4 2005/04/05 11:38:30 davidxu Exp $
+ * $FreeBSD: src/lib/libthread_db/thread_db.h,v 1.5 2005/04/12 03:03:16 davidxu Exp $
  */
 
 #ifndef _THREAD_DB_H_

==== //depot/projects/davidxu_thread/src/lib/libutil/humanize_number.3#2 (text+ko) ====

@@ -1,5 +1,5 @@
 .\"	$NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $
-.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.7 2004/09/26 12:08:31 pjd Exp $
+.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.8 2005/04/10 12:15:25 delphij Exp $
 .\"
 .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -64,7 +64,7 @@
 .Fa buffer
 must be at least
 .Fa len
-bytes bytes long.
+bytes long.
 .Pp
 If the formatted number (including
 .Fa suffix )

==== //depot/projects/davidxu_thread/src/libexec/save-entropy/save-entropy.sh#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2001  The FreeBSD Project
+# Copyright (c) 2001-2005 Douglas Barton, DougB at FreeBSD.org
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/libexec/save-entropy/save-entropy.sh,v 1.2 2001/01/14 07:18:31 dougb Exp $
+# $FreeBSD: src/libexec/save-entropy/save-entropy.sh,v 1.3 2005/04/11 02:07:33 dougb Exp $
 
 # This script is called by cron to store bits of randomness which are
 # then used to seed /dev/random on boot.
@@ -86,7 +86,7 @@
 done
 
 dd if=/dev/random of="${entropy_dir}/saved-entropy.1" \
-    bs=2048 count=1 2> /dev/null
+    bs="$entropy_save_sz" count=1 2> /dev/null
 
 exit 0
 

==== //depot/projects/davidxu_thread/src/share/man/man4/cpufreq.4#4 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/cpufreq.4,v 1.7 2005/03/31 06:05:16 njl Exp $
+.\" $FreeBSD: src/share/man/man4/cpufreq.4,v 1.8 2005/04/10 19:27:03 njl Exp $
 .\"
-.Dd February 26, 2005
+.Dd April 10, 2005
 .Dt CPUFREQ 4
 .Os
 .Sh NAME
@@ -86,7 +86,11 @@
 .It Va debug.cpufreq.lowest
 Lowest CPU frequency in MHz to offer to users.
 This setting is also accessible via a tunable with the same name.
-This can be used to disable very low levels that may be unusable.
+This can be used to disable very low levels that may be unusable on
+some systems.
+.It Va debug.cpufreq.verbose
+Print verbose messages.
+This setting is also accessible via a tunable with the same name.
 .El
 .Sh SUPPORTED DRIVERS
 The following device drivers offer absolute frequency control via the
@@ -273,6 +277,10 @@
 .Xr sysctl 8
 .Sh AUTHORS
 .An Nate Lawson
+.An Bruno Ducrot
+contributed the
+.Pa powernow
+driver.
 .Sh BUGS
 The following drivers have not yet been converted to the
 .Nm
@@ -283,7 +291,3 @@
 .Pp
 When multiple CPUs offer frequency control, they cannot be set to different
 levels and must all offer the same frequency settings.
-.Pp
-Some very low frequency levels can result in hangs on some systems.
-Such levels should be disabled with
-.Va debug.cpufreq.lowest .

==== //depot/projects/davidxu_thread/src/share/man/man4/mac_bsdextended.4#2 (text+ko) ====

@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/mac_bsdextended.4,v 1.14 2004/10/08 20:22:55 keramida Exp $
+.\" $FreeBSD: src/share/man/man4/mac_bsdextended.4,v 1.15 2005/04/11 16:53:40 trhodes Exp $
 .\"
 .Dd September 10, 2004
 .Os
@@ -58,7 +58,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-interface provides an interface for the system administrator
+security policy module provides an interface for the system administrator
 to impose mandatory rules regarding users and some system objects.
 Rules are uploaded to the module
 (typically using

==== //depot/projects/davidxu_thread/src/share/misc/bsd-family-tree#4 (text+ko) ====

@@ -185,7 +185,7 @@
  *---FreeBSD 5.3      |      |                 |                       |
  |      |             |      |             OpenBSD 3.6                 |
  |      v             |   NetBSD 2.0           |                       |
- |                    |      |                 |                       |
+ |                    |      |                 |                 DragonFly 1.2.0
 FreeBSD 6 -current    |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
  v                    v      v                 v                       v
@@ -201,7 +201,7 @@
 	the 4.4BSD Operating System.
 [APL] Apple website [http://www.apple.com/macosx/]
 [BSDI] Berkeley Software Design, Inc.
-[DFD] DragonFlyBSD Project, The.
+[DFB] DragonFlyBSD Project, The.
 [DOC] README, COPYRIGHT on tape.
 [FBD] FreeBSD Project, The.
 [KB]  Keith Bostic. BSD2.10 available from Usenix. comp.unix.sources,
@@ -410,11 +410,12 @@
 NetBSD 1.6.2		2004-03-01 [NBD] (patch release)
 OpenBSD 3.5		2004-04-01 [OBD]
 FreeBSD 4.10		2004-05-27 [FBD]
-DragonFly 1.0		2004-07-12 [DFD]
+DragonFly 1.0		2004-07-12 [DFB]
 OpenBSD 3.6		2004-10-29 [OBD]
 FreeBSD 5.3		2004-11-06 [FBD]
 NetBSD 2.0		2004-12-09 [NBD]
 FreeBSD 4.11		2005-01-25 [FBD]
+DragonFly 1.2.0		2005-04-08 [DFB]
 
 Bibliography
 ------------------------
@@ -475,4 +476,4 @@
 Copyright (c) 1997-2004 Wolfram Schneider <wosch at FreeBSD.ORG>
 URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
 
-$FreeBSD: src/share/misc/bsd-family-tree,v 1.88 2005/01/25 19:16:09 maxim Exp $
+$FreeBSD: src/share/misc/bsd-family-tree,v 1.89 2005/04/10 14:26:58 maxim Exp $

==== //depot/projects/davidxu_thread/src/share/mk/bsd.files.mk#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.files.mk,v 1.3 2002/07/29 09:40:12 ru Exp $
+# $FreeBSD: src/share/mk/bsd.files.mk,v 1.4 2005/04/11 07:13:29 harti Exp $
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.files.mk cannot be included directly.
@@ -60,10 +60,10 @@
 .endif
 .endif
 
-.endif defined(${group}) && !empty(${group})
+.endif # defined(${group}) && !empty(${group})
 .endfor
 
-.endif !target(installfiles)
+.endif # !target(installfiles)
 
 realinstall: installfiles
 .ORDER: beforeinstall installfiles

==== //depot/projects/davidxu_thread/src/share/mk/bsd.incs.mk#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.3 2002/07/03 12:28:03 ru Exp $
+# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.4 2005/04/11 07:13:29 harti Exp $
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.incs.mk cannot be included directly.
@@ -59,7 +59,7 @@
 .endif
 .endif
 
-.endif defined(${group}) && !empty(${group})
+.endif # defined(${group}) && !empty(${group})
 .endfor
 
 .if defined(INCSLINKS) && !empty(INCSLINKS)
@@ -74,7 +74,7 @@
 		ln -fs $$l $$t; \
 	done; true
 .endif
-.endif !target(installincludes)
+.endif # !target(installincludes)
 
 realinstall: installincludes
 .ORDER: beforeinstall installincludes

==== //depot/projects/davidxu_thread/src/share/mk/bsd.init.mk#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.init.mk,v 1.4 2005/01/09 12:55:47 ru Exp $
+# $FreeBSD: src/share/mk/bsd.init.mk,v 1.5 2005/04/11 07:13:29 harti Exp $
 
 # The include file <bsd.init.mk> includes ../Makefile.inc and
 # <bsd.own.mk>; this is used at the top of all <bsd.*.mk> files
@@ -12,4 +12,4 @@
 .include <bsd.compat.mk>
 .include <bsd.own.mk>
 .MAIN: all
-.endif !target(__<bsd.init.mk>__)
+.endif	# !target(__<bsd.init.mk>__)

==== //depot/projects/davidxu_thread/src/share/mk/bsd.lib.mk#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.167 2005/02/08 10:37:34 phantom Exp $
+# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.168 2005/04/11 07:13:29 harti Exp $
 #
 
 .include <bsd.init.mk>
@@ -166,7 +166,7 @@
 	${LINT} ${LINTLIBFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}
 .endif
 
-.endif !defined(INTERNALLIB)
+.endif # !defined(INTERNALLIB)
 
 all: ${_LIBS}
 
@@ -240,7 +240,7 @@
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
 .endif
-.endif !defined(INTERNALLIB)
+.endif # !defined(INTERNALLIB)
 
 .include <bsd.nls.mk>
 .include <bsd.files.mk>
@@ -308,7 +308,7 @@
 .if defined(WANT_LINT) && defined(LIB) && !empty(LIB)
 	rm -f ${LINTOBJS}
 .endif
-.endif !defined(INTERNALLIB)
+.endif # !defined(INTERNALLIB)
 .if defined(_LIBS) && !empty(_LIBS)
 	rm -f ${_LIBS}
 .endif

==== //depot/projects/davidxu_thread/src/share/mk/bsd.nls.mk#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.12 2005/03/10 15:58:16 phantom Exp $
+# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.13 2005/04/11 07:13:29 harti Exp $
 #
 # This include file <bsd.nls.mk> handles building and installing Native
 # Language Support (NLS) catalogs
@@ -73,4 +73,4 @@
 .endfor
 .endfor
 
-.endif defined(NLS) && !empty(NLS) && !defined(NO_NLS)
+.endif # defined(NLS) && !empty(NLS) && !defined(NO_NLS)

==== //depot/projects/davidxu_thread/src/share/mk/bsd.obj.mk#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.53 2005/01/06 11:12:43 krion Exp $
+# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.54 2005/04/11 07:13:29 harti Exp $
 #
 # The include file <bsd.obj.mk> handles creating the 'obj' directory
 # and cleaning up object files, etc.
@@ -98,7 +98,7 @@
 		echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \
 	fi
 .endif
-.endif !defined(NO_OBJ)
+.endif # !defined(NO_OBJ)
 
 #
 # where would that obj directory be?
@@ -130,4 +130,4 @@
 
 .include <bsd.subdir.mk>
 
-.endif !target(__<bsd.obj.mk>__)
+.endif # !target(__<bsd.obj.mk>__)

==== //depot/projects/davidxu_thread/src/share/mk/bsd.own.mk#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.own.mk,v 1.42 2005/01/06 11:12:43 krion Exp $
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.43 2005/04/11 07:13:29 harti Exp $
 #
 # The include file <bsd.own.mk> set common variables for owner,
 # group, mode, and directories. Defaults are in brackets.
@@ -165,4 +165,4 @@
 COMPRESS_CMD?=	gzip -cn
 COMPRESS_EXT?=	.gz
 
-.endif !target(__<bsd.own.mk>__)
+.endif	# !target(__<bsd.own.mk>__)

==== //depot/projects/davidxu_thread/src/share/mk/bsd.prog.mk#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.143 2005/01/26 00:17:03 jmallett Exp $
+# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.144 2005/04/11 07:13:29 harti Exp $
 
 .include <bsd.init.mk>
 
@@ -48,7 +48,7 @@
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
 .endif
 
-.else !defined(SRCS)
+.else	# !defined(SRCS)
 
 .if !target(${PROG})
 .if defined(PROG_CXX)
@@ -140,7 +140,7 @@
 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
 .endif
 .endif
-.endif !target(realinstall)
+.endif	# !target(realinstall)
 
 .if defined(SCRIPTS) && !empty(SCRIPTS)
 realinstall: _scriptsinstall

==== //depot/projects/davidxu_thread/src/sys/amd64/amd64/support.S#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.113 2004/07/10 22:39:17 marcel Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.114 2005/04/10 18:12:07 alc Exp $
  */
 
 #include "opt_ddb.h"
@@ -86,8 +86,6 @@
 	ret
 
 ENTRY(bcmp)
-	xorq	%rax,%rax
-
 	movq	%rdx,%rcx
 	shrq	$3,%rcx
 	cld					/* compare forwards */
@@ -99,10 +97,9 @@
 	andq	$7,%rcx
 	repe
 	cmpsb
-	je	2f
 1:
-	incq	%rax
-2:
+	setne	%al
+	movsbl	%al,%eax
 	ret
 
 /*

==== //depot/projects/davidxu_thread/src/sys/amd64/include/asm.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- * $FreeBSD: src/sys/amd64/include/asm.h,v 1.16 2004/06/10 22:02:26 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/asm.h,v 1.17 2005/04/10 20:49:21 alc Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
@@ -56,8 +56,7 @@
 #define CNAME(csym)		csym
 #define HIDENAME(asmsym)	.asmsym
 
-/* XXX should use .p2align 4,0x90 for -m486. */
-#define _START_ENTRY	.text; .p2align 2,0x90
+#define _START_ENTRY	.text; .p2align 4,0x90
 
 #define _ENTRY(x)	_START_ENTRY; \
 			.globl CNAME(x); .type CNAME(x), at function; CNAME(x):

==== //depot/projects/davidxu_thread/src/sys/compat/ndis/hal_var.h#4 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.7 2005/02/16 05:41:17 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.8 2005/04/11 02:02:34 wpaul Exp $
  */
 
 #ifndef _HAL_VAR_H_
@@ -48,11 +48,11 @@
 __BEGIN_DECLS
 extern int hal_libinit(void);
 extern int hal_libfini(void);
-__fastcall extern uint8_t KfAcquireSpinLock(REGARGS1(kspin_lock *lock));
-__fastcall void KfReleaseSpinLock(REGARGS2(kspin_lock *lock, uint8_t newirql));
-__fastcall extern uint8_t KfRaiseIrql(REGARGS1(uint8_t irql));
-__fastcall extern void KfLowerIrql(REGARGS1(uint8_t oldirql));
-__stdcall extern uint8_t KeGetCurrentIrql(void);
+extern uint8_t KfAcquireSpinLock(kspin_lock *);
+extern void KfReleaseSpinLock(kspin_lock *, uint8_t);
+extern uint8_t KfRaiseIrql(uint8_t);
+extern void KfLowerIrql(uint8_t);
+extern uint8_t KeGetCurrentIrql(void);
 __END_DECLS
 
 #endif /* _HAL_VAR_H_ */

==== //depot/projects/davidxu_thread/src/sys/compat/ndis/kern_ndis.c#7 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list