PERFORCE change 143875 for review
Diego Giagio
diego at FreeBSD.org
Sat Jun 21 12:55:33 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=143875
Change 143875 by diego at diego_black on 2008/06/21 12:54:45
IFC
Affected files ...
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/mem.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/minidump_machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/include/pmc_mdep.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/include/stack.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/files.pxa#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/pxa_obio.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/pxa_space.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/boot/i386/libi386/time.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ndis.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/NOTES#6 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files#7 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files.i386#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/options.i386#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/options.pc98#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/agp/agp_i810.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-all.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-chipset.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bce.c#5 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ciss/ciss.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/et/if_et.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/et/if_etreg.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/et/if_etvar.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex_isa.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex_pccard.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_exvar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/if_ndis/if_ndis.c#6 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/if_ndis/if_ndisvar.h#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ixgbe/ixgbe.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ixgbe/tcp_lro.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ixgbe/tcp_lro.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/brgphy.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/miidevs#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/truephy.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/truephyreg.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/nmdm/nmdm.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/smc/if_smc.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/smc/if_smcvar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/tx/if_tx.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/tx/if_txvar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ehcivar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/if_rum.c#6 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uplcom.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/vkbd/vkbd.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/cd9660/cd9660_vnops.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_devs.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_int.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_vnops.c#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_bsd.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_if.m#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_pc98.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_vtoc8.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/include/pecoff_machdep.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_conf.c#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_dtrace.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/uipc_sem.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/Makefile#5 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/et/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/ixgbe/Makefile#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/mii/Makefile#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_gre.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_gre.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_tap.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_tun.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_bsd_addr.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_cc_functions.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_header.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_lock_bsd.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_os_bsd.h#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_peeloff.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_sysctl.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_uio.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_lro.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_lro.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/pc98/include/pecoff_machdep.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/pci/if_rl.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/pci/nfsmb.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/pmap.c#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powermac/macio.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_worker.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_framework.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_inet.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_policy.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/mac_lomac/mac_lomac.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/mac_stub/mac_stub.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/mac_test/mac_test.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/apm.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/bus.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/conf.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/ioctl.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/ioctl_compat.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/jail.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/param.h#5 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/systm.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/ttychars.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/sys/ttydev.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/vm/vnode_pager.c#3 integrate
Differences ...
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/mem.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.122 2008/03/12 21:43:50 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.123 2008/06/20 05:22:09 alc Exp $");
/*
* Memory special file
@@ -119,7 +119,7 @@
addr = trunc_page(v);
eaddr = round_page(v + c);
- if (addr < (vm_offset_t)KERNBASE)
+ if (addr < VM_MIN_KERNEL_ADDRESS)
return (EFAULT);
for (; addr < eaddr; addr += PAGE_SIZE)
if (pmap_extract(kernel_pmap, addr) == 0)
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/minidump_machdep.c#2 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.5 2008/06/20 20:59:31 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -206,7 +206,7 @@
/* Walk page table pages, set bits in vm_page_dump */
ptesize = 0;
pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys);
- for (va = KERNBASE; va < kernel_vm_end; va += NBPDR) {
+ for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) {
i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1);
/*
* We always write a page, even if it is zero. Each
@@ -278,7 +278,7 @@
mdhdr.msgbufsize = msgbufp->msg_size;
mdhdr.bitmapsize = vm_page_dump_size;
mdhdr.ptesize = ptesize;
- mdhdr.kernbase = KERNBASE;
+ mdhdr.kernbase = VM_MIN_KERNEL_ADDRESS;
mdhdr.dmapbase = DMAP_MIN_ADDRESS;
mdhdr.dmapend = DMAP_MAX_ADDRESS;
@@ -312,7 +312,7 @@
/* Dump kernel page table pages */
pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys);
- for (va = KERNBASE; va < kernel_vm_end; va += NBPDR) {
+ for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) {
i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1);
/* We always write a page, even if it is zero */
if ((pdp[i] & PG_V) == 0) {
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/pmap.c#6 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.619 2008/06/01 07:36:59 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.622 2008/06/20 05:22:09 alc Exp $");
/*
* Manages physical address maps.
@@ -1673,7 +1673,7 @@
static int
kvm_size(SYSCTL_HANDLER_ARGS)
{
- unsigned long ksize = VM_MAX_KERNEL_ADDRESS - KERNBASE;
+ unsigned long ksize = VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS;
return sysctl_handle_long(oidp, &ksize, 0, req);
}
@@ -1703,7 +1703,7 @@
mtx_assert(&kernel_map->system_mtx, MA_OWNED);
if (kernel_vm_end == 0) {
- kernel_vm_end = KERNBASE;
+ kernel_vm_end = VM_MIN_KERNEL_ADDRESS;
nkpt = 0;
while ((*pmap_pde(kernel_pmap, kernel_vm_end) & PG_V) != 0) {
kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1);
@@ -2759,8 +2759,8 @@
/*
* Tries to promote the 512, contiguous 4KB page mappings that are within a
- * single page table page to a single 2MB page mapping. For promotion to
- * occur, two conditions must be met: (1) the 4KB page mappings must map
+ * single page table page (PTP) to a single 2MB page mapping. For promotion
+ * to occur, two conditions must be met: (1) the 4KB page mappings must map
* aligned, contiguous physical memory and (2) the 4KB page mappings must have
* identical characteristics.
*/
@@ -2768,31 +2768,46 @@
pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va)
{
pd_entry_t newpde;
- pt_entry_t *firstpte, oldpte, *pte;
+ pt_entry_t *firstpte, oldpte, pa, *pte;
vm_offset_t oldpteva;
- vm_paddr_t pa;
vm_page_t mpte;
PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+
+ /*
+ * Examine the first PTE in the specified PTP. Abort if this PTE is
+ * either invalid, unused, or does not map the first 4KB physical page
+ * within a 2MB page.
+ */
firstpte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME);
+setpde:
newpde = *firstpte;
- if ((newpde & (PG_A | PG_V)) != (PG_A | PG_V)) {
+ if ((newpde & ((PG_FRAME & PDRMASK) | PG_A | PG_V)) != (PG_A | PG_V)) {
pmap_pde_p_failures++;
CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx"
" in pmap %p", va, pmap);
return;
}
- if ((newpde & (PG_M | PG_RW)) == PG_RW)
+ if ((newpde & (PG_M | PG_RW)) == PG_RW) {
+ /*
+ * When PG_M is already clear, PG_RW can be cleared without
+ * a TLB invalidation.
+ */
+ if (!atomic_cmpset_long(firstpte, newpde, newpde & ~PG_RW))
+ goto setpde;
newpde &= ~PG_RW;
+ }
- /*
- * Check all the ptes before promotion
+ /*
+ * Examine each of the other PTEs in the specified PTP. Abort if this
+ * PTE maps an unexpected 4KB physical page or does not have identical
+ * characteristics to the first PTE.
*/
- pa = newpde & PG_PS_FRAME;
- for (pte = firstpte; pte < firstpte + NPTEPG; pte++) {
-retry:
+ pa = (newpde & (PG_PS_FRAME | PG_A | PG_V)) + NBPDR - PAGE_SIZE;
+ for (pte = firstpte + NPTEPG - 1; pte > firstpte; pte--) {
+setpte:
oldpte = *pte;
- if ((oldpte & PG_FRAME) != pa) {
+ if ((oldpte & (PG_FRAME | PG_A | PG_V)) != pa) {
pmap_pde_p_failures++;
CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx"
" in pmap %p", va, pmap);
@@ -2804,7 +2819,7 @@
* without a TLB invalidation.
*/
if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW))
- goto retry;
+ goto setpte;
oldpte &= ~PG_RW;
oldpteva = (oldpte & PG_FRAME & PDRMASK) |
(va & ~PDRMASK);
@@ -2817,7 +2832,7 @@
" in pmap %p", va, pmap);
return;
}
- pa += PAGE_SIZE;
+ pa -= PAGE_SIZE;
}
/*
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/trap.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.326 2008/05/24 06:32:26 jb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.327 2008/06/20 05:22:09 alc Exp $");
/*
* AMD64 Trap and System call handling
@@ -605,7 +605,7 @@
vm_offset_t eva = frame->tf_addr;
va = trunc_page(eva);
- if (va >= KERNBASE) {
+ if (va >= VM_MIN_KERNEL_ADDRESS) {
/*
* Don't allow user-mode faults in kernel address space.
*/
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/GENERIC#4 (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.501 2008/05/27 02:22:32 yongari Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.502 2008/06/20 19:28:33 delphij Exp $
cpu HAMMER
ident GENERIC
@@ -204,6 +204,7 @@
device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
+device et # Agere ET1310 10/100/Gigabit Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/include/pmc_mdep.h#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/include/pmc_mdep.h,v 1.4 2007/12/07 08:20:15 jkoshy Exp $
+ * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.5 2008/06/20 05:22:09 alc Exp $
*/
/* Machine dependent interfaces */
@@ -74,8 +74,8 @@
#define PMC_IN_KERNEL_STACK(S,START,END) \
((S) >= (START) && (S) < (END))
-#define PMC_IN_KERNEL(va) (((va) >= DMAP_MIN_ADDRESS && \
- (va) < DMAP_MAX_ADDRESS) || ((va) >= KERNBASE && \
+#define PMC_IN_KERNEL(va) (((va) >= DMAP_MIN_ADDRESS && \
+ (va) < DMAP_MAX_ADDRESS) || ((va) >= VM_MIN_KERNEL_ADDRESS && \
(va) < VM_MAX_KERNEL_ADDRESS))
#define PMC_IN_USERSPACE(va) ((va) <= VM_MAXUSER_ADDRESS)
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/include/stack.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $FreeBSD: src/sys/amd64/include/stack.h,v 1.1 2007/12/02 20:40:31 rwatson Exp $
+ * $FreeBSD: src/sys/amd64/include/stack.h,v 1.2 2008/06/20 05:22:09 alc Exp $
*/
#ifndef _MACHINE_STACK_H_
@@ -33,7 +33,7 @@
* Stack trace.
*/
#define INKERNEL(va) (((va) >= DMAP_MIN_ADDRESS && (va) < DMAP_MAX_ADDRESS) \
- || ((va) >= KERNBASE && (va) < VM_MAX_KERNEL_ADDRESS))
+ || ((va) >= VM_MIN_KERNEL_ADDRESS && (va) < VM_MAX_KERNEL_ADDRESS))
struct amd64_frame {
struct amd64_frame *f_frame;
==== //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.3 2008/06/12 01:46:06 kevlo Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -185,7 +185,7 @@
IOP34X_PCIE_OIOBAR_VADDR,
(sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR :
IOP34X_PCIE_OIOBAR_VADDR) + IOP34X_OIOBAR_SIZE) != 0) {
- panic("i80321_pci_probe: failed to set up I/O rman");
+ panic("i81342_pci_probe: failed to set up I/O rman");
}
sc->sc_mem_rman.rm_type = RMAN_ARRAY;
sc->sc_mem_rman.rm_descr = "I81342 PCI Memory";
==== //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/files.pxa#2 (text+ko) ====
@@ -1,5 +1,6 @@
-# $FreeBSD: src/sys/arm/xscale/pxa/files.pxa,v 1.1 2008/06/06 05:08:09 benno Exp $
+# $FreeBSD: src/sys/arm/xscale/pxa/files.pxa,v 1.2 2008/06/10 03:44:14 kevlo Exp $
+arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_xscale.S standard
arm/arm/irq_dispatch.S standard
==== //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/pxa_obio.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_obio.c,v 1.1 2008/06/06 05:08:09 benno Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_obio.c,v 1.2 2008/06/10 06:06:15 kevlo Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,6 +183,12 @@
}
static int
+pxa_teardown_intr(device_t dev, device_t child, struct resource *ires,
+ void *cookie)
+{
+ return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, ires, cookie));}
+
+static int
pxa_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
{
struct obio_device *od;
@@ -313,19 +319,20 @@
}
static device_method_t pxa_methods[] = {
- DEVMETHOD(device_identify, pxa_identify),
- DEVMETHOD(device_probe, pxa_probe),
- DEVMETHOD(device_attach, pxa_attach),
+ DEVMETHOD(device_identify, pxa_identify),
+ DEVMETHOD(device_probe, pxa_probe),
+ DEVMETHOD(device_attach, pxa_attach),
- DEVMETHOD(bus_print_child, pxa_print_child),
+ DEVMETHOD(bus_print_child, pxa_print_child),
- DEVMETHOD(bus_read_ivar, pxa_read_ivar),
- DEVMETHOD(bus_setup_intr, pxa_setup_intr),
+ DEVMETHOD(bus_read_ivar, pxa_read_ivar),
+ DEVMETHOD(bus_setup_intr, pxa_setup_intr),
+ DEVMETHOD(bus_teardown_intr, pxa_teardown_intr),
- DEVMETHOD(bus_get_resource_list, pxa_get_resource_list),
- DEVMETHOD(bus_alloc_resource, pxa_alloc_resource),
- DEVMETHOD(bus_release_resource, pxa_release_resource),
- DEVMETHOD(bus_activate_resource, pxa_activate_resource),
+ DEVMETHOD(bus_get_resource_list, pxa_get_resource_list),
+ DEVMETHOD(bus_alloc_resource, pxa_alloc_resource),
+ DEVMETHOD(bus_release_resource, pxa_release_resource),
+ DEVMETHOD(bus_activate_resource, pxa_activate_resource),
{0, 0}
};
==== //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/pxa_space.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_space.c,v 1.1 2008/06/06 05:08:09 benno Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_space.c,v 1.2 2008/06/10 03:44:14 kevlo Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,13 +48,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <machine/pcb.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
-
#include <machine/bus.h>
#include <arm/xscale/pxa/pxareg.h>
@@ -63,7 +56,6 @@
MALLOC_DEFINE(M_PXATAG, "PXA bus_space tags", "Bus_space tags for PXA");
/* Prototypes for all the bus_space structure functions */
-bs_protos(obio);
bs_protos(generic);
bs_protos(generic_armv4);
bs_protos(pxa);
@@ -77,16 +69,16 @@
(void *) 0,
/* mapping/unmapping */
- obio_bs_map,
- obio_bs_unmap,
- obio_bs_subregion,
+ generic_bs_map,
+ generic_bs_unmap,
+ generic_bs_subregion,
/* allocation/deallocation */
- obio_bs_alloc,
- obio_bs_free,
+ generic_bs_alloc,
+ generic_bs_free,
/* barrier */
- obio_bs_barrier,
+ generic_bs_barrier,
/* read (single) */
pxa_bs_r_1,
@@ -174,94 +166,6 @@
return ((bus_space_tag_t)tag);
}
-int
-obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
- bus_space_handle_t *bshp)
-{
- const struct pmap_devmap *pd;
- vm_paddr_t startpa, endpa, pa, offset;
- vm_offset_t va;
- pt_entry_t *pte;
-
- if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
- /* Device was statically mapped. */
- *bshp = pd->pd_va + (bpa - pd->pd_pa);
- return (0);
- }
-
- endpa = round_page(bpa + size);
- offset = bpa & PAGE_MASK;
- startpa = trunc_page(bpa);
-
- va = kmem_alloc(kernel_map, endpa - startpa);
- if (va == 0)
- return (ENOMEM);
-
- *bshp = va + offset;
-
- for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
- pmap_kenter(va, pa);
- pte = vtopte(va);
- *pte &= ~L2_S_CACHE_MASK;
- PTE_SYNC(pte);
- }
-
- return (0);
-}
-
-int
-obio_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
- bus_size_t alignment, bus_size_t boundary, int flags, bus_addr_t *bpap,
- bus_space_handle_t *bshp)
-{
-
- panic("obio_bs_alloc(): not implemented");
-}
-
-
-void
-obio_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size)
-{
- vm_offset_t va, endva;
-
- if (pmap_devmap_find_va((vm_offset_t)t, size) != NULL) {
- /* Device was statically mapped; nothing to do. */
- return;
- }
-
- endva = round_page((vm_offset_t)t + size);
- va = trunc_page((vm_offset_t)t);
-
- while (va < endva) {
- pmap_kremove(va);
- va += PAGE_SIZE;
- }
- kmem_free(kernel_map, va, endva - va);
-}
-
-void
-obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
-{
-
- panic("obio_bs_free(): not implemented");
-}
-
-int
-obio_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset,
- bus_size_t size, bus_space_handle_t *nbshp)
-{
-
- *nbshp = bsh + offset;
- return (0);
-}
-
-void
-obio_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset,
- bus_size_t len, int flags)
-{
-
- /* Nothing to do. */
-}
#define READ_SINGLE(type, proto, base) \
type \
==== //depot/projects/soc2008/diego-audit/src/sys/boot/i386/libi386/time.c#2 (text+ko) ====
@@ -25,25 +25,23 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.5 2003/08/25 23:28:31 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.6 2008/06/16 17:04:04 olli Exp $");
#include <stand.h>
#include <btxv86.h>
#include "bootstrap.h"
#include "libi386.h"
+static int bios_seconds(void);
+
/*
- * Return the time in seconds since the beginning of the day.
+ * Return the BIOS time-of-day value.
*
- * If we pass midnight, don't wrap back to 0.
- *
* XXX uses undocumented BCD support from libstand.
*/
-
-time_t
-time(time_t *t)
+static int
+bios_seconds(void)
{
- static time_t lasttime, now;
int hr, minute, sec;
v86.ctl = 0;
@@ -55,7 +53,33 @@
minute = bcd2bin(v86.ecx & 0xff); /* minute in %cl */
sec = bcd2bin((v86.edx & 0xff00) >> 8); /* second in %dh */
- now = hr * 3600 + minute * 60 + sec;
+ return (hr * 3600 + minute * 60 + sec);
+}
+
+/*
+ * Return the time in seconds since the beginning of the day.
+ *
+ * Some BIOSes (notably qemu) don't correctly read the RTC
+ * registers in an atomic way, sometimes returning bogus values.
+ * Therefore we "debounce" the reading by accepting it only when
+ * we got two identical values in succession.
+ *
+ * If we pass midnight, don't wrap back to 0.
+ */
+time_t
+time(time_t *t)
+{
+ static time_t lasttime;
+ time_t now, check;
+ int try;
+
+ try = 0;
+ check = bios_seconds();
+ do {
+ now = check;
+ check = bios_seconds();
+ } while (now != check && ++try < 1000);
+
if (now < lasttime)
now += 24 * 3600;
lasttime = now;
==== //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.4 2008/06/01 01:46:37 jb Exp $
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.5 2008/06/11 18:55:19 ed Exp $
*/
/*
@@ -16445,6 +16445,7 @@
static struct cdevsw dtrace_cdevsw = {
.d_version = D_VERSION,
+ .d_flags = D_NEEDMINOR,
.d_close = dtrace_close,
.d_ioctl = dtrace_ioctl,
.d_open = dtrace_open,
==== //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 (text+ko) ====
@@ -279,12 +279,6 @@
#ifndef MAXMIN64
#define MAXMIN64 0xffffffffUL
#endif
-#ifndef major
-#define major(x) ((int)(((u_int)(x) >> 8)&0xff)) /* major number */
-#endif
-#ifndef minor
-#define minor(x) ((int)((x)&0xffff00ff)) /* minor number */
-#endif
/*
* Create special expldev for ZFS private use.
@@ -297,7 +291,7 @@
static uint64_t
zfs_expldev(dev_t dev)
{
- return (((uint64_t)major(dev) << NBITSMINOR64) | minor(dev));
+ return (((uint64_t)umajor(dev) << NBITSMINOR64) | uminor(dev));
}
/*
* Special cmpldev for ZFS private use.
==== //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ndis.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.112 2008/05/15 04:29:28 weongyo Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.113 2008/06/11 07:55:07 weongyo Exp $");
/*
* This file implements a translation layer between the BSD networking
@@ -1018,7 +1018,7 @@
sc = device_get_softc(dev);
ifp = sc->ifp;
- if (ifp->if_flags & IFF_DEBUG) {
+ if (ifp != NULL && ifp->if_flags & IFF_DEBUG) {
error = pe_get_message((vm_offset_t)drv->dro_driverstart,
code, &str, &i, &flags);
if (error == 0) {
@@ -1036,7 +1036,7 @@
device_printf (dev, "NDIS ERROR: %x (%s)\n", code,
str == NULL ? "unknown error" : str);
- if (ifp->if_flags & IFF_DEBUG) {
+ if (ifp != NULL && ifp->if_flags & IFF_DEBUG) {
device_printf (dev, "NDIS NUMERRORS: %x\n", numerrors);
va_start(ap, numerrors);
for (i = 0; i < numerrors; i++)
==== //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ntoskrnl.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.95 2008/05/30 06:31:55 weongyo Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.96 2008/06/15 13:37:29 cokane Exp $");
#include <sys/ctype.h>
#include <sys/unistd.h>
@@ -225,6 +225,8 @@
static ndis_status PsCreateSystemThread(ndis_handle *,
uint32_t, void *, ndis_handle, void *, void *, void *);
static ndis_status PsTerminateSystemThread(ndis_status);
+static ndis_status IoGetDeviceObjectPointer(unicode_string *,
+ uint32_t, void *, device_object *);
static ndis_status IoGetDeviceProperty(device_object *, uint32_t,
uint32_t, void *, uint32_t *);
static void KeInitializeMutex(kmutant *, uint32_t);
@@ -3235,6 +3237,16 @@
}
static ndis_status
+IoGetDeviceObjectPointer(name, reqaccess, fileobj, devobj)
+ unicode_string *name;
+ uint32_t reqaccess;
+ void *fileobj;
+ device_object *devobj;
+{
+ return(STATUS_SUCCESS);
+}
+
+static ndis_status
IoGetDeviceProperty(devobj, regprop, buflen, prop, reslen)
device_object *devobj;
uint32_t regprop;
@@ -4391,6 +4403,7 @@
IMPORT_SFUNC(MmUnmapIoSpace, 2),
IMPORT_SFUNC(KeInitializeSpinLock, 1),
IMPORT_SFUNC(IoIsWdmVersionAvailable, 2),
+ IMPORT_SFUNC(IoGetDeviceObjectPointer, 4),
IMPORT_SFUNC(IoGetDeviceProperty, 5),
IMPORT_SFUNC(IoAllocateWorkItem, 1),
IMPORT_SFUNC(IoFreeWorkItem, 1),
==== //depot/projects/soc2008/diego-audit/src/sys/conf/NOTES#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1494 2008/06/08 01:58:11 marcel Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1495 2008/06/20 19:28:33 delphij Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1876,6 +1876,7 @@
device cxgb # Chelsio T3 10 Gigabit Ethernet
device cxgb_t3fw # Chelsio T3 10 Gigabit Ethernet firmware
device dc # DEC/Intel 21143 and various workalikes
+device et # Agere ET1310 10/100/Gigabit Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
hint.fxp.0.prefer_iomap="0"
device gem # Apple GMAC/Sun ERI/Sun GEM
==== //depot/projects/soc2008/diego-audit/src/sys/conf/files#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1307 2008/06/06 05:00:49 benno Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1310 2008/06/20 19:28:33 delphij Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -636,6 +636,7 @@
compile-with "${NORMAL_C} -I$S/dev/em"
dev/em/e1000_osdep.c optional em | igb \
compile-with "${NORMAL_C} -I$S/dev/em"
+dev/et/if_et.c optional et
dev/en/if_en_pci.c optional en pci
dev/en/midway.c optional en
dev/ep/if_ep.c optional ep
@@ -904,6 +905,7 @@
dev/mii/smcphy.c optional miibus | smcphy
dev/mii/tdkphy.c optional miibus | tdkphy
dev/mii/tlphy.c optional miibus | tlphy
+dev/mii/truephy.c optional miibus | truephy
dev/mii/ukphy.c optional miibus | mii
dev/mii/ukphy_subr.c optional miibus | mii
dev/mii/xmphy.c optional miibus | xmphy
@@ -1817,7 +1819,7 @@
netatalk/aarp.c optional netatalk
netatalk/at_control.c optional netatalk
netatalk/at_proto.c optional netatalk
-netatalk/at_rmx.c optional netatalkdebug
+netatalk/at_rmx.c optional netatalk
netatalk/ddp_input.c optional netatalk
netatalk/ddp_output.c optional netatalk
netatalk/ddp_pcb.c optional netatalk
@@ -1946,6 +1948,7 @@
netinet/tcp_debug.c optional tcpdebug
netinet/tcp_hostcache.c optional inet
netinet/tcp_input.c optional inet
+netinet/tcp_lro.c optional inet
netinet/tcp_output.c optional inet
netinet/tcp_offload.c optional inet
netinet/tcp_reass.c optional inet
==== //depot/projects/soc2008/diego-audit/src/sys/conf/files.i386#3 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.596 2008/05/26 10:39:52 bz Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.597 2008/06/14 12:51:44 wkoszek Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -107,7 +107,6 @@
compat/ndis/subr_pe.c optional ndisapi pci
compat/ndis/subr_usbd.c optional ndisapi pci
compat/ndis/winx32_wrap.S optional ndisapi pci
-compat/pecoff/imgact_pecoff.c optional pecoff_support
compat/svr4/imgact_svr4.c optional compat_svr4
compat/svr4/svr4_fcntl.c optional compat_svr4
compat/svr4/svr4_filio.c optional compat_svr4
==== //depot/projects/soc2008/diego-audit/src/sys/conf/files.pc98#3 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.363 2008/05/26 10:39:52 bz Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.364 2008/06/14 12:51:44 wkoszek Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -70,7 +70,6 @@
compat/linux/linux_time.c optional compat_linux
compat/linux/linux_uid16.c optional compat_linux
compat/linux/linux_util.c optional compat_linux
-compat/pecoff/imgact_pecoff.c optional pecoff_support
compat/svr4/imgact_svr4.c optional compat_svr4
compat/svr4/svr4_fcntl.c optional compat_svr4
compat/svr4/svr4_filio.c optional compat_svr4
==== //depot/projects/soc2008/diego-audit/src/sys/conf/options.i386#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.241 2008/05/26 10:39:52 bz Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $
# Options specific to the i386 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
@@ -27,8 +27,6 @@
LINPROCFS opt_dontuse.h
LINSYSFS opt_dontuse.h
NDISAPI opt_dontuse.h
-PECOFF_DEBUG opt_pecoff.h
-PECOFF_SUPPORT opt_dontuse.h
# Change KVM size. Changes things all over the kernel.
KVA_PAGES opt_global.h
==== //depot/projects/soc2008/diego-audit/src/sys/conf/options.pc98#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.pc98,v 1.203 2008/05/26 10:39:52 bz Exp $
+# $FreeBSD: src/sys/conf/options.pc98,v 1.204 2008/06/14 12:51:44 wkoszek Exp $
# Options specific to the pc98 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
@@ -25,8 +25,6 @@
DEBUG_SVR4 opt_svr4.h
LINPROCFS opt_dontuse.h
LINSYSFS opt_dontuse.h
-PECOFF_DEBUG opt_pecoff.h
-PECOFF_SUPPORT opt_dontuse.h
# Change KVM size. Changes things all over the kernel.
KVA_PAGES opt_global.h
==== //depot/projects/soc2008/diego-audit/src/sys/ddb/db_ps.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.68 2008/03/25 20:36:32 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.69 2008/06/18 20:42:01 attilio Exp $");
#include <sys/param.h>
#include <sys/cons.h>
@@ -292,6 +292,7 @@
DB_SHOW_COMMAND(thread, db_show_thread)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list