PERFORCE change 124422 for review
Xin LI
delphij at FreeBSD.org
Tue Jul 31 14:03:11 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=124422
Change 124422 by delphij at charlie on 2007/07/31 14:02:53
IFC
Affected files ...
.. //depot/projects/delphij_fork/etc/rc.d/netif#2 integrate
.. //depot/projects/delphij_fork/etc/rc.d/nscd#1 branch
.. //depot/projects/delphij_fork/lib/libarchive/test/main.c#5 integrate
.. //depot/projects/delphij_fork/lib/libelf/elf_begin.3#2 integrate
.. //depot/projects/delphij_fork/lib/libelf/elf_memory.3#2 integrate
.. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate
.. //depot/projects/delphij_fork/share/man/man4/lagg.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man9/sysctl_ctx_init.9#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch
.. //depot/projects/delphij_fork/sys/arm/arm/elf_trampoline.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/intr.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/CRB#1 branch
.. //depot/projects/delphij_fork/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/delphij_fork/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/delphij_fork/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/delphij_fork/sys/arm/include/pte.h#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/i80321/i80321var.h#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/i80321/obio.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/crb_machdep.c#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/files.crb#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/files.i81342#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342.c#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342_pci.c#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342_space.c#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342reg.h#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342var.h#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/obio.c#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/obio_space.c#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/obiovar.h#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/std.crb#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/std.i81342#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch
.. //depot/projects/delphij_fork/sys/conf/Makefile.arm#2 integrate
.. //depot/projects/delphij_fork/sys/conf/kern.pre.mk#4 integrate
.. //depot/projects/delphij_fork/sys/conf/options.ia64#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/pf/net/if_pfsync.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/acpica/acpi_timer.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ce/if_ce.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/cp/if_cp.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/cx/if_cx.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/ufoma.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/umodem.c#2 integrate
.. //depot/projects/delphij_fork/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/delphij_fork/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/delphij_fork/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/sapic.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/include/atomic.h#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/include/intr.h#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/include/sapicvar.h#2 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_kse.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/uipc_domain.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/delphij_fork/sys/net/bpf.c#2 integrate
.. //depot/projects/delphij_fork/sys/net/if.c#2 integrate
.. //depot/projects/delphij_fork/sys/net/if_bridge.c#2 integrate
.. //depot/projects/delphij_fork/sys/net/if_bridgevar.h#2 integrate
.. //depot/projects/delphij_fork/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/delphij_fork/sys/net/if_lagg.c#3 integrate
.. //depot/projects/delphij_fork/sys/net/if_lagg.h#3 integrate
.. //depot/projects/delphij_fork/sys/net/netisr.c#2 integrate
.. //depot/projects/delphij_fork/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/delphij_fork/sys/netgraph/ng_bpf.c#2 integrate
.. //depot/projects/delphij_fork/sys/netgraph/ng_eiface.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_fsm.h#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_syncache.h#1 branch
.. //depot/projects/delphij_fork/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/delphij_fork/sys/netinet6/udp6_usrreq.c#5 integrate
.. //depot/projects/delphij_fork/sys/netipx/spx_debug.c#2 integrate
.. //depot/projects/delphij_fork/sys/netipx/spx_debug.h#2 integrate
.. //depot/projects/delphij_fork/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/delphij_fork/sys/nfsserver/nfs_syscalls.c#2 integrate
.. //depot/projects/delphij_fork/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/trap.c#2 integrate
.. //depot/projects/delphij_fork/sys/sys/kernel.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/mutex.h#3 integrate
.. //depot/projects/delphij_fork/sys/sys/proc.h#4 integrate
.. //depot/projects/delphij_fork/sys/sys/vmmeter.h#2 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_meter.c#3 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_page.c#4 integrate
.. //depot/projects/delphij_fork/sys/vm/vnode_pager.c#2 integrate
.. //depot/projects/delphij_fork/tools/tools/net80211/Makefile#2 integrate
.. //depot/projects/delphij_fork/tools/tools/net80211/README#2 integrate
.. //depot/projects/delphij_fork/tools/tools/net80211/wlandebug/Makefile#2 delete
.. //depot/projects/delphij_fork/tools/tools/net80211/wlandebug/wlandebug.8#2 delete
.. //depot/projects/delphij_fork/tools/tools/net80211/wlandebug/wlandebug.c#2 delete
.. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.holiday#2 integrate
.. //depot/projects/delphij_fork/usr.bin/netstat/ipx.c#3 integrate
.. //depot/projects/delphij_fork/usr.bin/truss/i386-fbsd.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/truss/main.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/truss/powerpc-fbsd.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/truss/syscalls.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/vmstat/vmstat.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/Makefile#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/acpi/acpidump/acpi_user.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/Makefile#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/agent.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/agent.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/group.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/group.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/passwd.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/passwd.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/services.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/services.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/cachelib.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/cachelib.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/cacheplcs.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/cacheplcs.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/config.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/config.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/debug.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/debug.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/hashtable.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/log.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/log.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/mp_rs_query.#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/mp_rs_query.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/mp_ws_query.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/mp_ws_query.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscd.8#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscd.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscd.conf.5#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscdcli.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscdcli.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/parser.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/parser.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/protocol.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/protocol.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/query.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/query.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/singletons.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/nscd/singletons.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/wlandebug/Makefile#1 branch
.. //depot/projects/delphij_fork/usr.sbin/wlandebug/wlandebug.8#1 branch
.. //depot/projects/delphij_fork/usr.sbin/wlandebug/wlandebug.c#1 branch
Differences ...
==== //depot/projects/delphij_fork/etc/rc.d/netif#2 (text+ko) ====
@@ -22,11 +22,11 @@
# (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/etc/rc.d/netif,v 1.23 2007/04/02 22:53:07 des Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.24 2007/07/25 18:08:01 jhb Exp $
#
# PROVIDE: netif
-# REQUIRE: atm1 ipfilter FILESYSTEMS serial sppp sysctl
+# REQUIRE: atm1 cleanvar ipfilter FILESYSTEMS serial sppp sysctl
# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/delphij_fork/lib/libarchive/test/main.c#5 (text+ko) ====
@@ -32,7 +32,13 @@
#include <time.h>
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.7 2007/07/14 17:52:01 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.8 2007/07/31 05:03:27 kientzle Exp $");
+
+/* Interix doesn't define these in a standard header. */
+#if __INTERIX__
+extern char *optarg;
+extern int optind;
+#endif
/* Default is to crash and try to force a core dump on failure. */
static int dump_on_failure = 1;
@@ -101,6 +107,7 @@
static int skipped_line;
void skipping_setup(const char *filename, int line)
{
+ skipped_filename = filename;
skipped_line = line;
}
void
==== //depot/projects/delphij_fork/lib/libelf/elf_begin.3#2 (text+ko) ====
@@ -21,7 +21,7 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf_begin.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_begin.3,v 1.3 2007/07/28 15:35:03 jkoshy Exp $
.\"
.Dd June 21, 2006
.Os
@@ -273,7 +273,7 @@
.Sh SEE ALSO
.Xr elf 3 ,
.Xr elf_end 3 ,
-.Xr elf_error 3 ,
+.Xr elf_errno 3 ,
.Xr elf_memory 3 ,
.Xr elf_next 3 ,
.Xr elf_rand 3 ,
==== //depot/projects/delphij_fork/lib/libelf/elf_memory.3#2 (text+ko) ====
@@ -21,7 +21,7 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libelf/elf_memory.3,v 1.2 2006/11/13 09:46:15 ru Exp $
+.\" $FreeBSD: src/lib/libelf/elf_memory.3,v 1.3 2007/07/28 15:35:03 jkoshy Exp $
.\"
.Dd June 28, 2006
.Os
@@ -117,6 +117,6 @@
.Xr elf 3 ,
.Xr elf_begin 3 ,
.Xr elf_end 3 ,
-.Xr elf_error 3 ,
+.Xr elf_errno 3 ,
.Xr elf_kind 3 ,
.Xr gelf 3
==== //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 (text+ko) ====
@@ -30,7 +30,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1053 2007/07/25 15:19:37 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1055 2007/07/29 23:07:12 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -946,12 +946,17 @@
cards, as well as quarter- and half-channel support
for 802.11a. &merged;</para>
- <para>ISDN4BSD, &man.ng.h4.4;, and netatm have been temporarily
+ <para>The &os; network stack now runs entirely free of the
+ Giant kernel lock, and relies solely on the kernel's
+ fine-grained locking primitives to manage parallelism. This
+ significantly improves the network stack's performance on
+ multi-processor systems; uni-processor systems could also
+ see performance gains.
+ ISDN4BSD, &man.ng.h4.4;, and netatm have been temporarily
disconnected from the build. These modules all require
the Giant kernel lock for their operation; disconnecting
them allows the removal of the NET_NEEDS_GIANT compatability
- shim and allows the &os; network stack to run completely
- without the Giant kernel lock. It is planned to convert
+ shim. It is planned to convert
these modules to fine-grained kernel locking and re-connect
them for &os; 7.1-RELEASE.</para>
</sect4>
@@ -2266,8 +2271,8 @@
character support. &merged;</para>
<para><application>hostapd</application>
- has been updated from version 0.3.9 to version 0.4.8.
- &merged;</para>
+ has been updated from version 0.3.9 to version 0.5.8.
+ </para>
<para><application>PF</application> has been updated from OpenBSD
version 3.7 to OpenBSD version 4.1.</para>
@@ -2297,8 +2302,8 @@
<literal>audit</literal> group have been added. &merged;</para>
<para><application>WPA Supplicant</application>
- has been updated from version 0.3.9 to version 0.4.8.
- &merged;</para>
+ has been updated from version 0.3.9 to version 0.5.8.
+ </para>
<para><application>zlib</application>
has been updated from version 1.2.2 to version 1.2.3. &merged;</para>
@@ -2462,7 +2467,7 @@
<para>The supported version of
the <application>KDE</application> desktop environment
(<filename role="package">x11/kde3</filename>) has been
- updated from 3.4.2 to 3.5.6. &merged;</para>
+ updated from 3.4.2 to 3.5.7. &merged;</para>
<para>[&arch.amd64;, &arch.i386;] The supported Linux emulation now uses the
libraries in the
==== //depot/projects/delphij_fork/share/man/man4/lagg.4#2 (text+ko) ====
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.3 2007/04/17 07:09:23 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.4 2007/07/30 20:17:21 thompsa Exp $
.\"
.Dd April 17, 2007
.Dt LAGG 4
@@ -122,6 +122,9 @@
.Va cloned_interfaces
variable in
.Xr rc.conf 5 .
+.Pp
+The MTU of the first interface to be added is used as the lagg MTU.
+All additional interfaces are required to have exactly the same value.
.Sh EXAMPLES
Create a 802.3ad link aggregation using LACP with two
.Xr bge 4
==== //depot/projects/delphij_fork/share/man/man9/sysctl_ctx_init.9#2 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/sysctl_ctx_init.9,v 1.13 2006/04/28 10:45:27 rwatson Exp $
+.\" $FreeBSD: src/share/man/man9/sysctl_ctx_init.9,v 1.14 2007/07/27 19:55:42 remko Exp $
.\"
.Dd July 15, 2000
.Dt SYSCTL_CTX_INIT 9
@@ -135,7 +135,8 @@
as the oid number when creating an oid.
However, during registration of the oid in the tree,
this number is changed to the first available number
-greater than 99.
+greater than or equal to
+.Dv CTL_AUTO_START .
If the first step of context deletion fails,
re-registration of the oid does not change the already assigned oid number
(which is different from OID_AUTO).
==== //depot/projects/delphij_fork/sys/amd64/amd64/trap.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.318 2007/06/10 21:59:12 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.319 2007/07/26 15:32:54 jhb Exp $");
/*
* AMD64 Trap and System call handling
@@ -159,7 +159,8 @@
{
struct thread *td = curthread;
struct proc *p = td->td_proc;
- int i = 0, ucode = 0, type, code;
+ int i = 0, ucode = 0, code;
+ u_int type;
register_t addr = 0;
ksiginfo_t ksi;
@@ -622,7 +623,8 @@
struct trapframe *frame;
vm_offset_t eva;
{
- int code, type, ss;
+ int code, ss;
+ u_int type;
long esp;
struct soft_segment_descriptor softseg;
char *msg;
==== //depot/projects/delphij_fork/sys/arm/arm/busdma_machdep.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.33 2007/06/10 12:33:01 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.34 2007/07/27 14:46:43 cognet Exp $");
/*
* ARM bus dma support routines
@@ -763,8 +763,12 @@
if (__predict_true(pmap == pmap_kernel())) {
(void) pmap_get_pde_pte(pmap, vaddr, &pde, &ptep);
if (__predict_false(pmap_pde_section(pde))) {
- curaddr = (*pde & L1_S_FRAME) |
- (vaddr & L1_S_OFFSET);
+ if (*pde & L1_S_SUPERSEC)
+ curaddr = (*pde & L1_SUP_FRAME) |
+ (vaddr & L1_SUP_OFFSET);
+ else
+ curaddr = (*pde & L1_S_FRAME) |
+ (vaddr & L1_S_OFFSET);
if (*pde & L1_S_CACHE_MASK) {
map->flags &=
~DMAMAP_COHERENT;
@@ -1087,36 +1091,36 @@
{
char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align];
- if (op & BUS_DMASYNC_PREWRITE)
+ if (op & BUS_DMASYNC_PREWRITE) {
cpu_dcache_wb_range((vm_offset_t)buf, len);
+ cpu_l2cache_wb_range((vm_offset_t)buf, len);
+ }
+ if (op & BUS_DMASYNC_PREREAD) {
+ cpu_idcache_wbinv_range((vm_offset_t)buf, len);
+ cpu_l2cache_wbinv_range((vm_offset_t)buf, len);
+ }
if (op & BUS_DMASYNC_POSTREAD) {
- if ((vm_offset_t)buf & arm_dcache_align_mask)
+ if ((vm_offset_t)buf & arm_dcache_align_mask) {
memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~
arm_dcache_align_mask),
- (vm_offset_t)buf - ((vm_offset_t)buf &~
- arm_dcache_align_mask));
- if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
- memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~
- arm_dcache_align_mask),
- (vm_offset_t)buf - ((vm_offset_t)buf &~
- arm_dcache_align_mask));
- if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
- memcpy(_tmp_clend, (void *)(((vm_offset_t)buf + len) & ~
- arm_dcache_align_mask),
- (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~
- arm_dcache_align_mask));
+ (vm_offset_t)buf & arm_dcache_align_mask);
+ }
+ if (((vm_offset_t)buf + len) & arm_dcache_align_mask) {
+ memcpy(_tmp_clend, (void *)((vm_offset_t)buf + len),
+ arm_dcache_align - (((vm_offset_t)(buf) + len) &
+ arm_dcache_align_mask));
+ }
cpu_dcache_inv_range((vm_offset_t)buf, len);
+ cpu_l2cache_inv_range((vm_offset_t)buf, len);
+
if ((vm_offset_t)buf & arm_dcache_align_mask)
memcpy((void *)((vm_offset_t)buf &
- ~arm_dcache_align_mask),
- _tmp_cl,
- (vm_offset_t)buf - ((vm_offset_t)buf &~
- arm_dcache_align_mask));
+ ~arm_dcache_align_mask), _tmp_cl,
+ (vm_offset_t)buf & arm_dcache_align_mask);
if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
- memcpy((void *)(((vm_offset_t)buf + len) & ~
- arm_dcache_align_mask), _tmp_clend,
- (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~
- arm_dcache_align_mask));
+ memcpy((void *)((vm_offset_t)buf + len), _tmp_clend,
+ arm_dcache_align - (((vm_offset_t)(buf) + len) &
+ arm_dcache_align_mask));
}
}
@@ -1131,14 +1135,20 @@
(void *)(bpage->vaddr_nocache != 0 ?
bpage->vaddr_nocache : bpage->vaddr),
bpage->datacount);
- if (bpage->vaddr_nocache == 0)
+ if (bpage->vaddr_nocache == 0) {
cpu_dcache_wb_range(bpage->vaddr,
bpage->datacount);
+ cpu_l2cache_wb_range(bpage->vaddr,
+ bpage->datacount);
+ }
}
if (op & BUS_DMASYNC_POSTREAD) {
- if (bpage->vaddr_nocache == 0)
+ if (bpage->vaddr_nocache == 0) {
cpu_dcache_inv_range(bpage->vaddr,
bpage->datacount);
+ cpu_l2cache_inv_range(bpage->vaddr,
+ bpage->datacount);
+ }
bcopy((void *)(bpage->vaddr_nocache != 0 ?
bpage->vaddr_nocache : bpage->vaddr),
(void *)bpage->datavaddr, bpage->datacount);
@@ -1175,10 +1185,6 @@
_bus_dmamap_sync_bp(dmat, map, op);
if (map->flags & DMAMAP_COHERENT)
return;
- if ((op && BUS_DMASYNC_POSTREAD) && (map->len >= 2 * PAGE_SIZE)) {
- cpu_dcache_wbinv_all();
- return;
- }
CTR3(KTR_BUSDMA, "%s: op %x flags %x", __func__, op, map->flags);
switch(map->flags & DMAMAP_TYPE_MASK) {
case DMAMAP_LINEAR:
==== //depot/projects/delphij_fork/sys/arm/arm/cpufunc.c#2 (text+ko) ====
@@ -45,7 +45,7 @@
* Created : 30/01/97
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.16 2007/02/11 22:24:54 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.17 2007/07/27 14:39:41 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,6 +147,10 @@
arm7tdmi_cache_flushID, /* idcache_wbinv_all */
(void *)arm7tdmi_cache_flushID, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ cpufunc_nullop, /* l2cache_wbinv_range */
+ cpufunc_nullop, /* l2cache_inv_range */
+ cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -205,6 +209,10 @@
arm8_cache_purgeID, /* idcache_wbinv_all */
(void *)arm8_cache_purgeID, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ cpufunc_nullop, /* l2cache_wbinv_range */
+ cpufunc_nullop, /* l2cache_inv_range */
+ cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -262,6 +270,10 @@
arm9_idcache_wbinv_all, /* idcache_wbinv_all */
arm9_idcache_wbinv_range, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ cpufunc_nullop, /* l2cache_wbinv_range */
+ cpufunc_nullop, /* l2cache_inv_range */
+ cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -320,6 +332,10 @@
arm10_idcache_wbinv_all, /* idcache_wbinv_all */
arm10_idcache_wbinv_range, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ cpufunc_nullop, /* l2cache_wbinv_range */
+ cpufunc_nullop, /* l2cache_inv_range */
+ cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -378,6 +394,10 @@
sa1_cache_purgeID, /* idcache_wbinv_all */
sa1_cache_purgeID_rng, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ cpufunc_nullop, /* l2cache_wbinv_range */
+ cpufunc_nullop, /* l2cache_inv_range */
+ cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -435,6 +455,10 @@
sa1_cache_purgeID, /* idcache_wbinv_all */
sa1_cache_purgeID_rng, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ cpufunc_nullop, /* l2cache_wbinv_range */
+ cpufunc_nullop, /* l2cache_inv_range */
+ cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -492,6 +516,10 @@
sa1_cache_purgeID, /* idcache_wbinv_all */
sa1_cache_purgeID_rng, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ cpufunc_nullop, /* l2cache_wbinv_range */
+ cpufunc_nullop, /* l2cache_inv_range */
+ cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -552,6 +580,10 @@
xscale_cache_purgeID, /* idcache_wbinv_all */
xscale_cache_purgeID_rng, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ cpufunc_nullop, /* l2cache_wbinv_range */
+ cpufunc_nullop, /* l2cache_inv_range */
+ cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -602,15 +634,19 @@
/* Cache operations */
xscalec3_cache_syncI, /* icache_sync_all */
- xscale_cache_syncI_rng, /* icache_sync_range */
+ xscalec3_cache_syncI_rng, /* icache_sync_range */
xscalec3_cache_purgeD, /* dcache_wbinv_all */
xscalec3_cache_purgeD_rng, /* dcache_wbinv_range */
xscale_cache_flushD_rng, /* dcache_inv_range */
xscalec3_cache_cleanD_rng, /* dcache_wb_range */
- xscalec3_cache_purgeID, /* idcache_wbinv_all */
+ xscalec3_cache_purgeID, /* idcache_wbinv_all */
xscalec3_cache_purgeID_rng, /* idcache_wbinv_range */
+ xscalec3_l2cache_purge, /* l2cache_wbinv_all */
+ xscalec3_l2cache_purge_rng, /* l2cache_wbinv_range */
+ xscalec3_l2cache_flush_rng, /* l2cache_inv_range */
+ xscalec3_l2cache_clean_rng, /* l2cache_wb_range */
/* Other functions */
@@ -1889,9 +1925,7 @@
xscale_setup(args)
char *args;
{
-#ifndef CPU_XSCALE_CORE3
uint32_t auxctl;
-#endif
int cpuctrl, cpuctrlmask;
/*
@@ -1911,7 +1945,8 @@
| CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE
| CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
| CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_BPRD_ENABLE
- | CPU_CONTROL_CPCLK | CPU_CONTROL_VECRELOC;
+ | CPU_CONTROL_CPCLK | CPU_CONTROL_VECRELOC | \
+ CPU_CONTROL_L2_ENABLE;
#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
@@ -1925,6 +1960,9 @@
if (vector_page == ARM_VECTORS_HIGH)
cpuctrl |= CPU_CONTROL_VECRELOC;
+#ifdef CPU_XSCALE_CORE3
+ cpuctrl |= CPU_CONTROL_L2_ENABLE;
+#endif
/* Clear out the cache */
cpu_idcache_wbinv_all();
@@ -1937,7 +1975,6 @@
/* cpu_control(cpuctrlmask, cpuctrl);*/
cpu_control(0xffffffff, cpuctrl);
-#ifndef CPU_XSCALE_CORE3
/* Make sure write coalescing is turned on */
__asm __volatile("mrc p15, 0, %0, c1, c0, 1"
: "=r" (auxctl));
@@ -1946,9 +1983,12 @@
#else
auxctl &= ~XSCALE_AUXCTL_K;
#endif
+#ifdef CPU_XSCALE_CORE3
+ auxctl |= XSCALE_AUXCTL_LLR;
+ auxctl |= XSCALE_AUXCTL_MD_MASK;
+#endif
__asm __volatile("mcr p15, 0, %0, c1, c0, 1"
: : "r" (auxctl));
-#endif
}
#endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425
CPU_XSCALE_80219 */
==== //depot/projects/delphij_fork/sys/arm/arm/elf_trampoline.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.17 2007/02/19 00:57:27 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.18 2007/07/27 14:42:25 cognet Exp $");
#include <machine/asm.h>
#include <sys/param.h>
#include <sys/elf32.h>
@@ -48,6 +48,7 @@
extern void *_end;
void __start(void);
+void __startC(void);
#define GZ_HEAD 0xa
@@ -66,7 +67,14 @@
defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
defined(CPU_XSCALE_80219)
#define cpu_idcache_wbinv_all xscale_cache_purgeID
+#elif defined(CPU_XSCALE_81342)
+#define cpu_idcache_wbinv_all xscalec3_cache_purgeID
#endif
+#ifdef CPU_XSCALE_81342
+#define cpu_l2cache_wbinv_all xscalec3_l2cache_purge
+#else
+#define cpu_l2cache_wbinv_all()
+#endif
int arm_picache_size;
@@ -138,7 +146,7 @@
static void arm9_setup(void);
void
-_start(void)
+_startC(void)
{
int physaddr = KERNPHYSADDR;
int tmp1;
@@ -207,6 +215,7 @@
arm9_setup();
#endif
cpu_idcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
#endif
__start();
}
@@ -520,7 +529,7 @@
extern char func_end[];
-#define PMAP_DOMAIN_KERNEL 15 /*
+#define PMAP_DOMAIN_KERNEL 0 /*
* Just define it instead of including the
* whole VM headers set.
*/
@@ -595,10 +604,11 @@
kernel = (char *)&_end;
altdst = 4 + load_kernel((unsigned int)kernel,
(unsigned int)curaddr,
- (unsigned int)&func_end , 0);
+ (unsigned int)&func_end + 800 , 0);
if (altdst > dst)
dst = altdst;
cpu_idcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
__asm __volatile("mrc p15, 0, %0, c1, c0, 0\n"
"bic %0, %0, #1\n" /* MMU_ENABLE */
"mcr p15, 0, %0, c1, c0, 0\n"
@@ -616,7 +626,7 @@
sp = sp &~3;
dst = (void *)(sp + 4);
memcpy((void *)dst, (void *)&load_kernel, (unsigned int)&func_end -
- (unsigned int)&load_kernel);
+ (unsigned int)&load_kernel + 800);
do_call(dst, kernel, dst + (unsigned int)(&func_end) -
- (unsigned int)(&load_kernel), sp);
+ (unsigned int)(&load_kernel) + 800, sp);
}
==== //depot/projects/delphij_fork/sys/arm/arm/identcpu.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.10 2006/11/19 23:45:33 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.11 2007/07/27 14:49:11 cognet Exp $");
#include <sys/systm.h>
#include <sys/param.h>
#include <sys/malloc.h>
@@ -374,6 +374,12 @@
printf(" IC disabled");
else
printf(" IC enabled");
+#ifdef CPU_XSCALE_81342
+ if ((ctrl & CPU_CONTROL_L2_ENABLE) == 0)
+ printf(" L2 disabled");
+ else
+ printf(" L2 enabled");
+#endif
break;
default:
break;
==== //depot/projects/delphij_fork/sys/arm/arm/intr.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.16 2007/06/04 21:38:45 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.17 2007/07/27 14:26:42 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
@@ -57,6 +57,27 @@
void arm_handler_execute(struct trapframe *, int);
+#ifdef INTR_FILTER
+static void
+intr_disab_eoi_src(void *arg)
+{
+ uintptr_t nb;
+
+ nb = (uintptr_t)arg;
+ arm_mask_irq(nb);
+}
+
+static void
+intr_eoi_src(void *arg)
+{
+ uintptr_t nb;
+
+ nb = (uintptr_t)arg;
+ arm_unmask_irq(nb);
+}
+
+#endif
+
void
arm_setup_irqhandler(const char *name, driver_filter_t *filt,
void (*hand)(void*), void *arg, int irq, int flags, void **cookiep)
@@ -68,8 +89,14 @@
return;
event = intr_events[irq];
if (event == NULL) {
+#ifdef INTR_FILTER
error = intr_event_create(&event, (void *)irq, 0,
+ (void (*)(void *))arm_unmask_irq, intr_eoi_src,
+ intr_disab_eoi_src, "intr%d:", irq);
+#else
+ error = intr_event_create(&event, (void *)irq, 0,
(void (*)(void *))arm_unmask_irq, "intr%d:", irq);
+#endif
if (error)
return;
intr_events[irq] = event;
@@ -102,19 +129,33 @@
arm_handler_execute(struct trapframe *frame, int irqnb)
{
struct intr_event *event;
- struct intr_handler *ih;
struct thread *td = curthread;
+#ifdef INTR_FILTER
+ int i;
+#else
int i, thread, ret;
+ struct intr_handler *ih;
+#endif
PCPU_INC(cnt.v_intr);
td->td_intr_nesting_level++;
while ((i = arm_get_next_irq()) != -1) {
+#ifndef INTR_FILTER
arm_mask_irq(i);
+#endif
intrcnt[intrcnt_tab[i]]++;
event = intr_events[i];
- if (!event || TAILQ_EMPTY(&event->ie_handlers))
+ if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+#ifdef INTR_FILTER
+ arm_mask_irq(i);
+#endif
continue;
+ }
+#ifdef INTR_FILTER
+ intr_event_handle(event, frame);
+ /* XXX: Log stray IRQs */
+#else
/* Execute fast handlers. */
ret = 0;
thread = 0;
@@ -139,6 +180,7 @@
intr_event_schedule_thread(event);
else
arm_unmask_irq(i);
+#endif
}
td->td_intr_nesting_level--;
}
==== //depot/projects/delphij_fork/sys/arm/arm/pmap.c#2 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.83 2007/06/11 21:29:26 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.84 2007/07/27 14:45:04 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -676,8 +676,14 @@
pmap_copy_page_func = pmap_copy_page_generic;
pmap_zero_page_func = pmap_zero_page_generic;
xscale_use_minidata = 0;
- pte_l1_s_cache_mode_pt = pte_l2_l_cache_mode_pt =
- pte_l2_s_cache_mode_pt = 0;
+ /* Make sure it is L2-cachable */
+ pte_l1_s_cache_mode |= L1_S_XSCALE_TEX(TEX_XSCALE_T);
+ pte_l1_s_cache_mode_pt = pte_l1_s_cache_mode &~ L1_S_XSCALE_P;
+ pte_l2_l_cache_mode |= L2_XSCALE_L_TEX(TEX_XSCALE_T) ;
+ pte_l2_l_cache_mode_pt = pte_l1_s_cache_mode;
+ pte_l2_s_cache_mode |= L2_XSCALE_T_TEX(TEX_XSCALE_T);
+ pte_l2_s_cache_mode_pt = pte_l2_s_cache_mode;
+
#else
pmap_copy_page_func = pmap_copy_page_xscale;
pmap_zero_page_func = pmap_zero_page_xscale;
@@ -2818,33 +2824,35 @@
* Low level mapping routines.....
***************************************************/
+#ifdef ARM_HAVE_SUPERSECTIONS
/* Map a super section into the KVA. */
void
pmap_kenter_supersection(vm_offset_t va, uint64_t pa, int flags)
{
- pd_entry_t pd = L1_S_PROTO | L1_S_SUPERSEC | (pa & L1_SUP_OFFSET) |
- (((pa >> 32) & 0x8) << 20) | L1_S_PROT(PTE_KERNEL,
+ pd_entry_t pd = L1_S_PROTO | L1_S_SUPERSEC | (pa & L1_SUP_FRAME) |
+ (((pa >> 32) & 0xf) << 20) | L1_S_PROT(PTE_KERNEL,
VM_PROT_READ|VM_PROT_WRITE) | L1_S_DOM(PMAP_DOMAIN_KERNEL);
struct l1_ttable *l1;
- vm_offset_t va_end;
+ vm_offset_t va0, va_end;
KASSERT(((va | pa) & L1_SUP_OFFSET) == 0,
- ("Not a valid section mapping"));
+ ("Not a valid super section mapping"));
if (flags & SECTION_CACHE)
pd |= pte_l1_s_cache_mode;
else if (flags & SECTION_PT)
pd |= pte_l1_s_cache_mode_pt;
- va = va & L1_SUP_OFFSET;
+ va0 = va & L1_SUP_FRAME;
va_end = va + L1_SUP_SIZE;
SLIST_FOREACH(l1, &l1_list, l1_link) {
+ va = va0;
for (; va < va_end; va += L1_S_SIZE) {
l1->l1_kva[L1_IDX(va)] = pd;
PTE_SYNC(&l1->l1_kva[L1_IDX(va)]);
}
}
-
}
+#endif
/* Map a section into the KVA. */
@@ -3681,7 +3689,11 @@
* These should only happen for pmap_kernel()
*/
KASSERT(pm == pmap_kernel(), ("huh"));
- pa = (l1pd & L1_S_FRAME) | (va & L1_S_OFFSET);
+ /* XXX: what to do about the bits > 32 ? */
+ if (l1pd & L1_S_SUPERSEC)
+ pa = (l1pd & L1_SUP_FRAME) | (va & L1_SUP_OFFSET);
+ else
+ pa = (l1pd & L1_S_FRAME) | (va & L1_S_OFFSET);
} else {
/*
* Note that we can't rely on the validity of the L1
@@ -3744,7 +3756,11 @@
* These should only happen for pmap_kernel()
*/
KASSERT(pmap == pmap_kernel(), ("huh"));
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list