PERFORCE change 50497 for review
Peter Wemm
peter at FreeBSD.org
Tue Apr 6 12:28:31 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=50497
Change 50497 by peter at peter_daintree on 2004/04/06 12:26:58
integ -I -b i386_hammer
Affected files ...
.. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#18 edit
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#62 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#38 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#10 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#24 integrate
.. //depot/projects/hammer/sys/amd64/include/cpufunc.h#26 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#28 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#18 (text+ko) ====
@@ -57,18 +57,6 @@
static jmp_buf db_global_jmpbuf;
-static __inline u_short
-rss(void)
-{
- u_short ss;
-#ifdef __GNUC__
- __asm __volatile("mov %%ss,%0" : "=r" (ss));
-#else
- ss = 0; /* XXXX Fix for other compilers. */
-#endif
- return ss;
-}
-
/*
* kdb_trap - field a TRACE or BPT trap
*/
==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#62 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#38 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#10 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/conf/NOTES#24 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# (XXX from i386:NOTES,v 1.1148)
+# (XXX from i386:NOTES,v 1.1150)
# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $
#
@@ -254,6 +254,14 @@
#device pst
#
+# 3ware 9000 series PATA/SATA RAID controller driver and options.
+# The driver is implemented as a SIM, and so, needs the CAM infrastructure.
+#
+options TWA_DEBUG # 0-10; 10 prints the most messages.
+options TWA_FLASH_FIRMWARE # firmware image bundled when defined.
+device twa # 3ware 9000 series PATA/SATA RAID
+
+#
# SCSI host adapters:
#
# ncv: NCR 53C500 based SCSI host adapters.
==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#26 (text+ko) ====
@@ -498,6 +498,14 @@
return (sel);
}
+static __inline u_int
+rss(void)
+{
+ u_int sel;
+ __asm __volatile("movl %%ss,%0" : "=rm" (sel));
+ return (sel);
+}
+
static __inline void
load_ds(u_int sel)
{
==== //depot/projects/hammer/sys/amd64/include/pmap.h#28 (text+ko) ====
@@ -257,7 +257,6 @@
extern caddr_t CADDR1;
extern pt_entry_t *CMAP1;
extern vm_paddr_t avail_end;
-extern vm_paddr_t avail_start;
extern vm_paddr_t phys_avail[];
extern vm_offset_t virtual_avail;
extern vm_offset_t virtual_end;
More information about the p4-projects
mailing list