Date: Mon, 21 Apr 2008 17:21:58 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 140360 for review Message-ID: <200804211721.m3LHLwl0028110@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140360 Change 140360 by marcel@marcel_xcllnt on 2008/04/21 17:21:05 IFC @140359 Affected files ... .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#27 integrate .. //depot/projects/ia64/sys/arm/conf/AVILA#8 integrate .. //depot/projects/ia64/sys/arm/conf/BWCT#4 integrate .. //depot/projects/ia64/sys/arm/conf/CRB#4 integrate .. //depot/projects/ia64/sys/arm/conf/EP80219#6 integrate .. //depot/projects/ia64/sys/arm/conf/HL200#4 integrate .. //depot/projects/ia64/sys/arm/conf/IQ31244#13 integrate .. //depot/projects/ia64/sys/arm/conf/KB920X#10 integrate .. //depot/projects/ia64/sys/arm/conf/SIMICS#12 integrate .. //depot/projects/ia64/sys/arm/conf/SKYEYE#6 integrate .. //depot/projects/ia64/sys/conf/files#165 integrate .. //depot/projects/ia64/sys/conf/files.amd64#51 integrate .. //depot/projects/ia64/sys/conf/files.i386#90 integrate .. //depot/projects/ia64/sys/conf/files.pc98#76 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#64 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#57 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#42 integrate .. //depot/projects/ia64/sys/dev/ata/ata-queue.c#32 integrate .. //depot/projects/ia64/sys/ia64/conf/DEFAULTS#13 integrate .. //depot/projects/ia64/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/ia64/sys/mips/conf/IDT#3 integrate .. //depot/projects/ia64/sys/mips/conf/MALTA#2 integrate .. //depot/projects/ia64/sys/mips/conf/QEMU#2 integrate .. //depot/projects/ia64/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/ia64/sys/netinet/ip_divert.c#43 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#57 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#38 integrate .. //depot/projects/ia64/sys/netinet6/raw_ip6.c#33 integrate .. //depot/projects/ia64/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/ia64/sys/powerpc/aim/nexus.c#2 integrate .. //depot/projects/ia64/sys/powerpc/conf/DEFAULTS#8 integrate .. //depot/projects/ia64/sys/powerpc/conf/MPC85XX#3 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#71 integrate .. //depot/projects/ia64/sys/sparc64/conf/NOTES#22 integrate .. //depot/projects/ia64/sys/sun4v/conf/DEFAULTS#6 integrate .. //depot/projects/ia64/sys/sun4v/conf/NOTES#6 integrate .. //depot/projects/ia64/tools/tools/nanobsd/Files/root/save_cfg#1 branch .. //depot/projects/ia64/usr.sbin/ancontrol/ancontrol.c#10 integrate Differences ... ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 (text+ko) ==== @@ -18,7 +18,7 @@ <corpauthor>The &os; Documentation Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.329 2008/02/03 09:43:08 brueffer Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.330 2008/04/21 05:43:07 brueffer Exp $</pubdate> <copyright> <year>2000</year> @@ -764,8 +764,6 @@ &hwlist.ath; - &hwlist.awi; - &hwlist.cnw; <para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network ==== //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#27 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.104 2008/03/11 08:28:44 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.105 2008/04/21 05:43:08 brueffer Exp $ # # @@ -47,7 +47,6 @@ asr i386 ath i386,pc98,amd64,sparc64 aue i386,pc98,ia64,amd64,powerpc -awi i386,pc98,amd64 axe i386,pc98,amd64,powerpc bce i386,amd64 bge i386,pc98,sparc64,ia64,amd64 ==== //depot/projects/ia64/sys/arm/conf/AVILA#8 (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/AVILA,v 1.12 2008/04/20 20:35:34 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.13 2008/04/21 10:09:54 phk Exp $ machine arm ident AVILA @@ -80,7 +80,6 @@ #options PREEMPTION #options VERBOSE_SYSINIT -device genclock device mem # Memory and kernel memory devices #device saarm ==== //depot/projects/ia64/sys/arm/conf/BWCT#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.4 2008/03/27 11:54:17 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $ machine arm ident BWCT @@ -68,7 +68,6 @@ options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING -device genclock device loop device random device ether ==== //depot/projects/ia64/sys/arm/conf/CRB#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CRB,v 1.4 2008/03/27 11:54:17 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $ machine arm ident CRB @@ -65,7 +65,6 @@ options BOOTP_WIRED_TO=em0 options BOOTP_COMPAT #options PREEMPTION -device genclock device loop device ether device mem # Memory and kernel memory devices ==== //depot/projects/ia64/sys/arm/conf/EP80219#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.7 2008/03/27 11:54:17 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $ machine arm ident EP80219 @@ -67,7 +67,6 @@ options BOOTP_WIRED_TO=fxp0 options BOOTP_COMPAT #options PREEMPTION -device genclock device loop device ether device mem # Memory and kernel memory devices ==== //depot/projects/ia64/sys/arm/conf/HL200#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/arm/conf/HL200,v 1.4 2008/04/20 20:35:34 sam Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $ machine arm ident HL200 @@ -74,7 +74,6 @@ options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING -device genclock device random device pty device loop ==== //depot/projects/ia64/sys/arm/conf/IQ31244#13 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.21 2008/03/27 11:54:18 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $ machine arm ident IQ31244 @@ -64,7 +64,6 @@ options BOOTP_WIRED_TO=em0 options BOOTP_COMPAT #options PREEMPTION -device genclock device loop device ether device mem # Memory and kernel memory devices ==== //depot/projects/ia64/sys/arm/conf/KB920X#10 (text) ==== @@ -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/KB920X,v 1.16 2008/04/20 20:35:34 sam Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.17 2008/04/21 10:09:54 phk Exp $ machine arm ident KB920X @@ -62,7 +62,6 @@ options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING -device genclock device random device pty device loop ==== //depot/projects/ia64/sys/arm/conf/SIMICS#12 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.15 2008/03/27 11:54:18 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $ machine arm ident SIMICS @@ -54,7 +54,6 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -device genclock device loop device ether device saip ==== //depot/projects/ia64/sys/arm/conf/SKYEYE#6 (text) ==== @@ -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/SKYEYE,v 1.9 2008/03/27 11:54:18 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $ machine arm ident KB920X @@ -59,7 +59,6 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -device genclock device loop device ether #device saarm ==== //depot/projects/ia64/sys/conf/files#165 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1293 2008/04/20 20:35:35 sam Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1425,7 +1425,7 @@ fs/cd9660/cd9660_vnops.c optional cd9660 fs/cd9660/cd9660_iconv.c optional cd9660_iconv kern/bus_if.m standard -kern/clock_if.m optional genclock +kern/clock_if.m standard kern/cpufreq_if.m standard kern/device_if.m standard kern/imgact_elf.c standard @@ -1524,7 +1524,7 @@ kern/subr_prf.c standard kern/subr_prof.c standard kern/subr_rman.c standard -kern/subr_rtc.c optional genclock +kern/subr_rtc.c standard kern/subr_sbuf.c standard kern/subr_scanf.c standard kern/subr_sleepqueue.c standard ==== //depot/projects/ia64/sys/conf/files.amd64#51 (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.120 2008/04/14 07:59:59 phk Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.121 2008/04/21 10:09:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -210,9 +210,7 @@ isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga -kern/clock_if.m standard kern/link_elf_obj.c standard -kern/subr_rtc.c standard # # IA32 binary support # ==== //depot/projects/ia64/sys/conf/files.i386#90 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.594 2008/04/14 07:59:59 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.595 2008/04/21 10:09:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -446,10 +446,8 @@ isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga -kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip -kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/ia64/sys/conf/files.pc98#76 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.361 2008/04/19 08:18:47 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.362 2008/04/21 10:09:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -314,10 +314,8 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # -kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip -kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/ia64/sys/dev/ata/ata-chipset.c#64 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.217 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.219 2008/04/21 10:51:38 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -694,7 +694,7 @@ ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DHR)); /* enable FIS based switching */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003); + //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003); /* start operations on this channel */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset, @@ -820,7 +820,7 @@ ~ATA_AHCI_P_CMD_ATAPI); /* set PM port to address */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001); + //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001); /* issue command to controller */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CI + offset, (1 << request->tag)); @@ -1638,6 +1638,27 @@ /* + * Adaptec chipset support functions + */ +int +ata_adaptec_ident(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(dev); + static struct ata_chip_id ids[] = + {{ ATA_ADAPTEC_1420, 0, 4, MV60XX, ATA_SA300, "1420SA" }, + { 0, 0, 0, 0, 0, 0}}; + + if (!(ctlr->chip = ata_match_chip(dev, ids))) + return ENXIO; + + ata_set_desc(dev); + ctlr->chipinit = ata_marvell_edma_chipinit; + + return 0; +} + + +/* * ATI chipset support functions */ int ==== //depot/projects/ia64/sys/dev/ata/ata-pci.c#57 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.126 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.127 2008/04/21 10:51:38 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -96,6 +96,10 @@ if (!ata_amd_ident(dev)) return ATA_PROBE_OK; break; + case ATA_ADAPTEC_ID: + if (!ata_adaptec_ident(dev)) + return ATA_PROBE_OK; + break; case ATA_ATI_ID: if (!ata_ati_ident(dev)) return ATA_PROBE_OK; @@ -523,6 +527,7 @@ case ATA_ACARD_ID: return "Acard"; case ATA_ACER_LABS_ID: return "AcerLabs"; case ATA_AMD_ID: return "AMD"; + case ATA_ADAPTEC_ID: return "Adaptec"; case ATA_ATI_ID: return "ATI"; case ATA_CYRIX_ID: return "Cyrix"; case ATA_CYPRESS_ID: return "Cypress"; ==== //depot/projects/ia64/sys/dev/ata/ata-pci.h#42 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/ata/ata-pci.h,v 1.85 2008/04/12 17:21:22 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.86 2008/04/21 10:51:38 sos Exp $ */ /* structure holding chipset config info */ @@ -80,6 +80,14 @@ #define ATA_ATP865A 0x00081191 #define ATA_ATP865R 0x00091191 +#define ATA_ACER_LABS_ID 0x10b9 +#define ATA_ALI_1533 0x153310b9 +#define ATA_ALI_5229 0x522910b9 +#define ATA_ALI_5281 0x528110b9 +#define ATA_ALI_5287 0x528710b9 +#define ATA_ALI_5288 0x528810b9 +#define ATA_ALI_5289 0x528910b9 + #define ATA_AMD_ID 0x1022 #define ATA_AMD755 0x74011022 #define ATA_AMD756 0x74091022 @@ -88,13 +96,8 @@ #define ATA_AMD8111 0x74691022 #define ATA_AMD5536 0x209a1022 -#define ATA_ACER_LABS_ID 0x10b9 -#define ATA_ALI_1533 0x153310b9 -#define ATA_ALI_5229 0x522910b9 -#define ATA_ALI_5281 0x528110b9 -#define ATA_ALI_5287 0x528710b9 -#define ATA_ALI_5288 0x528810b9 -#define ATA_ALI_5289 0x528910b9 +#define ATA_ADAPTEC_ID 0x9005 +#define ATA_ADAPTEC_1420 0x02419005 #define ATA_ATI_ID 0x1002 #define ATA_ATI_IXP200 0x43491002 @@ -471,6 +474,7 @@ int ata_acard_ident(device_t); int ata_ali_ident(device_t); int ata_amd_ident(device_t); +int ata_adaptec_ident(device_t); int ata_ati_ident(device_t); int ata_cyrix_ident(device_t); int ata_cypress_ident(device_t); ==== //depot/projects/ia64/sys/dev/ata/ata-queue.c#32 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.72 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.73 2008/04/21 10:35:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -503,6 +503,7 @@ request->flags |= ATA_R_TIMEOUT; mtx_unlock(&ch->state_mtx); ATA_LOCKING(ch->dev, ATA_LF_UNLOCK); + ch->dma.unload(request); ata_finish(request); } else { ==== //depot/projects/ia64/sys/ia64/conf/DEFAULTS#13 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/ia64 # -# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.14 2008/04/15 17:02:23 marcel Exp $ +# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.15 2008/04/21 10:09:54 phk Exp $ machine ia64 @@ -9,7 +9,6 @@ device acpi # ACPI support # Pseudo devices. -device genclock # Real-time clock device mem # Memory and kernel memory devices # UART chips on this platform ==== //depot/projects/ia64/sys/mips/conf/ADM5120#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.2 2008/04/13 22:04:56 imp Exp $ +# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.3 2008/04/21 10:09:54 phk Exp $ machine mips ident ADM5120 @@ -62,7 +62,6 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device genclock device loop device ether device uart ==== //depot/projects/ia64/sys/mips/conf/IDT#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/mips/conf/IDT,v 1.2 2008/04/20 20:35:39 sam Exp $ +# $FreeBSD: src/sys/mips/conf/IDT,v 1.3 2008/04/21 10:09:54 phk Exp $ machine mips cpu CPU_MIPS4KC @@ -31,7 +31,6 @@ options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -device genclock device loop device pci device ether ==== //depot/projects/ia64/sys/mips/conf/MALTA#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/mips/conf/MALTA,v 1.2 2008/04/13 22:04:56 imp Exp $ +# $FreeBSD: src/sys/mips/conf/MALTA,v 1.3 2008/04/21 10:09:54 phk Exp $ machine mips ident MALTA @@ -61,7 +61,6 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device genclock device loop device ether device le ==== //depot/projects/ia64/sys/mips/conf/QEMU#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/mips/conf/QEMU,v 1.1 2008/04/13 07:07:57 imp Exp $ +# $FreeBSD: src/sys/mips/conf/QEMU,v 1.2 2008/04/21 10:09:54 phk Exp $ machine mips cpu CPU_MIPS32 @@ -51,7 +51,6 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device genclock device loop device ether device mem ==== //depot/projects/ia64/sys/mips/conf/SENTRY5#2 (text) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.2 2008/04/15 02:09:28 imp Exp $ +# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.3 2008/04/21 10:09:54 phk Exp $ # # The Broadcom Sentry5 series of processors and boards is very commonly # used in COTS hardware including the Netgear WGT634U. @@ -91,7 +91,6 @@ #device uart #device uart_ns8250 -device genclock device loop device ether device md ==== //depot/projects/ia64/sys/netinet/ip_divert.c#43 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.132 2008/04/17 21:38:16 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.133 2008/04/21 12:03:59 rwatson Exp $"); #if !defined(KLD_MODULE) #include "opt_inet.h" @@ -268,7 +268,7 @@ nport = htons((u_int16_t)divert_info(mtag)); INP_INFO_RLOCK(&divcbinfo); LIST_FOREACH(inp, &divcb, inp_list) { - INP_WLOCK(inp); + INP_RLOCK(inp); /* XXX why does only one socket match? */ if (inp->inp_lport == nport) { sa = inp->inp_socket; @@ -280,10 +280,10 @@ sa = NULL; /* force mbuf reclaim below */ } else sorwakeup_locked(sa); - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); break; } - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); } INP_INFO_RUNLOCK(&divcbinfo); if (sa == NULL) { @@ -356,7 +356,7 @@ dt->info |= IP_FW_DIVERT_OUTPUT_FLAG; INP_INFO_WLOCK(&divcbinfo); inp = sotoinpcb(so); - INP_WLOCK(inp); + INP_RLOCK(inp); /* * Don't allow both user specified and setsockopt options, * and don't allow packet length sizes that will crash @@ -364,7 +364,7 @@ if (((ip->ip_hl != (sizeof (*ip) >> 2)) && inp->inp_options) || ((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) { error = EINVAL; - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); INP_INFO_WUNLOCK(&divcbinfo); m_freem(m); } else { @@ -405,7 +405,7 @@ if (options == NULL) error = ENOBUFS; } - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); INP_INFO_WUNLOCK(&divcbinfo); if (error == ENOBUFS) { m_freem(m); @@ -615,11 +615,11 @@ INP_INFO_RLOCK(&divcbinfo); for (inp = LIST_FIRST(divcbinfo.ipi_listhead), i = 0; inp && i < n; inp = LIST_NEXT(inp, inp_list)) { - INP_WLOCK(inp); + INP_RLOCK(inp); if (inp->inp_gencnt <= gencnt && cr_canseesocket(req->td->td_ucred, inp->inp_socket) == 0) inp_list[i++] = inp; - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); } INP_INFO_RUNLOCK(&divcbinfo); n = i; @@ -627,7 +627,7 @@ error = 0; for (i = 0; i < n; i++) { inp = inp_list[i]; - INP_WLOCK(inp); + INP_RLOCK(inp); if (inp->inp_gencnt <= gencnt) { struct xinpcb xi; bzero(&xi, sizeof(xi)); @@ -636,10 +636,10 @@ bcopy(inp, &xi.xi_inp, sizeof *inp); if (inp->inp_socket) sotoxsocket(inp->inp_socket, &xi.xi_socket); - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); error = SYSCTL_OUT(req, &xi, sizeof xi); } else - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); } if (!error) { /* ==== //depot/projects/ia64/sys/netinet/raw_ip.c#57 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.182 2008/04/17 21:38:16 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.183 2008/04/21 12:06:41 rwatson Exp $"); #include "opt_inet6.h" #include "opt_ipsec.h" @@ -155,7 +155,7 @@ { int policyfail = 0; - INP_WLOCK_ASSERT(last); + INP_RLOCK_ASSERT(last); #ifdef IPSEC /* check AH/ESP integrity. */ @@ -209,10 +209,10 @@ ripsrc.sin_addr = ip->ip_src; last = NULL; LIST_FOREACH(inp, &ripcb, inp_list) { - INP_WLOCK(inp); + INP_RLOCK(inp); if (inp->inp_ip_p && inp->inp_ip_p != proto) { docontinue: - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); continue; } #ifdef INET6 @@ -236,14 +236,14 @@ if (n != NULL) (void) raw_append(last, ip, n); /* XXX count dropped packet */ - INP_WUNLOCK(last); + INP_RUNLOCK(last); } last = inp; } if (last != NULL) { if (raw_append(last, ip, m) != 0) ipstat.ips_delivered--; - INP_WUNLOCK(last); + INP_RUNLOCK(last); } else { m_freem(m); ipstat.ips_noproto++; @@ -278,7 +278,7 @@ if (m == NULL) return(ENOBUFS); - INP_WLOCK(inp); + INP_RLOCK(inp); ip = mtod(m, struct ip *); ip->ip_tos = inp->inp_ip_tos; if (inp->inp_flags & INP_DONTFRAG) @@ -299,12 +299,12 @@ m_freem(m); return(EMSGSIZE); } - INP_WLOCK(inp); + INP_RLOCK(inp); ip = mtod(m, struct ip *); if (jailed(inp->inp_socket->so_cred)) { if (ip->ip_src.s_addr != htonl(prison_getip(inp->inp_socket->so_cred))) { - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); m_freem(m); return (EPERM); } @@ -315,7 +315,7 @@ && inp->inp_options) || (ip->ip_len > m->m_pkthdr.len) || (ip->ip_len < (ip->ip_hl << 2))) { - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); m_freem(m); return EINVAL; } @@ -335,7 +335,7 @@ error = ip_output(m, inp->inp_options, NULL, flags, inp->inp_moptions, inp); - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); return error; } @@ -851,13 +851,13 @@ INP_INFO_RLOCK(&ripcbinfo); for (inp = LIST_FIRST(ripcbinfo.ipi_listhead), i = 0; inp && i < n; inp = LIST_NEXT(inp, inp_list)) { - INP_WLOCK(inp); + INP_RLOCK(inp); if (inp->inp_gencnt <= gencnt && cr_canseesocket(req->td->td_ucred, inp->inp_socket) == 0) { /* XXX held references? */ inp_list[i++] = inp; } - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); } INP_INFO_RUNLOCK(&ripcbinfo); n = i; @@ -865,7 +865,7 @@ error = 0; for (i = 0; i < n; i++) { inp = inp_list[i]; - INP_WLOCK(inp); + INP_RLOCK(inp); if (inp->inp_gencnt <= gencnt) { struct xinpcb xi; bzero(&xi, sizeof(xi)); @@ -874,10 +874,10 @@ bcopy(inp, &xi.xi_inp, sizeof *inp); if (inp->inp_socket) sotoxsocket(inp->inp_socket, &xi.xi_socket); - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); error = SYSCTL_OUT(req, &xi, sizeof xi); } else - INP_WUNLOCK(inp); + INP_RUNLOCK(inp); } if (!error) { /* ==== //depot/projects/ia64/sys/netinet6/icmp6.c#38 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.83 2008/04/17 21:38:17 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.84 2008/04/21 12:08:40 rwatson Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -1891,10 +1891,10 @@ INP_INFO_RLOCK(&ripcbinfo); LIST_FOREACH(in6p, &ripcb, inp_list) { - INP_WLOCK(in6p); + INP_RLOCK(in6p); if ((in6p->inp_vflag & INP_IPV6) == 0) { docontinue: - INP_WUNLOCK(in6p); + INP_RUNLOCK(in6p); continue; } if (in6p->in6p_ip6_nxt != IPPROTO_ICMPV6) @@ -1965,7 +1965,7 @@ sorwakeup_locked(last->in6p_socket); opts = NULL; } - INP_WUNLOCK(last); + INP_RUNLOCK(last); } last = in6p; } @@ -2003,7 +2003,7 @@ SOCKBUF_UNLOCK(&last->in6p_socket->so_rcv); } else sorwakeup_locked(last->in6p_socket); - INP_WUNLOCK(last); + INP_RUNLOCK(last); } else { m_freem(m); ip6stat.ip6s_delivered--; ==== //depot/projects/ia64/sys/netinet6/raw_ip6.c#33 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.77 2008/04/17 21:38:17 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.78 2008/04/21 12:06:41 rwatson Exp $"); #include "opt_ipsec.h" #include "opt_inet6.h" @@ -154,10 +154,10 @@ INP_INFO_RLOCK(&ripcbinfo); LIST_FOREACH(in6p, &ripcb, inp_list) { - INP_WLOCK(in6p); + INP_RLOCK(in6p); if ((in6p->in6p_vflag & INP_IPV6) == 0) { docontinue: - INP_WUNLOCK(in6p); + INP_RUNLOCK(in6p); continue; } if (in6p->in6p_ip6_nxt && @@ -207,7 +207,7 @@ sorwakeup(last->in6p_socket); opts = NULL; } - INP_WUNLOCK(last); + INP_RUNLOCK(last); } last = in6p; } @@ -220,7 +220,7 @@ ipsec6stat.in_polvio++; ip6stat.ip6s_delivered--; /* do not inject data into pcb */ - INP_WUNLOCK(last); + INP_RUNLOCK(last); } else #endif /* IPSEC */ if (last) { @@ -237,7 +237,7 @@ rip6stat.rip6s_fullsock++; } else sorwakeup(last->in6p_socket); - INP_WUNLOCK(last); + INP_RUNLOCK(last); } else { rip6stat.rip6s_nosock++; if (m->m_flags & M_MCAST) ==== //depot/projects/ia64/sys/powerpc/aim/clock.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.31 2008/03/26 20:09:20 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.32 2008/04/21 04:41:37 marcel Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -83,10 +83,6 @@ static long ticks_per_intr; static volatile u_long lasttb; -#define DIFF19041970 2082844800 - -static int clockinitted = 0; - static timecounter_get_t decr_get_timecount; static struct timecounter decr_timecounter = { @@ -98,70 +94,6 @@ }; void -inittodr(time_t base) -{ - time_t deltat; - u_int rtc_time; - struct timespec ts; - phandle_t phandle; - ihandle_t ihandle; - char rtcpath[128]; - u_int rtcsecs; - - /* - * If we can't read from RTC, use the fs time. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804211721.m3LHLwl0028110>