Date: Wed, 29 Oct 2003 11:20:14 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 40768 for review Message-ID: <200310291920.h9TJKEjc044138@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=40768 Change 40768 by jhb@jhb_blue on 2003/10/29 11:19:42 IFC @40764. Affected files ... .. //depot/projects/power/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/power/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/power/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/power/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/power/sys/cam/cam_periph.c#3 integrate .. //depot/projects/power/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/power/sys/conf/NOTES#3 integrate .. //depot/projects/power/sys/conf/files#3 integrate .. //depot/projects/power/sys/conf/files.ia64#3 integrate .. //depot/projects/power/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/power/sys/conf/options#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx.h#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_env.h#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_self.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_step.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_trace.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_trace.h#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#3 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/test/Makefile#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/test/dump_context.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/test/dumpmyself.c#2 integrate .. //depot/projects/power/sys/contrib/ia64/libuwx/test/primeregs.s#1 branch .. //depot/projects/power/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/power/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/power/sys/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/power/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/power/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/power/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/power/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/power/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/power/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/power/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/power/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/power/sys/dev/dcons/dcons.c#1 branch .. //depot/projects/power/sys/dev/dcons/dcons.h#1 branch .. //depot/projects/power/sys/dev/dcons/dcons_crom.c#1 branch .. //depot/projects/power/sys/dev/drm/ati_pcigart.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm.h#2 integrate .. //depot/projects/power/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_auth.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_bufs.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_context.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_dma.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_drv.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_fops.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_ioctl.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_irq.h#1 branch .. //depot/projects/power/sys/dev/drm/drm_memory.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_memory_debug.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_pci.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_sysctl.h#2 integrate .. //depot/projects/power/sys/dev/drm/drm_vm.h#2 integrate .. //depot/projects/power/sys/dev/drm/mga.h#2 integrate .. //depot/projects/power/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/power/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/power/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/power/sys/dev/drm/r128.h#2 integrate .. //depot/projects/power/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/power/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/power/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/power/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/power/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/power/sys/dev/drm/radeon.h#2 integrate .. //depot/projects/power/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/power/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/power/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/power/sys/dev/drm/sis.h#2 integrate .. //depot/projects/power/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/power/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/power/sys/dev/drm/tdfx.h#2 integrate .. //depot/projects/power/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/power/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_ep_mca.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/power/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/power/sys/dev/ep/if_epvar.h#3 integrate .. //depot/projects/power/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/power/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/power/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/power/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/power/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/power/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/power/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatm_rx.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatm_tx.c#2 integrate .. //depot/projects/power/sys/dev/hatm/if_hatmvar.h#2 integrate .. //depot/projects/power/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/power/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/power/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/power/sys/dev/pccard/pccarddevs.h#3 integrate .. //depot/projects/power/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/power/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/power/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/power/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/power/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/power/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/power/sys/dev/sn/if_snreg.h#2 integrate .. //depot/projects/power/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/power/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/power/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/power/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/power/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/power/sys/dev/vx/if_vxreg.h#2 integrate .. //depot/projects/power/sys/dev/vx/if_vxvar.h#1 branch .. //depot/projects/power/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/power/sys/dev/xe/if_xe_pccard.c#3 integrate .. //depot/projects/power/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/power/sys/geom/geom_fox.c#3 integrate .. //depot/projects/power/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate .. //depot/projects/power/sys/gnu/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/power/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/power/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/power/sys/i386/conf/NOTES#3 integrate .. //depot/projects/power/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/power/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/power/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/power/sys/ia64/disasm/disasm.h#1 branch .. //depot/projects/power/sys/ia64/disasm/disasm_decode.c#1 branch .. //depot/projects/power/sys/ia64/disasm/disasm_extract.c#1 branch .. //depot/projects/power/sys/ia64/disasm/disasm_format.c#1 branch .. //depot/projects/power/sys/ia64/disasm/disasm_int.h#1 branch .. //depot/projects/power/sys/ia64/ia64/db_disasm.c#2 delete .. //depot/projects/power/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/power/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/power/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/power/sys/ia64/ia64/ptrace_machdep.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/power/sys/ia64/ia64/sys_machdep.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/syscall.S#3 integrate .. //depot/projects/power/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/power/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/power/sys/ia64/include/inst.h#2 delete .. //depot/projects/power/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/power/sys/ia64/include/proc.h#3 integrate .. //depot/projects/power/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/power/sys/isa/fd.c#3 integrate .. //depot/projects/power/sys/kern/kern_alq.c#2 integrate .. //depot/projects/power/sys/kern/kern_fork.c#2 integrate .. //depot/projects/power/sys/kern/kern_intr.c#2 integrate .. //depot/projects/power/sys/kern/kern_prot.c#3 integrate .. //depot/projects/power/sys/kern/kern_resource.c#2 integrate .. //depot/projects/power/sys/kern/kern_sig.c#3 integrate .. //depot/projects/power/sys/kern/kern_synch.c#3 integrate .. //depot/projects/power/sys/kern/kern_time.c#2 integrate .. //depot/projects/power/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/power/sys/kern/sched_ule.c#3 integrate .. //depot/projects/power/sys/kern/subr_bus.c#3 integrate .. //depot/projects/power/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/power/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/power/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/power/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/power/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/power/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/power/sys/modules/Makefile#3 integrate .. //depot/projects/power/sys/modules/dcons/Makefile#1 branch .. //depot/projects/power/sys/modules/dcons_crom/Makefile#1 branch .. //depot/projects/power/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/power/sys/modules/netgraph/atm/atmbase/Makefile#1 branch .. //depot/projects/power/sys/modules/netgraph/atm/sscfu/Makefile#1 branch .. //depot/projects/power/sys/modules/netgraph/atm/sscop/Makefile#1 branch .. //depot/projects/power/sys/net/if.c#3 integrate .. //depot/projects/power/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/power/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/power/sys/net/if_loop.c#3 integrate .. //depot/projects/power/sys/net/if_tun.c#3 integrate .. //depot/projects/power/sys/net/if_types.h#2 integrate .. //depot/projects/power/sys/net/if_var.h#3 integrate .. //depot/projects/power/sys/net/if_vlan.c#2 integrate .. //depot/projects/power/sys/netatalk/aarp.c#2 integrate .. //depot/projects/power/sys/netgraph/atm/ng_sscfu.h#1 branch .. //depot/projects/power/sys/netgraph/atm/ng_sscop.h#1 branch .. //depot/projects/power/sys/netgraph/atm/ngatmbase.c#1 branch .. //depot/projects/power/sys/netgraph/atm/ngatmbase.h#1 branch .. //depot/projects/power/sys/netgraph/atm/sscfu/ng_sscfu.c#1 branch .. //depot/projects/power/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#1 branch .. //depot/projects/power/sys/netgraph/atm/sscop/ng_sscop.c#1 branch .. //depot/projects/power/sys/netgraph/atm/sscop/ng_sscop_cust.h#1 branch .. //depot/projects/power/sys/netinet/icmp6.h#3 integrate .. //depot/projects/power/sys/netinet/in.h#2 integrate .. //depot/projects/power/sys/netinet/in_gif.c#3 integrate .. //depot/projects/power/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/power/sys/netinet/ip.h#2 integrate .. //depot/projects/power/sys/netinet/ip6.h#3 integrate .. //depot/projects/power/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/power/sys/netinet/ip_ecn.h#2 integrate .. //depot/projects/power/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/power/sys/netinet/ip_input.c#3 integrate .. //depot/projects/power/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/power/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/power/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/power/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/power/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/power/sys/netinet6/ah_input.c#3 integrate .. //depot/projects/power/sys/netinet6/esp_input.c#3 integrate .. //depot/projects/power/sys/netinet6/frag6.c#3 integrate .. //depot/projects/power/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/power/sys/netinet6/in6.h#3 integrate .. //depot/projects/power/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/power/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/power/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/power/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/power/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/power/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/power/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/power/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/power/sys/netinet6/mld6.c#3 integrate .. //depot/projects/power/sys/netinet6/nd6.c#3 integrate .. //depot/projects/power/sys/netinet6/nd6.h#3 integrate .. //depot/projects/power/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/power/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/power/sys/netinet6/route6.c#3 integrate .. //depot/projects/power/sys/netinet6/udp6_output.c#3 integrate .. //depot/projects/power/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/power/sys/netkey/key.c#3 integrate .. //depot/projects/power/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/power/sys/pci/agp.c#2 integrate .. //depot/projects/power/sys/pci/agp_i810.c#3 integrate .. //depot/projects/power/sys/pci/if_dc.c#3 integrate .. //depot/projects/power/sys/pci/if_sis.c#3 integrate .. //depot/projects/power/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/power/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/power/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/power/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/power/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/power/sys/sys/agpio.h#2 integrate .. //depot/projects/power/sys/sys/bus.h#3 integrate .. //depot/projects/power/sys/sys/interrupt.h#2 integrate .. //depot/projects/power/sys/sys/mbuf.h#3 integrate .. //depot/projects/power/sys/sys/proc.h#3 integrate .. //depot/projects/power/sys/sys/resourcevar.h#2 integrate .. //depot/projects/power/sys/sys/socketvar.h#2 integrate .. //depot/projects/power/sys/sys/time.h#2 integrate .. //depot/projects/power/sys/sys/vnode.h#3 integrate .. //depot/projects/power/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/power/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/power/sys/vm/swap_pager.c#3 integrate .. //depot/projects/power/sys/vm/vm_object.c#3 integrate .. //depot/projects/power/sys/vm/vm_page.h#3 integrate .. //depot/projects/power/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/power/sys/vm/vm_pager.h#2 integrate .. //depot/projects/power/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/power/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.266 2003/10/15 02:04:52 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.267 2003/10/28 01:06:37 peter Exp $"); /* * AMD64 Trap and System call handling @@ -258,9 +258,6 @@ default: ucode = code + BUS_SEGM_FAULT ; i = SIGBUS; -printf("trap %d: pid %d err %p eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", type, p->p_pid, (void *)frame.tf_err, -(void *)frame.tf_addr, (void *)frame.tf_rip, (void *)frame.tf_rax, (void *)frame.tf_rbx, (void *)frame.tf_rcx, (void *)frame.tf_rdx, (void *)frame.tf_rsp, (void *)frame.tf_rbp, (void *)frame.tf_rsi, (void *)frame.tf_rdi); - break; case T_PAGEFLT: /* page fault */ @@ -545,12 +542,6 @@ return (-1); } -printf("trap_pfault: pid %d %s %s %s eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", p->p_pid, - frame->tf_err & PGEX_U ? "user" : "supervisor", - frame->tf_err & PGEX_W ? "write" : "read", - frame->tf_err & PGEX_P ? "protection violation" : "page not present", -(void *)eva, (void *)frame->tf_rip, (void *)frame->tf_rax, (void *)frame->tf_rbx, (void *)frame->tf_rcx, (void *)frame->tf_rdx, (void *)frame->tf_rsp, (void *)frame->tf_rbp, (void *)frame->tf_rsi, (void *)frame->tf_rdi); - return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); } ==== //depot/projects/power/sys/amd64/include/stdarg.h#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/sys/amd64/include/stdarg.h,v 1.5 2003/05/10 00:55:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.6 2003/10/24 02:50:39 peter Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -46,9 +46,12 @@ #define va_arg(ap, type) \ __builtin_va_arg((ap), type) +#define __va_copy(dest, src) \ + __builtin_va_copy((dest), (src)) + #if __ISO_C_VISIBLE >= 1999 #define va_copy(dest, src) \ - __builtin_va_copy((dest), (src)) + __va_copy(dest, src) #endif #define va_end(ap) \ ==== //depot/projects/power/sys/amd64/include/sysarch.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.19 2003/05/12 02:37:29 peter Exp $ + * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.21 2003/10/23 06:06:14 peter Exp $ */ /* @@ -39,22 +39,21 @@ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ -#define AMD64_GET_FSBASE 0 -#define AMD64_SET_FSBASE 1 -#define AMD64_GET_GSBASE 2 -#define AMD64_SET_GSBASE 3 +/* Leave space for 0-127 for to avoid translating syscalls */ +#define AMD64_GET_FSBASE 128 +#define AMD64_SET_FSBASE 129 +#define AMD64_GET_GSBASE 130 +#define AMD64_SET_GSBASE 131 -#if 0 /* these wrappers need to be implemented in libc first */ #ifndef _KERNEL #include <sys/cdefs.h> __BEGIN_DECLS -unsigned long amd64_get_fsbase(void); -unsigned long amd64_set_fsbase(unsigned long); -unsigned long amd64_get_gsbase(void); -unsigned long amd64_set_gsbase(unsigned long); +int amd64_get_fsbase(void **); +int amd64_set_fsbase(void *); +int amd64_get_gsbase(void **); +int amd64_set_gsbase(void *); __END_DECLS #endif -#endif #endif /* !_MACHINE_SYSARCH_H_ */ ==== //depot/projects/power/sys/boot/forth/beastie.4th#3 (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/boot/forth/beastie.4th,v 1.5 2003/09/13 18:35:01 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.7 2003/10/28 17:18:42 scottl Exp $ marker task-beastie.4th @@ -209,9 +209,9 @@ dup tkey 0 25 at-xy dup 32 = if nip 0 swap then - dup -1 = if s" boot" evaluate then - dup 13 = if s" boot" evaluate then - dup bootkey @ = if s" boot" evaluate then + dup -1 = if 0 boot then + dup 13 = if 0 boot then + dup bootkey @ = if 0 boot then dup bootacpikey @ = if acpienabled? if s" acpi_load" unsetenv @@ -221,7 +221,7 @@ s" YES" s" acpi_load" setenv s" 0" s" hint.acpi.0.disabled" setenv then - s" boot" evaluate + 0 boot then dup bootsafekey @ = if s" arch-i386" environment? if @@ -233,22 +233,22 @@ s" 0" s" hw.ata.atapi_dma" setenv s" 0" s" hw.ata.wc" setenv s" 0" s" hw.eisa_slots" setenv - s" boot" evaluate + 0 boot then dup bootverbosekey @ = if s" YES" s" boot_verbose" setenv - s" boot" evaluate + 0 boot then dup bootsinglekey @ = if s" YES" s" boot_single" setenv - s" boot" evaluate + 0 boot then dup escapekey @ = if 2drop s" NO" s" autoboot_delay" setenv exit then - rebootkey @ = if s" reboot" evaluate then + rebootkey @ = if 0 reboot then repeat ; ==== //depot/projects/power/sys/cam/cam_periph.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.54 2003/10/18 11:01:11 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.55 2003/10/27 06:15:54 ken Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -994,14 +994,26 @@ scsi_cmd = (struct scsi_start_stop_unit *) &done_ccb->csio.cdb_io.cdb_bytes; if (sense != 0) { + struct ccb_getdev cgd; struct scsi_sense_data *sense; int error_code, sense_key, asc, ascq; + scsi_sense_action err_action; sense = &done_ccb->csio.sense_data; scsi_extract_sense(sense, &error_code, &sense_key, &asc, &ascq); /* + * Grab the inquiry data for this device. + */ + xpt_setup_ccb(&cgd.ccb_h, done_ccb->ccb_h.path, + /*priority*/ 1); + cgd.ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action((union ccb *)&cgd); + err_action = scsi_error_action(&done_ccb->csio, + &cgd.inq_data, 0); + + /* * If the error is "invalid field in CDB", * and the load/eject flag is set, turn the * flag off and try again. This is just in @@ -1028,12 +1040,15 @@ xpt_action(done_ccb); - } else if (done_ccb->ccb_h.retry_count > 1) { + } else if ((done_ccb->ccb_h.retry_count > 1) + && ((err_action & SS_MASK) != SS_FAIL)) { + /* * In this case, the error recovery * command failed, but we've got * some retries left on it. Give - * it another try. + * it another try unless this is an + * unretryable error. */ /* set the timeout to .5 sec */ ==== //depot/projects/power/sys/cam/scsi/scsi_cd.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.87 2003/10/18 17:24:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.88 2003/10/27 06:15:55 ken Exp $"); #include "opt_cd.h" @@ -2856,20 +2856,6 @@ ccb = cdgetccb(periph, /* priority */ 1); - scsi_test_unit_ready(&ccb->csio, 0, cddone, - MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, 1000); - ccb->ccb_h.ccb_bp = NULL; - - error = cam_periph_runccb(ccb, NULL, - /*cam_flags*/0, - /*sense_flags*/SF_RETRY_UA, - softc->disk.d_devstat); - - if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { - xpt_release_ccb(ccb); - return (ENXIO); - } - rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), M_TEMP, M_WAITOK); ==== //depot/projects/power/sys/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1179 2003/10/22 22:27:49 njl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1183 2003/10/28 05:47:39 sam Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -29,11 +29,11 @@ # comment on the same line if possible. Very detailed descriptions of # devices and subsystems belong in manpages. # -# A space followed by a tab separates 'option' from an option name. Two +# A space followed by a tab separates 'options' from an option name. Two # spaces followed by a tab separate 'device' from a device name. Comments # after an option or device should use one space after the comment character. # To comment out a negative option that disables code and thus should not be -# enabled for LINT builds, precede 'option' with "#!". +# enabled for LINT builds, precede 'options' with "#!". # # @@ -452,7 +452,10 @@ options NETGRAPH_ATM_ATMPIF # NgATM - Netgraph ATM -options NGATM_ATM +options NGATM_ATM +options NGATM_ATMBASE +options NGATM_SSCOP +options NGATM_SSCFU device mn # Munich32x/Falc54 Nx64kbit/sec cards. device lmc # tulip based LanMedia WAN cards @@ -2241,11 +2244,21 @@ options UVSCOM_DEFAULT_OPKTSIZE=8 # default output packet size ##################################################################### -# Firewire support +# FireWire support -device firewire # Firewire bus code +device firewire # FireWire bus code device sbp # SCSI over Firewire (Requires scbus and da) -device fwe # Ethernet over Firewire (non-standard!) +device fwe # Ethernet over FireWire (non-standard!) + +##################################################################### +# dcons support (Dumb Console Device) + +device dcons # dumb console driver +device dcons_crom # FireWire attachment +options DCONS_BUF_SIZE=16384 # buffer size +options DCONS_POLL_HZ=100 # polling rate +options DCONS_FORCE_CONSOLE=0 # force to be the primary console +options DCONS_FORCE_GDB=1 # force to be the gdb device ##################################################################### # crypto subsystem @@ -2282,6 +2295,7 @@ # Debug options options BUS_DEBUG # enable newbus debugging options DEBUG_VFS_LOCKS # enable vfs lock debugging +options SOCKBUF_DEBUG # enable sockbuf last record/mb tail checking ##################################################################### # SYSV IPC KERNEL PARAMETERS ==== //depot/projects/power/sys/conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.837 2003/10/22 20:39:33 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.841 2003/10/27 11:19:08 harti Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -351,6 +351,8 @@ dev/cs/if_cs_isa.c optional cs isa dev/cs/if_cs_pccard.c optional cs card dev/cs/if_cs_pccard.c optional cs pccard +dev/dcons/dcons.c optional dcons +dev/dcons/dcons_crom.c optional dcons_crom dev/digi/digi.c optional digi dev/digi/digi_isa.c optional digi isa dev/digi/digi_pci.c optional digi pci @@ -1368,7 +1370,13 @@ netatm/uni/unisig_vc_state.c optional atm_uni atm_core netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif -netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/ngatmbase.c optional ngatm_atmbase +contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase +netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/sscfu/ng_sscfu.c optional ngatm_sscfu +contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu +netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop +contrib/ngatm/netnatm/saal/saal_sscop.c optional ngatm_sscop netgraph/ng_UI.c optional netgraph_UI netgraph/ng_async.c optional netgraph_async netgraph/ng_base.c optional netgraph ==== //depot/projects/power/sys/conf/files.ia64#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.ia64,v 1.59 2003/09/20 19:27:48 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.61 2003/10/24 06:48:41 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -80,6 +80,9 @@ ia64/acpica/acpi_machdep.c optional acpi ia64/acpica/acpi_wakeup.c optional acpi ia64/acpica/madt.c optional acpi +ia64/disasm/disasm_decode.c standard +ia64/disasm/disasm_extract.c standard +ia64/disasm/disasm_format.c standard ia64/ia32/ia32_misc.c optional ia32 ia64/ia32/ia32_sysent.c optional ia32 ia64/ia32/ia32_sysvec.c optional ia32 @@ -89,7 +92,6 @@ ia64/ia64/clock_if.m standard ia64/ia64/context.S standard ia64/ia64/critical.c standard -ia64/ia64/db_disasm.c optional ddb ia64/ia64/db_interface.c optional ddb ia64/ia64/db_trace.c optional ddb ia64/ia64/dump_machdep.c standard ==== //depot/projects/power/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kernels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.34 2003/08/22 15:41:44 imp Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.35 2003/10/27 11:19:08 harti Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -35,6 +35,9 @@ # ... and the same for Atheros HAL INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd +# ... and the same for the NgATM stuff +INCLUDES+= -I$S/contrib/ngatm + COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common ==== //depot/projects/power/sys/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.416 2003/10/22 22:27:49 njl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.421 2003/10/29 14:22:09 iwasaki Exp $ # # On the handling of kernel options # @@ -404,6 +404,9 @@ # NgATM options NGATM_ATM opt_netgraph.h +NGATM_ATMBASE opt_netgraph.h +NGATM_SSCOP opt_netgraph.h +NGATM_SSCFU opt_netgraph.h # DRM options DRM_DEBUG opt_drm.h @@ -595,6 +598,7 @@ # options for ACPI support ACPI_DEBUG opt_acpi.h ACPI_MAX_THREADS opt_acpi.h +ACPI_NO_RESET_VIDEO opt_acpi.h ACPI_NO_SEMAPHORES opt_acpi.h ACPICA_PEDANTIC opt_acpi.h @@ -619,6 +623,8 @@ # XXX bogusly global. DEVICE_POLLING opt_global.h +SOCKBUF_DEBUG opt_global.h + # options for ubsec driver UBSEC_DEBUG opt_ubsec.h UBSEC_RNDTEST opt_ubsec.h @@ -673,3 +679,9 @@ AH_DEBUG opt_ah.h AH_DEBUG_ALQ opt_ah.h AH_ASSERT opt_ah.h + +# dcons options +DCONS_BUF_SIZE opt_dcons.h +DCONS_POLL_HZ opt_dcons.h +DCONS_FORCE_CONSOLE opt_dcons.h +DCONS_FORCE_GDB opt_dcons.h ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx.h#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #ifndef _KERNEL #include <stdlib.h> @@ -211,12 +213,12 @@ #define UWX_REG_PFS 6 /* pfs (pseudo-register) */ #define UWX_REG_PREDS 7 /* p0 - p63 */ #define UWX_REG_PRIUNAT 8 /* primary unat (pseudo-register) */ -#define UWX_REG_AR_PFS 9 /* ar.pfs */ -#define UWX_REG_AR_BSPSTORE 10 /* ar.bspstore */ -#define UWX_REG_AR_RNAT 11 /* ar.rnat */ -#define UWX_REG_AR_UNAT 12 /* ar.unat */ -#define UWX_REG_AR_FPSR 13 /* ar.fpsr */ -#define UWX_REG_AR_LC 14 /* ar.lc */ +#define UWX_REG_AR_BSPSTORE 9 /* ar.bspstore */ +#define UWX_REG_AR_RNAT 10 /* ar.rnat */ +#define UWX_REG_AR_UNAT 11 /* ar.unat */ +#define UWX_REG_AR_FPSR 12 /* ar.fpsr */ +#define UWX_REG_AR_LC 13 /* ar.lc */ +#define UWX_REG_AR_PFS 14 /* ar.pfs */ #define UWX_REG_GR(gr) (0x100 | (gr)) #define UWX_REG_FR(fr) (0x200 | (fr)) #define UWX_REG_BR(br) (0x300 | (br)) ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_bstream.h" @@ -71,7 +73,7 @@ if (bstream->ntotal <= 0) return -1; if (bstream->nbuf <= 0) { - if (bstream->source & 0x7) + if (bstream->source & 0x7 || bstream->ntotal < sizeof(uint64_t)) len = sizeof(uint32_t); else len = sizeof(uint64_t); ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ struct uwx_bstream { copyin_cb copyin; ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.c#3 (text+ko) ==== @@ -1,24 +1,26 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +*/ #include "uwx_env.h" #include "uwx_context.h" ==== //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.h#2 (text+ko) ==== @@ -1,23 +1,25 @@ /* - * Copyright (c) 2002,2003 Hewlett-Packard Company - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ +Copyright (c) 2003 Hewlett-Packard Development Company, L.P. +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310291920.h9TJKEjc044138>