Date: Fri, 4 Nov 2011 13:53:04 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 201162 for review Message-ID: <201111041353.pA4Dr4bY060911@skunkworks.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@201162?ac=10 Change 201162 by jhb@jhb_jhbbsd on 2011/11/04 13:52:13 IFC @201161 Affected files ... .. //depot/projects/fadvise/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/fadvise/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/fadvise/lib/libc/gen/Makefile.inc#3 edit .. //depot/projects/fadvise/lib/libc/gen/pfadvise.c#2 delete .. //depot/projects/fadvise/lib/libc/i386/gen/setjmp.S#2 integrate .. //depot/projects/fadvise/lib/libc/i386/gen/sigsetjmp.S#2 integrate .. //depot/projects/fadvise/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/fadvise/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/fadvise/lib/libc/sys/fadvise.2#2 delete .. //depot/projects/fadvise/lib/libc/sys/madvise.2#3 integrate .. //depot/projects/fadvise/lib/libc/sys/posix_fadvise.2#1 branch .. //depot/projects/fadvise/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/fadvise/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/fadvise/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/fadvise/sys/boot/common/loader.8#2 integrate .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_systrace_args.c#4 integrate .. //depot/projects/fadvise/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/fadvise/sys/conf/NOTES#2 integrate .. //depot/projects/fadvise/sys/conf/files#2 integrate .. //depot/projects/fadvise/sys/conf/files.amd64#2 integrate .. //depot/projects/fadvise/sys/conf/newvers.sh#2 integrate .. //depot/projects/fadvise/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/fadvise/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/fadvise/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/fadvise/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/fadvise/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 integrate .. //depot/projects/fadvise/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/fadvise/sys/dev/ath/if_ath_debug.h#2 integrate .. //depot/projects/fadvise/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/fadvise/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/fadvise/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/fadvise/sys/dev/bm/if_bmreg.h#2 integrate .. //depot/projects/fadvise/sys/dev/bm/if_bmvar.h#2 integrate .. //depot/projects/fadvise/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/fadvise/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/fadvise/sys/dev/esp/am53c974reg.h#1 branch .. //depot/projects/fadvise/sys/dev/esp/esp_pci.c#1 branch .. //depot/projects/fadvise/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/fadvise/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/fadvise/sys/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/fadvise/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/fadvise/sys/dev/md/md.c#2 integrate .. //depot/projects/fadvise/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/fadvise/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/fadvise/sys/dev/mii/mii_bitbang.c#1 branch .. //depot/projects/fadvise/sys/dev/mii/mii_bitbang.h#1 branch .. //depot/projects/fadvise/sys/dev/mii/miidevs#2 integrate .. //depot/projects/fadvise/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/fadvise/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/fadvise/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/fadvise/sys/dev/qlxgb/README.txt#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_dbg.c#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_dbg.h#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_def.h#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_glbl.h#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_hw.c#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_hw.h#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_inline.h#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_ioctl.c#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_ioctl.h#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_isr.c#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_misc.c#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_os.c#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_os.h#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_reg.h#1 branch .. //depot/projects/fadvise/sys/dev/qlxgb/qla_ver.h#1 branch .. //depot/projects/fadvise/sys/dev/re/if_re.c#3 integrate .. //depot/projects/fadvise/sys/dev/sis/if_sis.c#3 integrate .. //depot/projects/fadvise/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/fadvise/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/fadvise/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/fadvise/sys/dev/ste/if_stereg.h#2 integrate .. //depot/projects/fadvise/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/fadvise/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/fadvise/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/fadvise/sys/dev/tl/if_tl.c#2 integrate .. //depot/projects/fadvise/sys/dev/tl/if_tlreg.h#2 integrate .. //depot/projects/fadvise/sys/dev/tws/tws_services.c#2 integrate .. //depot/projects/fadvise/sys/dev/tws/tws_services.h#2 integrate .. //depot/projects/fadvise/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/fadvise/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/fadvise/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/fadvise/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/fadvise/sys/dev/wb/if_wb.c#2 integrate .. //depot/projects/fadvise/sys/dev/wb/if_wbreg.h#2 integrate .. //depot/projects/fadvise/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/fadvise/sys/dev/xl/if_xlreg.h#2 integrate .. //depot/projects/fadvise/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/fadvise/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/fadvise/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/fadvise/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/fadvise/sys/geom/geom_dev.c#2 integrate .. //depot/projects/fadvise/sys/geom/geom_event.c#2 integrate .. //depot/projects/fadvise/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/fadvise/sys/geom/part/g_part.c#2 integrate .. //depot/projects/fadvise/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/fadvise/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/fadvise/sys/i386/i386/trap.c#2 integrate .. //depot/projects/fadvise/sys/kern/init_sysent.c#3 integrate .. //depot/projects/fadvise/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/fadvise/sys/kern/kern_sig.c#2 integrate .. //depot/projects/fadvise/sys/kern/subr_smp.c#2 integrate .. //depot/projects/fadvise/sys/kern/subr_syscall.c#2 integrate .. //depot/projects/fadvise/sys/kern/syscalls.c#3 integrate .. //depot/projects/fadvise/sys/kern/syscalls.master#3 integrate .. //depot/projects/fadvise/sys/kern/systrace_args.c#3 integrate .. //depot/projects/fadvise/sys/kern/vfs_default.c#6 integrate .. //depot/projects/fadvise/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/fadvise/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/fadvise/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/fadvise/sys/kern/vnode_if.src#3 integrate .. //depot/projects/fadvise/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/fadvise/sys/modules/Makefile#2 integrate .. //depot/projects/fadvise/sys/modules/esp/Makefile#2 integrate .. //depot/projects/fadvise/sys/modules/mii/Makefile#2 integrate .. //depot/projects/fadvise/sys/modules/qlxgb/Makefile#1 branch .. //depot/projects/fadvise/sys/net/rtsock.c#2 integrate .. //depot/projects/fadvise/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/fadvise/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/fadvise/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/fadvise/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/fadvise/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/fadvise/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/fadvise/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/fadvise/sys/pci/if_rl.c#3 integrate .. //depot/projects/fadvise/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/fadvise/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/fadvise/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/fadvise/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/fadvise/sys/sparc64/sbus/lsi64854.c#3 integrate .. //depot/projects/fadvise/sys/sparc64/sbus/lsi64854var.h#3 integrate .. //depot/projects/fadvise/sys/sys/fcntl.h#6 integrate .. //depot/projects/fadvise/sys/sys/file.h#6 integrate .. //depot/projects/fadvise/sys/sys/param.h#2 integrate .. //depot/projects/fadvise/sys/sys/syscall.h#3 integrate .. //depot/projects/fadvise/sys/sys/syscall.mk#3 integrate .. //depot/projects/fadvise/sys/sys/sysproto.h#3 integrate .. //depot/projects/fadvise/sys/sys/vnode.h#4 integrate .. //depot/projects/fadvise/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/fadvise/sys/vm/vm_contig.c#3 integrate .. //depot/projects/fadvise/sys/vm/vm_extern.h#2 integrate .. //depot/projects/fadvise/sys/vm/vm_object.c#5 integrate .. //depot/projects/fadvise/sys/vm/vm_object.h#3 integrate .. //depot/projects/fadvise/sys/vm/vm_page.c#4 integrate .. //depot/projects/fadvise/sys/vm/vm_phys.c#3 integrate .. //depot/projects/fadvise/sys/vm/vm_phys.h#2 integrate .. //depot/projects/fadvise/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/fadvise/sys/vm/vm_reserv.h#2 integrate Differences ... ==== //depot/projects/fadvise/lib/libc/amd64/gen/setjmp.S#2 (text+ko) ==== @@ -34,7 +34,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.30 2011/01/07 16:08:40 kib Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.31 2011/11/02 18:06:22 kib Exp $"); /* * C library -- _setjmp, _longjmp @@ -54,6 +54,7 @@ movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ leaq 72(%rcx),%rdx /* 9,10; (sigset_t*)oset */ + /* stack is 16-byte aligned */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx @@ -81,7 +82,9 @@ movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ movq $0,%rdx /* (sigset_t*)oset */ + subq $0x8,%rsp /* make the stack 16-byte aligned */ call PIC_PLT(CNAME(_sigprocmask)) + addq $0x8,%rsp popq %rsi popq %rdi /* jmpbuf */ movq %rdi,%rdx ==== //depot/projects/fadvise/lib/libc/amd64/gen/sigsetjmp.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.31 2011/01/07 16:08:40 kib Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.32 2011/11/02 18:06:22 kib Exp $"); #include "SYS.h" @@ -62,6 +62,7 @@ movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ leaq 72(%rcx),%rdx /* 9,10 (sigset_t*)oset */ + /* stack is 16-byte aligned */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi 2: movq %rdi,%rcx @@ -90,7 +91,9 @@ movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ movq $0,%rdx /* (sigset_t*)oset */ + subq $0x8,%rsp /* make the stack 16-byte aligned */ call PIC_PLT(CNAME(_sigprocmask)) + addq $0x8,%rsp popq %rsi popq %rdi /* jmpbuf */ 2: movq %rdi,%rdx ==== //depot/projects/fadvise/lib/libc/gen/Makefile.inc#3 (text+ko) ==== @@ -22,7 +22,7 @@ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ lockf.c lrand48.c mrand48.c nftw.c nice.c \ nlist.c nrand48.c opendir.c \ - pause.c pfadvise.c pmadvise.c popen.c posix_spawn.c \ + pause.c pmadvise.c popen.c posix_spawn.c \ psignal.c pututxline.c pw_scan.c pwcache.c \ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c semctl.c \ ==== //depot/projects/fadvise/lib/libc/i386/gen/setjmp.S#2 (text+ko) ==== @@ -34,7 +34,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.26 2011/01/07 16:08:40 kib Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.27 2011/11/02 18:08:30 kib Exp $"); /* * C library -- _setjmp, _longjmp @@ -51,12 +51,19 @@ ENTRY(setjmp) movl 4(%esp),%ecx PIC_PROLOGUE +#ifdef PIC + subl $12,%esp /* make the stack 16-byte aligned */ +#endif leal 28(%ecx), %eax pushl %eax /* (sigset_t*)oset */ pushl $0 /* (sigset_t*)set */ pushl $1 /* SIG_BLOCK */ call PIC_PLT(CNAME(_sigprocmask)) +#ifdef PIC + addl $24,%esp +#else addl $12,%esp +#endif PIC_EPILOGUE movl 4(%esp),%ecx movl 0(%esp),%edx @@ -76,12 +83,19 @@ ENTRY(__longjmp) movl 4(%esp),%edx PIC_PROLOGUE +#ifdef PIC + subl $12,%esp /* make the stack 16-byte aligned */ +#endif pushl $0 /* (sigset_t*)oset */ leal 28(%edx), %eax pushl %eax /* (sigset_t*)set */ pushl $3 /* SIG_SETMASK */ call PIC_PLT(CNAME(_sigprocmask)) +#ifdef PIC + addl $24,%esp +#else addl $12,%esp +#endif PIC_EPILOGUE movl 4(%esp),%edx movl 8(%esp),%eax ==== //depot/projects/fadvise/lib/libc/i386/gen/sigsetjmp.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.27 2011/01/07 16:08:40 kib Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.28 2011/11/02 18:08:30 kib Exp $"); #include "SYS.h" @@ -60,12 +60,19 @@ testl %eax,%eax jz 2f PIC_PROLOGUE +#ifdef PIC + subl $12,%esp /* make the stack 16-byte aligned */ +#endif leal 28(%ecx), %eax pushl %eax /* (sigset_t*)oset */ pushl $0 /* (sigset_t*)set */ pushl $1 /* SIG_BLOCK */ call PIC_PLT(CNAME(_sigprocmask)) +#ifdef PIC + addl $24,%esp +#else addl $12,%esp +#endif PIC_EPILOGUE movl 4(%esp),%ecx 2: movl 0(%esp),%edx @@ -87,12 +94,19 @@ cmpl $0,44(%edx) jz 2f PIC_PROLOGUE +#ifdef PIC + subl $12,%esp /* make the stack 16-byte aligned */ +#endif pushl $0 /* (sigset_t*)oset */ leal 28(%edx), %eax pushl %eax /* (sigset_t*)set */ pushl $3 /* SIG_SETMASK */ call PIC_PLT(CNAME(_sigprocmask)) +#ifdef PIC + addl $24,%esp +#else addl $12,%esp +#endif PIC_EPILOGUE movl 4(%esp),%edx 2: movl 8(%esp),%eax ==== //depot/projects/fadvise/lib/libc/sys/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.155 2011/08/18 22:51:30 jonathan Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.156 2011/11/04 04:02:50 jhb Exp $ # sys sources .PATH: ${.CURDIR}/${LIBC_ARCH}/sys ${.CURDIR}/sys @@ -96,7 +96,8 @@ mq_setattr.2 \ msgctl.2 msgget.2 msgrcv.2 msgsnd.2 \ msync.2 munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 \ - pathconf.2 pdfork.2 pipe.2 poll.2 posix_fallocate.2 posix_openpt.2 profil.2 \ + pathconf.2 pdfork.2 pipe.2 poll.2 posix_fadvise.2 posix_fallocate.2 \ + posix_openpt.2 profil.2 \ pselect.2 ptrace.2 quotactl.2 \ read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \ rtprio.2 ==== //depot/projects/fadvise/lib/libc/sys/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.40 2011/08/18 22:51:30 jonathan Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.41 2011/11/04 04:02:50 jhb Exp $ */ /* @@ -379,7 +379,7 @@ }; FBSD_1.3 { - fadvise; + posix_fadvise; }; FBSDprivate_1.0 { ==== //depot/projects/fadvise/lib/libc/sys/madvise.2#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)madvise.2 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.32 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.33 2011/11/04 04:02:50 jhb Exp $ .\" .Dd July 19, 1996 .Dt MADVISE 2 @@ -170,7 +170,8 @@ .Xr mincore 2 , .Xr mprotect 2 , .Xr msync 2 , -.Xr munmap 2 +.Xr munmap 2 , +.Xr posix_fadvise 2 .Sh STANDARDS The .Fn posix_madvise ==== //depot/projects/fadvise/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.358 2011/10/03 17:01:31 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.360 2011/10/30 02:19:39 marcel Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/fadvise/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.572 2011/10/27 13:07:49 kensmith Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.573 2011/11/01 21:26:57 marius Exp $ cpu HAMMER ident GENERIC @@ -107,7 +107,7 @@ device ahd # AHA39320/29320 and onboard AIC79xx devices options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. -device amd # AMD 53C974 (Tekram DC-390(T)) +device esp # AMD Am53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family #device ispfw # Firmware for QLogic HBAs- normally a module ==== //depot/projects/fadvise/sys/arm/conf/GUMSTIX#2 (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/arm/conf/GUMSTIX,v 1.8 2011/08/07 20:16:46 rmacklem Exp $ +# $FreeBSD: src/sys/arm/conf/GUMSTIX,v 1.9 2011/11/01 16:13:59 marius Exp $ ident GUMSTIX cpu CPU_XSCALE_PXA2X0 @@ -70,6 +70,7 @@ device loop device ether device mii +device mii_bitbang device smc device smcphy device uart ==== //depot/projects/fadvise/sys/boot/common/loader.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.101 2011/05/14 01:53:38 attilio Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.102 2011/11/03 12:03:03 pluknet Exp $ .\" .Dd February 15, 2009 .Dt LOADER 8 @@ -443,7 +443,7 @@ process. The first matching binary is used. The default list is -.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall . +.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init . .It Va init_script If set to a valid file name in the root file system, instructs ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.127 2011/10/15 12:35:18 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.128 2011/11/04 04:02:50 jhb Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -2837,13 +2837,14 @@ } int -freebsd32_fadvise(struct thread *td, struct freebsd32_fadvise_args *uap) +freebsd32_posix_fadvise(struct thread *td, + struct freebsd32_posix_fadvise_args *uap) { - struct fadvise_args ap; + struct posix_fadvise_args ap; ap.fd = uap->fd; ap.offset = PAIR32TO64(off_t, uap->offset); ap.len = PAIR32TO64(off_t, uap->len); ap.advice = uap->advice; - return (sys_fadvise(td, &ap)); + return (sys_posix_fadvise(td, &ap)); } ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.127 2011/10/14 11:47:14 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 226364 2011-10-14 11:46:46Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.128 2011/11/04 04:06:31 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 227070 2011-11-04 04:02:50Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -580,7 +580,7 @@ char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)]; char len2_l_[PADL_(uint32_t)]; uint32_t len2; char len2_r_[PADR_(uint32_t)]; }; -struct freebsd32_fadvise_args { +struct freebsd32_posix_fadvise_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)]; char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)]; @@ -698,7 +698,7 @@ int freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *); int freebsd32_pselect(struct thread *, struct freebsd32_pselect_args *); int freebsd32_posix_fallocate(struct thread *, struct freebsd32_posix_fallocate_args *); -int freebsd32_fadvise(struct thread *, struct freebsd32_fadvise_args *); +int freebsd32_posix_fadvise(struct thread *, struct freebsd32_posix_fadvise_args *); #ifdef COMPAT_43 @@ -1074,7 +1074,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_shmctl AUE_SHMCTL #define FREEBSD32_SYS_AUE_freebsd32_pselect AUE_SELECT #define FREEBSD32_SYS_AUE_freebsd32_posix_fallocate AUE_NULL -#define FREEBSD32_SYS_AUE_freebsd32_fadvise AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_posix_fadvise AUE_NULL #undef PAD_ #undef PADL_ ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.123 2011/10/14 11:47:14 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 226364 2011-10-14 11:46:46Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.124 2011/11/04 04:06:31 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 227070 2011-11-04 04:02:50Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -424,5 +424,5 @@ #define FREEBSD32_SYS_rctl_add_rule 528 #define FREEBSD32_SYS_rctl_remove_rule 529 #define FREEBSD32_SYS_freebsd32_posix_fallocate 530 -#define FREEBSD32_SYS_freebsd32_fadvise 531 +#define FREEBSD32_SYS_freebsd32_posix_fadvise 531 #define FREEBSD32_SYS_MAXSYSCALL 532 ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.114 2011/10/14 11:47:14 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 226364 2011-10-14 11:46:46Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.115 2011/11/04 04:06:31 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 227070 2011-11-04 04:02:50Z jhb */ const char *freebsd32_syscallnames[] = { @@ -554,5 +554,5 @@ "rctl_add_rule", /* 528 = rctl_add_rule */ "rctl_remove_rule", /* 529 = rctl_remove_rule */ "freebsd32_posix_fallocate", /* 530 = freebsd32_posix_fallocate */ - "freebsd32_fadvise", /* 531 = freebsd32_fadvise */ + "freebsd32_posix_fadvise", /* 531 = freebsd32_posix_fadvise */ }; ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.125 2011/10/14 11:47:14 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 226364 2011-10-14 11:46:46Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.126 2011/11/04 04:06:31 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 227070 2011-11-04 04:02:50Z jhb */ #include "opt_compat.h" @@ -591,5 +591,5 @@ { AS(rctl_add_rule_args), (sy_call_t *)sys_rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 528 = rctl_add_rule */ { AS(rctl_remove_rule_args), (sy_call_t *)sys_rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 529 = rctl_remove_rule */ { AS(freebsd32_posix_fallocate_args), (sy_call_t *)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = freebsd32_posix_fallocate */ - { AS(freebsd32_fadvise_args), (sy_call_t *)freebsd32_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 531 = freebsd32_fadvise */ + { AS(freebsd32_posix_fadvise_args), (sy_call_t *)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 531 = freebsd32_posix_fadvise */ }; ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_systrace_args.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_systrace_args.c,v 1.7 2011/10/14 11:47:14 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_systrace_args.c,v 1.8 2011/11/04 04:06:31 jhb Exp $ * This file is part of the DTrace syscall provider. */ @@ -3034,9 +3034,9 @@ *n_args = 5; break; } - /* freebsd32_fadvise */ + /* freebsd32_posix_fadvise */ case 531: { - struct freebsd32_fadvise_args *p = params; + struct freebsd32_posix_fadvise_args *p = params; iarg[0] = p->fd; /* int */ uarg[1] = p->offset1; /* uint32_t */ uarg[2] = p->offset2; /* uint32_t */ @@ -8105,7 +8105,7 @@ break; }; break; - /* freebsd32_fadvise */ + /* freebsd32_posix_fadvise */ case 531: switch(ndx) { case 0: ==== //depot/projects/fadvise/sys/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.142 2011/10/14 11:46:46 jhb Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.143 2011/11/04 04:02:50 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -991,7 +991,7 @@ 530 AUE_NULL STD { int freebsd32_posix_fallocate(int fd,\ uint32_t offset1, uint32_t offset2,\ uint32_t len1, uint32_t len2); } -531 AUE_NULL STD { int freebsd32_fadvise(int fd, \ +531 AUE_NULL STD { int freebsd32_posix_fadvise(int fd, \ uint32_t offset1, uint32_t offset2,\ uint32_t len1, uint32_t len2, \ int advice); } ==== //depot/projects/fadvise/sys/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1621 2011/10/08 21:15:39 marius Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1624 2011/11/03 12:03:03 pluknet Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1459,7 +1459,9 @@ # such as the Tekram DC-390(T). # bt: Most Buslogic controllers: including BT-445, BT-54x, BT-64x, BT-74x, # BT-75x, BT-946, BT-948, BT-956, BT-958, SDC3211B, SDC3211F, SDC3222F -# esp: NCR53c9x. Only for SBUS hardware right now. +# esp: Emulex ESP, NCR 53C9x and QLogic FAS families based controllers +# including the AMD Am53C974 (found on devices such as the Tekram +# DC-390(T)) and the Sun ESP and FAS families of controllers # isp: Qlogic ISP 1020, 1040 and 1040B PCI SCSI host adapters, # ISP 1240 Dual Ultra SCSI, ISP 1080 and 1280 (Dual) Ultra2, # ISP 12160 Ultra3 SCSI, @@ -1846,13 +1848,15 @@ # MII bus support is required for many PCI Ethernet NICs, # namely those which use MII-compliant transceivers or implement # transceiver control interfaces that operate like an MII. Adding -# "device miibus" to the kernel config pulls in support for -# the generic miibus API and all of the PHY drivers, including a -# generic one for PHYs that aren't specifically handled by an -# individual driver. Support for specific PHYs may be built by adding -# "device mii" then adding the appropriate PHY driver. -device miibus # MII support including all PHYs +# "device miibus" to the kernel config pulls in support for the generic +# miibus API, the common support for for bit-bang'ing the MII and all +# of the PHY drivers, including a generic one for PHYs that aren't +# specifically handled by an individual driver. Support for specific +# PHYs may be built by adding "device mii", "device mii_bitbang" if +# needed by the NIC driver and then adding the appropriate PHY driver. device mii # Minimal MII support +device mii_bitbang # Common module for bit-bang'ing the MII +device miibus # MII support w/ bit-bang'ing and all PHYs device acphy # Altima Communications AC101 device amphy # AMD AM79c873 / Davicom DM910{1,2} @@ -2809,7 +2813,7 @@ # Embedded system options: # # An embedded system might want to run something other than init. -options INIT_PATH=/sbin/init:/stand/sysinstall +options INIT_PATH=/sbin/init:/rescue/init # Debug options options BUS_DEBUG # enable newbus debugging ==== //depot/projects/fadvise/sys/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1614 2011/10/08 12:33:10 marius Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1616 2011/11/01 21:26:57 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1064,6 +1064,7 @@ dev/ep/if_ep_isa.c optional ep isa dev/ep/if_ep_mca.c optional ep mca dev/ep/if_ep_pccard.c optional ep pccard +dev/esp/esp_pci.c optional esp pci dev/esp/ncr53c9x.c optional esp dev/ex/if_ex.c optional ex dev/ex/if_ex_isa.c optional ex isa @@ -1425,6 +1426,7 @@ dev/mii/jmphy.c optional miibus | jmphy dev/mii/lxtphy.c optional miibus | lxtphy dev/mii/mii.c optional miibus | mii +dev/mii/mii_bitbang.c optional miibus | mii_bitbang dev/mii/mii_physubr.c optional miibus | mii dev/mii/miibus_if.m optional miibus | mii dev/mii/mlphy.c optional miibus | mlphy ==== //depot/projects/fadvise/sys/conf/files.amd64#2 (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.181 2011/06/22 21:04:13 jhb Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.182 2011/11/03 21:20:22 bz Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -208,6 +208,12 @@ dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/nvram/nvram.c optional nvram isa +dev/qlxgb/qla_dbg.c optional qlxgb pci +dev/qlxgb/qla_hw.c optional qlxgb pci +dev/qlxgb/qla_ioctl.c optional qlxgb pci +dev/qlxgb/qla_isr.c optional qlxgb pci +dev/qlxgb/qla_misc.c optional qlxgb pci +dev/qlxgb/qla_os.c optional qlxgb pci dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/sio/sio_pccard.c optional sio pccard ==== //depot/projects/fadvise/sys/conf/newvers.sh#2 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.96 2011/09/26 02:27:04 kensmith Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.97 2011/10/27 20:44:28 dougb Exp $ TYPE="FreeBSD" REVISION="10.0" @@ -88,7 +88,7 @@ i=`${MAKE:-make} -V KERN_IDENT` for dir in /bin /usr/bin /usr/local/bin; do - if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then + if [ -x "${dir}/svnversion" ] ; then svnversion=${dir}/svnversion break fi @@ -99,8 +99,12 @@ done if [ -n "$svnversion" ] ; then - echo "$svnversion" - svn=" r`cd ${SYSDIR} && $svnversion`" + echo "$svnversion" + svn=`cd ${SYSDIR} && $svnversion` + case "$svn" in + [0-9]*) svn=" r${svn}" ;; + *) unset svn ;; + esac fi if [ -n "$git_cmd" ] ; then ==== //depot/projects/fadvise/sys/contrib/pf/net/pf.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.80 2011/10/19 08:57:17 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.81 2011/10/30 14:55:00 kevlo Exp $"); #endif #ifdef __FreeBSD__ @@ -7176,11 +7176,15 @@ } #ifdef __FreeBSD__ - if (pd.pf_mtag->flags & PF_TAG_GENERATED) + if (pd.pf_mtag->flags & PF_TAG_GENERATED) { + PF_UNLOCK(); #else if (m->m_pkthdr.pf.flags & PF_TAG_GENERATED) #endif return (PF_PASS); +#ifdef __FreeBSD__ + } +#endif /* We do IP header normalization and packet reassembly here */ if (pf_normalize_ip6(m0, dir, kif, &reason, &pd) != PF_PASS) { ==== //depot/projects/fadvise/sys/dev/ata/ata-pci.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.156 2011/10/24 08:47:23 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.157 2011/11/01 17:57:21 marius Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -153,10 +153,20 @@ } if (ctlr->chipdeinit != NULL) ctlr->chipdeinit(dev); - if (ctlr->r_res2) + if (ctlr->r_res2) { +#ifdef __sparc64__ + bus_space_unmap(rman_get_bustag(ctlr->r_res2), + rman_get_bushandle(ctlr->r_res2), rman_get_size(ctlr->r_res2)); +#endif bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2, ctlr->r_res2); - if (ctlr->r_res1) + } + if (ctlr->r_res1) { +#ifdef __sparc64__ + bus_space_unmap(rman_get_bustag(ctlr->r_res1), + rman_get_bushandle(ctlr->r_res1), rman_get_size(ctlr->r_res1)); +#endif bus_release_resource(dev, ctlr->r_type1, ctlr->r_rid1, ctlr->r_res1); + } return 0; } @@ -775,7 +785,6 @@ DRIVER_MODULE(ata, atapci, ata_pcichannel_driver, ata_devclass, 0, 0); - /* * misc support fucntions */ @@ -936,4 +945,3 @@ return (mode & ATA_MODE_MASK) + 5; return (mode & ATA_MODE_MASK) - ATA_PIO0; } - ==== //depot/projects/fadvise/sys/dev/ata/chipsets/ata-promise.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.23 2011/07/22 16:37:04 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.24 2011/11/01 17:57:21 marius Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -94,7 +94,6 @@ #define PR_SATA 0x40 #define PR_SATA2 0x80 - /* * Promise chipset support functions */ @@ -250,6 +249,14 @@ &ctlr->r_rid1, RF_ACTIVE))) goto failnfree; +#ifdef __sparc64__ + if (ctlr->chip->cfg2 == PR_SX4X && + !bus_space_map(rman_get_bustag(ctlr->r_res1), + rman_get_bushandle(ctlr->r_res1), rman_get_size(ctlr->r_res1), + BUS_SPACE_MAP_LINEAR, NULL)) + goto failnfree; +#endif + ctlr->r_type2 = SYS_RES_MEMORY; ctlr->r_rid2 = PCIR_BAR(3); if (!(ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, ==== //depot/projects/fadvise/sys/dev/ata/chipsets/ata-siliconimage.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.21 2011/03/06 13:08:25 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.22 2011/11/01 17:57:21 marius Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -80,7 +80,6 @@ #define SII_BUG 0x04 #define SII_4CH 0x08 - /* * Silicon Image Inc. (SiI) (former CMD) chipset support functions */ @@ -141,6 +140,17 @@ bus_release_resource(dev, ctlr->r_type1, ctlr->r_rid1,ctlr->r_res1); return ENXIO; } +#ifdef __sparc64__ + if (!bus_space_map(rman_get_bustag(ctlr->r_res2), + rman_get_bushandle(ctlr->r_res2), rman_get_size(ctlr->r_res2), + BUS_SPACE_MAP_LINEAR, NULL)) { + bus_release_resource(dev, ctlr->r_type1, ctlr->r_rid1, + ctlr->r_res1); + bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2, + ctlr->r_res2); + return (ENXIO); + } +#endif ctlr->ch_attach = ata_siiprb_ch_attach; ctlr->ch_detach = ata_siiprb_ch_detach; ctlr->reset = ata_siiprb_reset; @@ -432,7 +442,6 @@ return (mode); } - struct ata_siiprb_dma_prdentry { u_int64_t addr; u_int32_t count; ==== //depot/projects/fadvise/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c,v 1.78 2011/10/25 23:17:53 adrian Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c,v 1.79 2011/11/04 13:32:13 adrian Exp $ */ #include "opt_ah.h" @@ -1178,7 +1178,7 @@ HAL_BOOL ar5416Disable(struct ath_hal *ah) { - if (!ar5212SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE)) + if (!ar5416SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE)) return AH_FALSE; if (! ar5416SetResetReg(ah, HAL_RESET_COLD)) return AH_FALSE; ==== //depot/projects/fadvise/sys/dev/ath/if_ath.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.342 2011/10/18 02:43:59 adrian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.343 2011/10/28 15:44:09 adrian Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -3624,8 +3624,10 @@ /* NB: bpf needs the mbuf length setup */ len = rs->rs_datalen; m->m_pkthdr.len = m->m_len = len; + bf->bf_m = NULL; ath_rx_tap(ifp, m, rs, tsf, nf); ieee80211_radiotap_rx_all(ic, m); + m_freem(m); } /* XXX pass MIC errors up for s/w reclaculation */ goto rx_next; ==== //depot/projects/fadvise/sys/dev/ath/if_ath_debug.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111041353.pA4Dr4bY060911>