PERFORCE change 33687 for review

Wed Jun 25 21:00:25 PDT 2003

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

Change 33687 by peter at peter_daintree on 2003/06/25 20:59:59

	IFC @33686

Affected files ...

.. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#9 integrate
.. //depot/projects/hammer/lib/Makefile#19 integrate
.. //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate
.. //depot/projects/hammer/lib/libstand/Makefile#5 integrate
.. //depot/projects/hammer/sys/Makefile#5 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#19 integrate
.. //depot/projects/hammer/sys/boot/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/common/Makefile.inc#7 integrate
.. //depot/projects/hammer/sys/boot/ficl/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/i386/Makefile.inc#3 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/Makefile.inc#3 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btxldr/Makefile#4 integrate
.. //depot/projects/hammer/sys/boot/i386/loader/Makefile#7 integrate
.. //depot/projects/hammer/sys/vm/vm_pageq.c#5 integrate

Differences ...

==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.68 2003/05/01 15:00:46 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.69 2003/06/26 03:02:32 peter Exp $
 
 #
 # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
@@ -144,7 +144,7 @@
 	echo 'typedef union tree_node *tree;'		>> ${.TARGET}
 	echo ''						>> ${.TARGET}
 .if ${TARGET_ARCH} == "amd64"
-	echo '#include "i386/biarch64.h"'		>>${.TARGET}
+	echo '#include "i386/biarch64.h"		>> ${.TARGET}
 .endif
 .if ${TARGET_ARCH} == "ia64"
 	echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET}

==== //depot/projects/hammer/lib/Makefile#19 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.160 2003/06/02 22:22:52 peter Exp $
+# $FreeBSD: src/lib/Makefile,v 1.161 2003/06/26 03:48:23 peter Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:

==== //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#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/libpthread/arch/ia64/include/pthread_md.h,v 1.2 2003/06/23 23:15:06 marcel Exp $
+ * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.3 2003/06/26 03:55:58 marcel Exp $
  */
 
 #ifndef _PTHREAD_MD_H_
@@ -41,4 +41,34 @@
 	int	ksd_size;
 };
 
+void _ia64_enter_uts(kse_func_t uts, struct kse_mailbox *km, void *stack,
+    size_t stacksz);
+int _ia64_restore_context(mcontext_t *mc, intptr_t val, intptr_t *loc);
+int _ia64_save_context(mcontext_t *mc);
+
+static __inline int
+_thread_enter_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km)
+{
+	if (tm == NULL)
+		return (-1);
+	if (!_ia64_save_context(&tm->tm_context.uc_mcontext)) {
+		_ia64_enter_uts(km->km_func, km, km->km_stack.ss_sp,
+		    km->km_stack.ss_size);
+		/* We should not reach here. */
+		return (-1);
+	}
+	return (0);
+}
+
+static __inline int
+_thread_switch(struct kse_thr_mailbox *tm, struct kse_thr_mailbox **thrp)
+{
+	if (tm == NULL)
+		return (-1);
+	_ia64_restore_context(&tm->tm_context.uc_mcontext, (intptr_t)tm,
+	    (intptr_t*)thrp);
+	/* We should not reach here. */
+	return (-1);
+}
+
 #endif /* _PTHREAD_MD_H_ */

==== //depot/projects/hammer/lib/libstand/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libstand/Makefile,v 1.38 2002/12/19 19:34:58 jake Exp $
+# $FreeBSD: src/lib/libstand/Makefile,v 1.39 2003/06/26 03:48:01 peter Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
 # Notes:

==== //depot/projects/hammer/sys/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.27 2003/05/08 06:35:39 peter Exp $
+# $FreeBSD: src/sys/Makefile,v 1.28 2003/06/26 03:52:48 peter Exp $
 
 # The boot loader
 SUBDIR=	boot

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#19 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.387 2003/06/01 20:26:38 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.388 2003/06/26 03:49:54 peter Exp $
 
 machine		amd64
 cpu		HAMMER

==== //depot/projects/hammer/sys/boot/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/Makefile,v 1.16 2003/04/30 22:13:36 peter Exp $
+# $FreeBSD: src/sys/boot/Makefile,v 1.17 2003/06/26 03:51:56 peter Exp $
 
 .if ${MACHINE_ARCH} == "amd64"
 .MAKEFLAGS:  MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true

==== //depot/projects/hammer/sys/boot/common/Makefile.inc#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.15 2003/05/01 03:56:29 peter Exp $
+# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.16 2003/06/26 03:51:57 peter Exp $
 
 SRCS+=	bcache.c boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c ls.c misc.c 

==== //depot/projects/hammer/sys/boot/ficl/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.33 2003/06/08 03:11:16 nyan Exp $
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.34 2003/06/26 03:51:57 peter Exp $
 #
 .if ${MACHINE_ARCH} == "amd64"
 .MAKEFLAGS:  MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true

==== //depot/projects/hammer/sys/boot/i386/Makefile.inc#3 (text+ko) ====

@@ -1,6 +1,6 @@
 # Common defines for all of /sys/boot/i386/
 #
-# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.3 2002/05/10 00:53:45 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.4 2003/06/26 03:51:57 peter Exp $
 
 LOADER_ADDRESS?=	0x200000
 CFLAGS+=		-ffreestanding -mpreferred-stack-boundary=2

==== //depot/projects/hammer/sys/boot/i386/boot2/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.46 2003/02/25 15:41:49 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.47 2003/06/26 03:51:57 peter Exp $
 
 PROG=		boot2
 NOMAN=

==== //depot/projects/hammer/sys/boot/i386/btx/Makefile.inc#3 (text+ko) ====

@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/Makefile.inc,v 1.1 2003/06/26 03:51:57 peter Exp $
 .include <${.CURDIR}/../../Makefile.inc>

==== //depot/projects/hammer/sys/boot/i386/btx/btxldr/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.11 2002/09/17 01:48:55 peter Exp $
+# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.12 2003/06/26 03:51:57 peter Exp $
 
 M4?=	m4
 M4FLAGS+=	-DLOADER_ADDRESS=${LOADER_ADDRESS}

==== //depot/projects/hammer/sys/boot/i386/loader/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.65 2003/05/31 05:25:17 scottl Exp $
+# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.66 2003/06/26 03:51:57 peter Exp $
 
 PROG=		loader
 STRIP=

==== //depot/projects/hammer/sys/vm/vm_pageq.c#5 (text+ko) ====

@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.10 2003/06/11 23:50:50 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.11 2003/06/26 03:14:40 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,26 +46,17 @@
 	}
 }
 
-static __inline struct vpgqueues *
-vm_pageq_aquire(int queue)
-{
-	struct vpgqueues *vpq = NULL;
-
-	if (queue != PQ_NONE) {
-		vpq = &vm_page_queues[queue];
-	}
-	return (vpq);
-}
-
 void
 vm_pageq_requeue(vm_page_t m)
 {
 	int queue = m->queue;
 	struct vpgqueues *vpq;
 
-	vpq = vm_pageq_aquire(queue);
-	TAILQ_REMOVE(&vpq->pl, m, pageq);
-	TAILQ_INSERT_TAIL(&vpq->pl, m, pageq);
+	if (queue != PQ_NONE) {
+		vpq = &vm_page_queues[queue];
+		TAILQ_REMOVE(&vpq->pl, m, pageq);
+		TAILQ_INSERT_TAIL(&vpq->pl, m, pageq);
+	}
 }
 
 /*
