Date: Fri, 29 Jul 2005 15:19:19 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 81161 for review Message-ID: <200507291519.j6TFJJO8067913@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=81161 Change 81161 by jhb@jhb_slimer on 2005/07/29 15:18:26 IFC @81157. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/bios.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#23 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#35 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#19 integrate .. //depot/projects/smpng/sys/amd64/include/atomic.h#23 integrate .. //depot/projects/smpng/sys/amd64/include/bus_dma.h#12 integrate .. //depot/projects/smpng/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#17 integrate .. //depot/projects/smpng/sys/arm/include/clock.h#2 integrate .. //depot/projects/smpng/sys/arm/include/endian.h#13 integrate .. //depot/projects/smpng/sys/boot/common/console.c#4 integrate .. //depot/projects/smpng/sys/boot/common/help.common#18 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#35 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#101 integrate .. //depot/projects/smpng/sys/conf/files#145 integrate .. //depot/projects/smpng/sys/conf/files.amd64#34 integrate .. //depot/projects/smpng/sys/conf/options#104 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#18 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#8 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdStream.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#23 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#26 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_package.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpiio.h#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#58 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#32 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#44 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#29 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#24 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#19 integrate .. //depot/projects/smpng/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#12 integrate .. //depot/projects/smpng/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/r300_cmdbuf.c#1 branch .. //depot/projects/smpng/sys/dev/drm/r300_reg.h#1 branch .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#12 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#13 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#23 integrate .. //depot/projects/smpng/sys/dev/ep/if_epvar.h#12 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#22 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#11 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#10 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#49 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral.c#7 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#10 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#48 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#7 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#20 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#73 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#48 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#18 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli.h#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli_key.c#1 branch .. //depot/projects/smpng/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/projects/smpng/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/projects/smpng/sys/geom/geom_io.c#36 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#17 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#8 integrate .. //depot/projects/smpng/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#21 integrate .. //depot/projects/smpng/sys/i386/bios/smapi_bios.S#4 integrate .. //depot/projects/smpng/sys/i386/bios/smbios.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#104 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#14 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#4 integrate .. //depot/projects/smpng/sys/i386/include/pc/bios.h#6 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#98 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#38 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#59 integrate .. //depot/projects/smpng/sys/kern/subr_mchain.c#14 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#71 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#59 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#80 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#106 integrate .. //depot/projects/smpng/sys/libkern/iconv.c#9 integrate .. //depot/projects/smpng/sys/modules/de/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/drm/radeon/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/geom/geom_eli/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_zero/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#53 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#12 integrate .. //depot/projects/smpng/sys/net/if.c#70 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#19 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#5 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#60 integrate .. //depot/projects/smpng/sys/net/if_gif.c#27 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#26 integrate .. //depot/projects/smpng/sys/net/if_var.h#39 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#18 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#14 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#13 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#17 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#16 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#13 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#20 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#37 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#32 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#10 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#57 integrate .. //depot/projects/smpng/sys/netinet/ip6.h#7 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#56 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#68 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#70 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#39 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#25 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#43 integrate .. //depot/projects/smpng/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/smpng/sys/netinet6/ah_core.c#10 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#30 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#26 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#16 integrate .. //depot/projects/smpng/sys/netinet6/in6_cksum.c#8 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#14 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#37 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#12 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#21 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#12 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#14 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#40 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#19 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.h#4 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#41 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#16 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#22 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#12 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#26 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#16 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#13 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#34 integrate .. //depot/projects/smpng/sys/netinet6/route6.c#8 integrate .. //depot/projects/smpng/sys/netinet6/scope6.c#7 integrate .. //depot/projects/smpng/sys/netinet6/scope6_var.h#4 integrate .. //depot/projects/smpng/sys/netinet6/udp6_output.c#18 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#34 integrate .. //depot/projects/smpng/sys/netkey/key.c#30 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#23 integrate .. //depot/projects/smpng/sys/netnatm/natm.h#6 integrate .. //depot/projects/smpng/sys/netnatm/natm_pcb.c#7 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#13 integrate .. //depot/projects/smpng/sys/netncp/ncp_rq.c#8 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#25 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#43 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#21 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#36 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#26 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#15 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#41 integrate .. //depot/projects/smpng/sys/pci/if_de.c#26 integrate .. //depot/projects/smpng/sys/pci/if_devar.h#9 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#51 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#59 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#15 integrate .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#26 integrate .. //depot/projects/smpng/sys/sys/mchain.h#9 integrate .. //depot/projects/smpng/sys/sys/param.h#84 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#73 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#58 integrate .. //depot/projects/smpng/sys/vm/uma.h#17 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#57 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#73 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/bios.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bios.c,v 1.72 2004/09/24 01:08:34 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bios.c,v 1.73 2005/07/21 09:48:36 phk Exp $"); /* * Subset of the i386 bios support code. We cannot make bios16 nor bios32 @@ -93,18 +93,3 @@ } return(0); } - -const u_char * -bios_string(u_int from, u_int to, const u_char *string, int len) -{ - const char *t, *te; - - if (len == 0) - len = strlen(string); - t = (const char *)(KERNBASE + from); - te = (const char *)(KERNBASE + to); - for (; t <= te; t++) - if (!memcmp(string, t, len)) - return (t); - return (NULL); -} ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260 2005/06/29 23:23:16 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.261 2005/07/21 21:46:09 peter Exp $"); #include "opt_cpu.h" #include "opt_kdb.h" @@ -95,6 +95,9 @@ /* Free these after use */ void *bootstacks[MAXCPU]; +/* Temporary holder for double fault stack */ +char *doublefault_stack; + /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; @@ -432,6 +435,7 @@ common_tss[cpu] = common_tss[0]; common_tss[cpu].tss_rsp0 = 0; /* not used until after switch */ common_tss[cpu].tss_iobase = sizeof(struct amd64tss); + common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE]; gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], @@ -679,7 +683,8 @@ cpu_apic_ids[cpu] = apic_id; /* allocate and set up an idle stack data page */ - bootstacks[cpu] = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8; bootAP = cpu; ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#35 (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.440 2005/07/14 15:39:04 kensmith Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.441 2005/07/24 17:55:57 mux Exp $ machine amd64 cpu HAMMER @@ -215,8 +215,7 @@ # ISA Ethernet NICs. pccard NICs included. device cs # Crystal Semiconductor CS89x0 NIC # 'device ed' requires 'device miibus' -# XXX kvtop brokenness, pointer/int warnings -#device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards +device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards ==== //depot/projects/smpng/sys/amd64/conf/NOTES#19 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36 2005/06/30 05:33:25 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.41 2005/07/22 16:02:40 ru Exp $ # # @@ -210,7 +210,7 @@ device mach64drm # ATI Rage Pro, Rage Mobility P/M, Rage XL device mgadrm # AGP Matrox G200, G400, G450, G550 device r128drm # ATI Rage 128 -device radeondrm # ATI Radeon up to 9200 +device radeondrm # ATI Radeon device sisdrm # SiS 300/305, 540, 630 device tdfxdrm # 3dfx Voodoo 3/4/5 and Banshee options DRM_DEBUG # Include debug printfs (slow) @@ -226,11 +226,11 @@ # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) +device ed +options ED_3C503 +options ED_HPP +options ED_SIC #XXX# still calls MD i386 kvtop function instead of vtophys etc -#XXX#device ed -#XXX#options ED_3C503 -#XXX#options ED_HPP -#XXX#options ED_SIC #XXX#device lnc device ath @@ -297,6 +297,8 @@ # # Miscellaneous hardware: # +# smbios: DMI/SMBIOS entry point +# vpd: Vital Product Data kernel interface # cy: Cyclades serial driver # digi: Digiboard driver @@ -321,6 +323,8 @@ device pbio hint.pbio.0.at="isa" hint.pbio.0.port="0x360" +device smbios +device vpd # sx device is i386 and pc98 only at the moment. device sx options SX_DEBUG ==== //depot/projects/smpng/sys/amd64/include/atomic.h#23 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.35 2005/07/15 18:17:57 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.36 2005/07/21 22:35:02 peter Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -152,10 +152,35 @@ return (res); } +#if defined(_KERNEL) && !defined(SMP) + +/* + * We assume that a = b will do atomic loads and stores. However, on a + * PentiumPro or higher, reads may pass writes, so for that case we have + * to use a serializing instruction (i.e. with LOCK) to do the load in + * SMP kernels. For UP kernels, however, the cache of the single processor + * is always consistent, so we don't need any memory barriers. + */ #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ + return (*p); \ +} \ + \ +static __inline void \ +atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ +{ \ + *p = v; \ +} \ +struct __hack + +#else /* defined(SMP) */ + +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ +static __inline u_##TYPE \ +atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ +{ \ u_##TYPE res; \ \ __asm __volatile(__XSTRING(MPLOCKED) LOP \ @@ -179,6 +204,8 @@ } \ struct __hack +#endif /* SMP */ + #endif /* KLD_MODULE || !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ==== //depot/projects/smpng/sys/amd64/include/bus_dma.h#12 (text+ko) ==== @@ -22,8 +22,9 @@ * LIABILITY, OR TORT (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/sys/amd64/include/bus_dma.h,v 1.30 2005/07/22 04:03:25 obrien Exp $ */ -/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.29 2005/03/14 16:46:27 scottl Exp $ */ #ifndef _AMD64_BUS_DMA_H_ #define _AMD64_BUS_DMA_H_ ==== //depot/projects/smpng/sys/amd64/include/pc/bios.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.18 2004/09/24 00:42:36 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.19 2005/07/21 09:48:36 phk Exp $ */ #ifndef _MACHINE_PC_BIOS_H_ @@ -48,7 +48,22 @@ u_int32_t type; } __packed; -const u_char *bios_string(u_int from, u_int to, const u_char *string, int len); +struct bios_oem_signature { + char * anchor; /* search anchor string in BIOS memory */ + size_t offset; /* offset from anchor (may be negative) */ + size_t totlen; /* total length of BIOS string to copy */ +} __packed; +struct bios_oem_range { + u_int from; /* shouldn't be below 0xe0000 */ + u_int to; /* shouldn't be above 0xfffff */ +} __packed; +struct bios_oem { + struct bios_oem_range range; + struct bios_oem_signature signature[]; +} __packed; + +extern int +bios_oem_strings(struct bios_oem *oem, u_char *buffer, size_t maxlen); #endif /* _MACHINE_PC_BIOS_H_ */ ==== //depot/projects/smpng/sys/arm/include/atomic.h#17 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.9 2005/07/15 18:17:57 jhb Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.10 2005/07/27 20:01:44 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ ==== //depot/projects/smpng/sys/arm/include/clock.h#2 (text+ko) ==== @@ -23,10 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/clock.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/clock.h,v 1.2 2005/07/27 21:19:28 imp Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ +#define wall_cmos_clock 0 +#define adjkerntz 0 + #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/smpng/sys/arm/include/endian.h#13 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.9 2005/05/24 21:43:16 cognet Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $ */ #ifndef _ENDIAN_H_ ==== //depot/projects/smpng/sys/boot/common/console.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.7 2005/05/27 19:30:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.8 2005/07/29 12:47:42 brian Exp $"); #include <stand.h> #include <string.h> @@ -217,7 +217,7 @@ if (*curpos == '\0') continue; cons = cons_find(curpos); - if (cons > 0) { + if (cons >= 0) { consoles[cons]->c_flags |= C_ACTIVEIN | C_ACTIVEOUT; consoles[cons]->c_init(0); } ==== //depot/projects/smpng/sys/boot/common/help.common#18 (text+ko) ==== @@ -223,7 +223,7 @@ set currdev=<device> - Selects the default device. Syntax for devices is odd. + Selects the default device. See lsdev for available devices. ################################################################################ # Tset Sinit_path DSet the list of init candidates ==== //depot/projects/smpng/sys/boot/forth/loader.conf#35 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.95 2005/05/19 23:03:02 sobomax Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.96 2005/07/29 12:41:37 brian Exp $ ############################################################## ### Basic configuration options ############################ @@ -47,7 +47,7 @@ # allowed to interrupt autoboot process and # escape to the loader prompt #beastie_disable="NO" # Turn the beastie boot menu on and off -#console="vidconsole" # Set the current console +#console="vidconsole" # A comma separated list of console(s) #currdev="disk1s1a" # Set the current device module_path="/boot/modules" # Set the module search path #prompt="\\${interpret}" # Set the command prompt @@ -59,16 +59,18 @@ ### Kernel settings ######################################## ############################################################## - # The following boot_ variables are enabled - # by setting them to any value. -#boot_askname="" # Prompt the user for the name of the root device -#boot_cdrom="" # Attempt to mount root file system from CD-ROM -#boot_ddb="" # Instructs the kernel to start in the DDB debugger -#boot_gdb="" # Selects gdb-remote mode for the kernel debugger -#boot_multicons="" # Use multiple consoles -#boot_serial="" # Use serial console -#boot_single="" # Start system in single-user mode -#boot_verbose="" # Causes extra debugging information to be printed +# The following boot_ variables are enabled by setting them to any value. +# Their presence in the kernel environment (see kenv(1)) has the same +# effect as setting the given boot flag (see boot(8)). + +#boot_askname="" # -a: Prompt the user for the name of the root device +#boot_cdrom="" # -C: Attempt to mount root file system from CD-ROM +#boot_ddb="" # -d: Instructs the kernel to start in the DDB debugger +#boot_gdb="" # -g: Selects gdb-remote mode for the kernel debugger +#boot_multicons="" # -D: Use multiple consoles +#boot_serial="" # -h: Use serial console +#boot_single="" # -s: Start system in single-user mode +#boot_verbose="" # -v: Causes extra debugging information to be printed #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall" # Sets the list of init candidates ==== //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.1 2005/07/14 19:52:22 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.2 2005/07/27 19:11:10 jkim Exp $"); #include <stand.h> #include <bootstrap.h> @@ -72,9 +72,6 @@ if (smbios == NULL) return; - /* export values from the SMBIOS */ - setenv("hint.smbios.0.enabled", "YES", 1); - length = *(u_int16_t *)(smbios + 0x16); /* Structure Table Length */ paddr = *(u_int32_t *)(smbios + 0x18); /* Structure Table Address */ count = *(u_int16_t *)(smbios + 0x1c); /* No of SMBIOS Structures */ @@ -91,26 +88,26 @@ switch(dmi[0]) { case 0: /* Type 0: BIOS */ - smbios_setenv("hint.smbios.0.bios.vendor", dmi, 0x04); - smbios_setenv("hint.smbios.0.bios.version", dmi, 0x05); - smbios_setenv("hint.smbios.0.bios.reldate", dmi, 0x08); + smbios_setenv("smbios.bios.vendor", dmi, 0x04); + smbios_setenv("smbios.bios.version", dmi, 0x05); + smbios_setenv("smbios.bios.reldate", dmi, 0x08); break; case 1: /* Type 1: System */ - smbios_setenv("hint.smbios.0.system.maker", dmi, 0x04); - smbios_setenv("hint.smbios.0.system.product", dmi, 0x05); - smbios_setenv("hint.smbios.0.system.version", dmi, 0x06); + smbios_setenv("smbios.system.maker", dmi, 0x04); + smbios_setenv("smbios.system.product", dmi, 0x05); + smbios_setenv("smbios.system.version", dmi, 0x06); break; case 2: /* Type 2: Base Board (or Module) */ - smbios_setenv("hint.smbios.0.planar.maker", dmi, 0x04); - smbios_setenv("hint.smbios.0.planar.product", dmi, 0x05); - smbios_setenv("hint.smbios.0.planar.version", dmi, 0x06); + smbios_setenv("smbios.planar.maker", dmi, 0x04); + smbios_setenv("smbios.planar.product", dmi, 0x05); + smbios_setenv("smbios.planar.version", dmi, 0x06); break; case 3: /* Type 3: System Enclosure or Chassis */ - smbios_setenv("hint.smbios.0.chassis.maker", dmi, 0x04); - smbios_setenv("hint.smbios.0.chassis.version", dmi, 0x06); + smbios_setenv("smbios.chassis.maker", dmi, 0x04); + smbios_setenv("smbios.chassis.version", dmi, 0x06); break; default: /* skip other types */ ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.15 2005/05/19 07:21:46 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.16 2005/07/22 23:22:29 grehan Exp $"); /* * MD primitives supporting placement of module data @@ -39,7 +39,9 @@ #define READIN_BUF (4 * 1024) #define PAGE_SIZE 0x1000 #define PAGE_MASK 0x0fff +#define MAPMEM_PAGE_INC 16 + #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) static int @@ -76,10 +78,10 @@ /* * To avoid repeated mappings on small allocations, - * never map anything less than 16 pages at a time + * never map anything less than MAPMEM_PAGE_INC pages at a time */ - if ((nlen + resid) < PAGE_SIZE*8) { - dlen = PAGE_SIZE*8; + if ((nlen + resid) < PAGE_SIZE*MAPMEM_PAGE_INC) { + dlen = PAGE_SIZE*MAPMEM_PAGE_INC; } else dlen = roundup(nlen + resid, PAGE_SIZE); ==== //depot/projects/smpng/sys/conf/NOTES#101 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1326 2005/07/14 15:57:00 takawata Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1328 2005/07/27 21:47:55 pjd Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -131,6 +131,7 @@ options GEOM_BDE # Disk encryption. options GEOM_BSD # BSD disklabels options GEOM_CONCAT # Disk concatenation. +options GEOM_ELI # Disk encryption. options GEOM_FOX # Redundant path mitigation options GEOM_GATE # Userland services. options GEOM_GPT # GPT partitioning @@ -145,6 +146,7 @@ options GEOM_SUNLABEL # Sun/Solaris partitioning options GEOM_UZIP # Read-only compressed disks options GEOM_VOL # Volume names from UFS superblock +options GEOM_ZERO # Peformance testing helper. # # The root device and filesystem type can be compiled in; ==== //depot/projects/smpng/sys/conf/files#145 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1034 2005/07/17 03:27:36 obrien Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1038 2005/07/27 21:47:55 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -511,6 +511,7 @@ dev/drm/r128_irq.c optional r128drm dev/drm/r128_state.c optional r128drm \ compile-with "${NORMAL_C} -finline-limit=13500" +dev/drm/r300_cmdbuf.c optional radeondrm dev/drm/radeon_cp.c optional radeondrm dev/drm/radeon_drv.c optional radeondrm dev/drm/radeon_irq.c optional radeondrm @@ -538,7 +539,7 @@ dev/esp/ncr53c9x.c optional esp dev/ex/if_ex.c optional ex dev/ex/if_ex_isa.c optional ex isa -#dev/ex/if_ex_pccard.c optional ex pccard +dev/ex/if_ex_pccard.c optional ex pccard dev/exca/exca.c optional cbb dev/fatm/if_fatm.c optional fatm pci dev/fe/if_fe.c optional fe @@ -1027,6 +1028,11 @@ geom/bde/g_bde_lock.c optional geom_bde geom/bde/g_bde_work.c optional geom_bde geom/concat/g_concat.c optional geom_concat +geom/eli/g_eli.c optional geom_eli +geom/eli/g_eli_crypto.c optional geom_eli +geom/eli/g_eli_ctl.c optional geom_eli +geom/eli/g_eli_key.c optional geom_eli +geom/eli/pkcs5v2.c optional geom_eli geom/gate/g_gate.c optional geom_gate geom/geom_aes.c optional geom_aes geom/geom_apple.c optional geom_apple @@ -1065,6 +1071,7 @@ geom/shsec/g_shsec.c optional geom_shsec geom/stripe/g_stripe.c optional geom_stripe geom/uzip/g_uzip.c optional geom_uzip +geom/zero/g_zero.c optional geom_zero gnu/fs/ext2fs/ext2_alloc.c optional ext2fs \ warning "kernel contains GPL contaminated ext2fs filesystem" gnu/fs/ext2fs/ext2_balloc.c optional ext2fs ==== //depot/projects/smpng/sys/conf/files.amd64#34 (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.amd64,v 1.71 2005/06/30 07:49:21 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.75 2005/07/21 21:57:31 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -136,6 +136,12 @@ dev/atkbdc/atkbdc_isa.c optional atkbdc isa dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc +# There are no systems with isa slots, so all ed isa entries should go.. +dev/ed/if_ed_3c503.c optional ed isa ed_3c503 +dev/ed/if_ed_isa.c optional ed isa +dev/ed/if_ed_wd80x3.c optional ed isa +dev/ed/if_ed_hpp.c optional ed isa ed_hpp +dev/ed/if_ed_sic.c optional ed isa ed_sic dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash @@ -229,4 +235,8 @@ compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx64_wrap.S optional ndisapi pci +i386/bios/smbios.c optional smbios +i386/bios/vpd.c optional vpd i386/cpufreq/powernow.c optional cpufreq +i386/cpufreq/est.c optional cpufreq +i386/cpufreq/p4tcc.c optional cpufreq ==== //depot/projects/smpng/sys/conf/options#104 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.511 2005/07/15 05:12:49 takawata Exp $ +# $FreeBSD: src/sys/conf/options,v 1.513 2005/07/27 21:47:55 pjd Exp $ # # On the handling of kernel options # @@ -76,6 +76,7 @@ GEOM_BDE opt_geom.h GEOM_BSD opt_geom.h GEOM_CONCAT opt_geom.h +GEOM_ELI opt_geom.h GEOM_FOX opt_geom.h GEOM_GATE opt_geom.h GEOM_GPT opt_geom.h @@ -90,6 +91,7 @@ GEOM_SUNLABEL opt_geom.h GEOM_UZIP opt_geom.h GEOM_VOL opt_geom.h +GEOM_ZERO opt_geom.h KSTACK_MAX_PAGES KSTACK_PAGES KTRACE ==== //depot/projects/smpng/sys/contrib/pf/net/pf.c#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.34 2005/05/04 19:51:06 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.35 2005/07/20 18:58:27 mlaier Exp $ */ /* $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ /* @@ -1085,6 +1085,11 @@ void pf_purge_expired_state(struct pf_state *cur) { +#ifdef __FreeBSD__ + if (cur->sync_flags & PFSTATE_EXPIRING) + return; + cur->sync_flags |= PFSTATE_EXPIRING; +#endif if (cur->src.state == PF_TCPS_PROXY_DST) pf_send_tcp(cur->rule.ptr, cur->af, &cur->ext.addr, &cur->lan.addr, ==== //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.11 2005/05/03 16:43:32 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.12 2005/07/20 10:30:52 ume Exp $ */ /* $OpenBSD: pf_norm.c,v 1.97 2004/09/21 16:59:12 aaron Exp $ */ /* @@ -70,48 +70,6 @@ #include <net/pfvar.h> -#if defined(__FreeBSD__) && defined(INET6) -/* - * XXX: This should go to netinet/ip6.h (KAME) - */ -/* IPv6 options: common part */ -struct ip6_opt { - u_int8_t ip6o_type; - u_int8_t ip6o_len; -} __packed; - -/* Jumbo Payload Option */ -struct ip6_opt_jumbo { - u_int8_t ip6oj_type; - u_int8_t ip6oj_len; - u_int8_t ip6oj_jumbo_len[4]; -} __packed; - -/* NSAP Address Option */ -struct ip6_opt_nsap { - u_int8_t ip6on_type; - u_int8_t ip6on_len; - u_int8_t ip6on_src_nsap_len; - u_int8_t ip6on_dst_nsap_len; - /* followed by source NSAP */ - /* followed by destination NSAP */ -} __packed; - -/* Tunnel Limit Option */ -struct ip6_opt_tunnel { - u_int8_t ip6ot_type; - u_int8_t ip6ot_len; - u_int8_t ip6ot_encap_limit; -} __packed; - -/* Router Alert Option */ -struct ip6_opt_router { - u_int8_t ip6or_type; - u_int8_t ip6or_len; - u_int8_t ip6or_value[2]; -} __packed; -#endif /* __FreeBSD__ && INET6 */ - #ifndef __FreeBSD__ struct pf_frent { LIST_ENTRY(pf_frent) fr_next; ==== //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.11 2005/05/03 16:43:32 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.12 2005/07/20 18:58:27 mlaier Exp $ */ /* $OpenBSD: pfvar.h,v 1.213 2005/03/03 07:13:39 dhartmei Exp $ */ /* @@ -790,6 +790,9 @@ #define PFSTATE_NOSYNC 0x01 #define PFSTATE_FROMSYNC 0x02 #define PFSTATE_STALE 0x04 +#ifdef __FreeBSD__ +#define PFSTATE_EXPIRING 0x10 +#endif u_int8_t pad; }; ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#9 (text+ko) ==== @@ -23,14 +23,15 @@ * LIABILITY, OR TORT (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/sys/dev/acpica/Osd/OsdDebug.c,v 1.9 2004/09/02 04:28:05 njl Exp $ */ /* * 6.8 : Debugging support */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.10 2005/07/22 23:10:02 njl Exp $"); + #include "opt_ddb.h" #include <sys/param.h> #include <sys/kdb.h> ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#16 (text+ko) ==== @@ -23,14 +23,15 @@ * LIABILITY, OR TORT (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/sys/dev/acpica/Osd/OsdHardware.c,v 1.15 2005/05/29 04:42:16 nyan Exp $ */ /* * 6.7 : Hardware Abstraction */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.16 2005/07/22 23:10:02 njl Exp $"); + #include "acpi.h" #include <machine/bus.h> ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#14 (text+ko) ==== @@ -23,14 +23,15 @@ * LIABILITY, OR TORT (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/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.19 2004/12/02 00:25:35 marks Exp $ */ /* * 6.5 : Interrupt handling */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.20 2005/07/22 23:10:02 njl Exp $"); + #include <sys/param.h> #include <sys/kernel.h> #include <sys/bus.h> ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#8 (text+ko) ==== @@ -24,14 +24,15 @@ * LIABILITY, OR TORT (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/sys/dev/acpica/Osd/OsdMemory.c,v 1.11 2004/04/14 03:39:08 njl Exp $ */ /* * 6.2 : Memory Management */ +#include <sys/cdefs.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507291519.j6TFJJO8067913>