CVS commit: src/distrib/notes/hpcarm
Module Name:src Committed By: tsutsui Date: Sat May 28 06:25:43 UTC 2011 Modified Files: src/distrib/notes/hpcarm: contents Log Message: Update description about kernel sets etc. (no GENERIC but IPAQ, JORNADA720, WZERO3 kernels) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/notes/hpcarm/contents Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/hpcarm/contents diff -u src/distrib/notes/hpcarm/contents:1.1 src/distrib/notes/hpcarm/contents:1.2 --- src/distrib/notes/hpcarm/contents:1.1 Sat May 28 06:00:08 2011 +++ src/distrib/notes/hpcarm/contents Sat May 28 06:25:43 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: contents,v 1.1 2011/05/28 06:00:08 tsutsui Exp $ +.\ $NetBSD: contents,v 1.2 2011/05/28 06:25:43 tsutsui Exp $ .\ .\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -55,12 +55,25 @@ . . It Pa kernel/ . -. (tag netbsd.gz -compact \ binary/kernel +. (tag netbsd-JORNADA720.gz -compact \ binary/kernel +. +. It Pa netbsd-IPAQ.gz +. +A gzipped +.Nx +kernel for Compaq iPAQ H36x0. +. +. It Pa netbsd-JORNADA720.gz . -. It Pa netbsd-GENERIC.gz A gzipped .Nx -kernel containing code for everything supported in this release. +kernel for HP Jornada 720. +. +. It Pa netbsd-WZERO3.gz +. +A gzipped +.Nx +kernel for Willcom/Sharp W-ZERO3 smart phones. . . tag) \ binary/kernel/ . @@ -73,12 +86,33 @@ . . It Pa installation/ . -. (tag miniroot/ -compact \ installation/ +. (tag netbsd-JORNADA720.gz -compact \ installation/ . -. It Pa misc/ +. It Pa hpcboot.exe . -Miscellaneous \*M installation utilities; see -installation section below. +A boot utility to load a +.Nx +kernel on +.Tm Windows CE +or +.Tm Windows Mobile . +. +. It Pa netbsd-IPAQ.gz +. +A gzipped ramdisk based installation kernel for Compaq iPAQ H36x0. +. +. It Pa netbsd-JORNADA720.gz +. +A gzipped ramdisk based installation kernel for HP Jornada 720. +. +. It Pa netbsd-WZERO3.gz +. +A gzipped ramdisk based installation kernel for +Willcom/Sharp W-ZERO3 smart phones. +. +. It Pa miniroot/ +. +\*M miniroot file system image including installer etc. . . tag) \ installation/ . @@ -151,16 +185,15 @@ . .\ MD kernel set(s) - . -.It Sy kern-GENERIC -This set contains a +.It Sy kern-IPAQ, kern-JORNADA720, kern-WZERO3 +These sets contains a .Nx*M \*V -.Li GENERIC -kernel, named +kernel for each supported hardware, named .Pa /netbsd . You .Em must -install this distribution set. +install the kernel that matches your hardware. . .\ -- .
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Sat May 28 06:50:08 UTC 2011
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: pmap.c
Log Message:
Change pmap_steal_memory, if it can, to prefer stealing from the physseg with
the least amount of free pages.
To generate a diff of this commit:
cvs rdiff -u -r1.179.16.29 -r1.179.16.30 src/sys/arch/mips/mips/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.179.16.29 src/sys/arch/mips/mips/pmap.c:1.179.16.30
--- src/sys/arch/mips/mips/pmap.c:1.179.16.29 Wed May 25 23:58:48 2011
+++ src/sys/arch/mips/mips/pmap.c Sat May 28 06:50:07 2011
@@ -630,31 +630,59 @@
u_int npgs;
paddr_t pa;
vaddr_t va;
+ struct vm_physseg *maybe_seg = NULL;
+ u_int maybe_bank = vm_nphysseg;
size = round_page(size);
npgs = atop(size);
+ aprint_debug(%s: need %u pages\n, __func__, npgs);
+
for (u_int bank = 0; bank vm_nphysseg; bank++) {
struct vm_physseg * const seg = VM_PHYSMEM_PTR(bank);
if (uvm.page_init_done == true)
panic(pmap_steal_memory: called _after_ bootstrap);
- printf(%s: seg %u: %#PRIxPADDR %#PRIxPADDR %#PRIxPADDR %#PRIxPADDR\n,
+ aprint_debug(%s: seg %u: %#PRIxPADDR %#PRIxPADDR %#PRIxPADDR %#PRIxPADDR\n,
__func__, bank,
seg-avail_start, seg-start,
seg-avail_end, seg-end);
if (seg-avail_start != seg-start
|| seg-avail_start = seg-avail_end) {
- printf(%s: seg %u: bad start\n, __func__, bank);
+ aprint_debug(%s: seg %u: bad start\n, __func__, bank);
continue;
}
if (seg-avail_end - seg-avail_start npgs) {
- printf(%s: seg %u: too small for %u pages\n,
+ aprint_debug(%s: seg %u: too small for %u pages\n,
+ __func__, bank, npgs);
+ continue;
+ }
+
+#ifndef _LP64
+ if (seg-avail_start + npgs MIPS_PHYS_MASK + 1) {
+ aprint_debug(%s: seg %u: not enough in KSEG0 for %u pages\n,
__func__, bank, npgs);
continue;
}
+#endif
+
+ /*
+ * Always try to allocate from the segment with the least
+ * amount of space left.
+ */
+#define VM_PHYSMEM_SPACE(s) ((s)-avail_end - (s)-avail_start)
+ if (maybe_seg == NULL
+ || VM_PHYSMEM_SPACE(seg) VM_PHYSMEM_SPACE(maybe_seg)) {
+ maybe_seg = seg;
+ maybe_bank = bank;
+ }
+ }
+
+ if (maybe_seg) {
+ struct vm_physseg * const seg = maybe_seg;
+ u_int bank = maybe_bank;
/*
* There are enough pages here; steal them!
@@ -670,12 +698,17 @@
if (vm_nphysseg == 1)
panic(pmap_steal_memory: out of memory!);
+ aprint_debug(%s: seg %u: %u pages stolen (removed)\n,
+ __func__, bank, npgs);
/* Remove this segment from the list. */
vm_nphysseg--;
for (u_int x = bank; x vm_nphysseg; x++) {
/* structure copy */
VM_PHYSMEM_PTR_SWAP(x, x + 1);
}
+ } else {
+ aprint_debug(%s: seg %u: %u pages stolen (%#PRIxPADDR left)\n,
+ __func__, bank, npgs, VM_PHYSMEM_SPACE(seg));
}
#ifdef _LP64
CVS commit: src/sys/dev/pci
Module Name:src Committed By: ryo Date: Sat May 28 10:44:43 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: add SystemBase SB16C1058 8 port serial cards To generate a diff of this commit: cvs rdiff -u -r1.1080 -r1.1081 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1080 src/sys/dev/pci/pcidevs:1.1081 --- src/sys/dev/pci/pcidevs:1.1080 Fri May 27 15:09:44 2011 +++ src/sys/dev/pci/pcidevs Sat May 28 10:44:43 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1080 2011/05/27 15:09:44 matt Exp $ +$NetBSD: pcidevs,v 1.1081 2011/05/28 10:44:43 ryo Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -4317,7 +4317,8 @@ product SYMPHONY 83C553 0x0565 83C553 PCI-ISA Bridge /* System Base products */ -product SYSTEMBASE SB16C1054 0x0004 SB16C1054 UARTs +product SYSTEMBASE SB16C1054 0x0004 SB16C1054 UARTs +product SYSTEMBASE SB16C1058 0x0008 SB16C1058 UARTs /* Schneider Koch (really SysKonnect) products */ product SCHNEIDERKOCH SKNET_FDDI 0x4000 SK-NET FDDI-xP
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: ryo
Date: Sat May 28 10:48:51 UTC 2011
Modified Files:
src/sys/dev/pci: puc.c pucdata.c
Log Message:
Add support for SYSTEMBASE SB16C105x 4-port/8-port serial PCI cards.
- Added initialize code for SB16C105x to puc.c, but
It is better to add a member (*config_function)() to
struct puc_device_description and use it
- It seems SB16C1054 *rev 0x91* has different BAR layout, but not supported yet.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/puc.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/puc.c
diff -u src/sys/dev/pci/puc.c:1.31 src/sys/dev/pci/puc.c:1.32
--- src/sys/dev/pci/puc.c:1.31 Wed Jul 9 14:46:15 2008
+++ src/sys/dev/pci/puc.c Sat May 28 10:48:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puc.c,v 1.31 2008/07/09 14:46:15 joerg Exp $ */
+/* $NetBSD: puc.c,v 1.32 2011/05/28 10:48:50 ryo Exp $ */
/*
* Copyright (c) 1996, 1998, 1999
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puc.c,v 1.31 2008/07/09 14:46:15 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: puc.c,v 1.32 2011/05/28 10:48:50 ryo Exp $);
#include sys/param.h
#include sys/systm.h
@@ -62,6 +62,7 @@
#include dev/pci/pcireg.h
#include dev/pci/pcivar.h
#include dev/pci/pucvar.h
+#include dev/pci/pcidevs.h
#include sys/termios.h
#include dev/ic/comreg.h
#include dev/ic/comvar.h
@@ -245,6 +246,21 @@
* XXX It's not pretty, but hey, what is?
*/
+ /* SB16C10xx board specific initialization */
+ if (PCI_VENDOR(pa-pa_id) == PCI_VENDOR_SYSTEMBASE
+ (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_SYSTEMBASE_SB16C1054 ||
+ PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_SYSTEMBASE_SB16C1058)) {
+ if (!sc-sc_bar_mappings[1].mapped) {
+ aprint_error_dev(self,
+ optional register is not mapped\n);
+ return;
+ }
+#define SB16C105X_OPT_IMRREG0 0x000c
+ /* enable port 0-7 interrupt */
+ bus_space_write_1(sc-sc_bar_mappings[1].t,
+ sc-sc_bar_mappings[1].h, SB16C105X_OPT_IMRREG0, 0xff);
+ }
+
/* Configure each port. */
for (i = 0; PUC_PORT_VALID(sc-sc_desc, i); i++) {
bus_space_handle_t subregion_handle;
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.74 src/sys/dev/pci/pucdata.c:1.75
--- src/sys/dev/pci/pucdata.c:1.74 Sat May 14 22:07:38 2011
+++ src/sys/dev/pci/pucdata.c Sat May 28 10:48:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.74 2011/05/14 22:07:38 martin Exp $ */
+/* $NetBSD: pucdata.c,v 1.75 2011/05/28 10:48:51 ryo Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.74 2011/05/14 22:07:38 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.75 2011/05/28 10:48:51 ryo Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2109,6 +2109,34 @@
},
},
+ /* SystemBase SB16C1054 UARTs */
+ { SystemBase SB16C1054,
+ { PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1054, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ },
+ },
+ },
+
+ /* SystemBase SB16C1058 UARTs */
+ { SystemBase SB16C1058,
+ { PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1058, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x20, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x28, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x30, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x10, 0x38, COM_FREQ },
+ },
+ },
+
/*
* VScom PCI 010L
* one lpt
CVS commit: src/share/man/man4
Module Name:src Committed By: ryo Date: Sat May 28 11:12:22 UTC 2011 Modified Files: src/share/man/man4: puc.4 Log Message: add entry for SystemBase SB16C1054/SB16C1058 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/share/man/man4/puc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/puc.4 diff -u src/share/man/man4/puc.4:1.33 src/share/man/man4/puc.4:1.34 --- src/share/man/man4/puc.4:1.33 Sun Aug 1 18:50:25 2010 +++ src/share/man/man4/puc.4 Sat May 28 11:12:22 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: puc.4,v 1.33 2010/08/01 18:50:25 msaitoh Exp $ +.\ $NetBSD: puc.4,v 1.34 2011/05/28 11:12:22 ryo Exp $ .\ .\ Copyright (c) 1998 Christopher G. Demetriou .\ All rights reserved. @@ -153,6 +153,8 @@ .It Tn SUNIX 409x (4 port serial and 2 port parallel) .It Tn Syba Tech Ltd. PCI-4S .It Tn Syba Tech Ltd. PCI-4S2P-550-ECP +.It Tn SystemBase SB16C1054PCI (4 port serial) +.It Tn SystemBase SB16C1058PCI (8 port serial) .It Tn VScom PCI-010HV2 (1 port parallel) .It Tn VScom PCI-010L (1 port parallel) .It Tn VScom PCI-011H (1 port parallel)
CVS commit: src/usr.sbin/makefs/cd9660
Module Name:src
Committed By: tsutsui
Date: Sat May 28 11:59:29 UTC 2011
Modified Files:
src/usr.sbin/makefs/cd9660: iso9660_rrip.c
Log Message:
- remove unnecessary (pasto?) line on RRIP PL handling for moved dir
- RRIP RE length should be 4, not 0
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/makefs/cd9660/iso9660_rrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.8 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.9
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.8 Sat Jan 10 22:06:29 2009
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c Sat May 28 11:59:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iso9660_rrip.c,v 1.8 2009/01/10 22:06:29 bjh21 Exp $ */
+/* $NetBSD: iso9660_rrip.c,v 1.9 2011/05/28 11:59:29 tsutsui Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -43,7 +43,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: iso9660_rrip.c,v 1.8 2009/01/10 22:06:29 bjh21 Exp $);
+__RCSID($NetBSD: iso9660_rrip.c,v 1.9 2011/05/28 11:59:29 tsutsui Exp $);
#endif /* !__lint */
static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -444,7 +444,6 @@
cd9660_rrip_PL(current,node-dot_dot_record);
TAILQ_INSERT_TAIL(node-dot_dot_record-head, current,
rr_ll);
- TAILQ_INSERT_TAIL(node-head, current, rr_ll);
}
}
return 1;
@@ -498,7 +497,7 @@
int
cd9660_rrip_RE(struct ISO_SUSP_ATTRIBUTES *p, cd9660node *node __unused)
{
- p-attr.rr_entry.RE.h.length[0] = 0;
+ p-attr.rr_entry.RE.h.length[0] = 4;
p-attr.rr_entry.RE.h.version[0] = 1;
return 1;
}
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: ryo Date: Sat May 28 13:01:51 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL GENERIC GENERIC_PS2TINY GENERIC_TINY INSTALL INSTALL_FLOPPY INSTALL_TINY INSTALL_XEN3PAE_DOMU INSTALL_XEN3_DOMU NET4501 XBOX XEN3_DOM0 XEN3_DOMU Log Message: many whitespace cleanup. confirmed cvs diff -b are identical. To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1031 -r1.1032 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.61 -r1.62 src/sys/arch/i386/conf/GENERIC_PS2TINY cvs rdiff -u -r1.127 -r1.128 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.329 -r1.330 src/sys/arch/i386/conf/INSTALL cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/conf/INSTALL_FLOPPY \ src/sys/arch/i386/conf/INSTALL_XEN3_DOMU cvs rdiff -u -r1.132 -r1.133 src/sys/arch/i386/conf/INSTALL_TINY cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU cvs rdiff -u -r1.75 -r1.76 src/sys/arch/i386/conf/NET4501 cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/conf/XBOX cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.306 src/sys/arch/i386/conf/ALL:1.307 --- src/sys/arch/i386/conf/ALL:1.306 Tue Apr 26 16:57:40 2011 +++ src/sys/arch/i386/conf/ALL Sat May 28 13:01:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.306 2011/04/26 16:57:40 joerg Exp $ +# $NetBSD: ALL,v 1.307 2011/05/28 13:01:49 ryo Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.306 $ +#ident ALL-$Revision: 1.307 $ maxusers 64 # estimated number of users @@ -122,9 +122,9 @@ options KGDB_DEVNAME=\com\,KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 options IPKDB # IP Kernel Debugger options IPKDBKEY=\Pass_phrase_to_debug_over_network\ -makeoptions DEBUG=-g # compile full symbol table +makeoptions DEBUG=-g # compile full symbol table options SYSCALL_STATS # per syscall counts -options SYSCALL_TIMES # per syscall times +options SYSCALL_TIMES # per syscall times options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) # Compatibility options @@ -209,7 +209,7 @@ options IPSEC_ESP # IP security (encryption part; define w/IPSEC) options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) #options IPSEC_DEBUG # debug for IP security -options MPLS # MultiProtocol Label Switching (needs ifmpls) +options MPLS # MultiProtocol Label Switching (needs ifmpls) options MROUTING # IP multicast routing options PIM # Protocol Independent Multicast options ISO,TPIP # OSI @@ -286,7 +286,7 @@ options PCKBD_CNATTACH_MAY_FAIL # see dev/pckbport/wskbdmap_mfii.c for implemented layouts options PCKBD_LAYOUT=(KB_DE | KB_NODEAD) # for pckbd driver -options UKBD_LAYOUT=(KB_DE | KB_NODEAD) # for ukbd driver +options UKBD_LAYOUT=(KB_DE | KB_NODEAD) # for ukbd driver # allocate a number of virtual screens at autoconfiguration time options WSDISPLAY_DEFAULTSCREENS=4 # use a large software cursor that doesn't blink @@ -343,20 +343,20 @@ options MPBIOS_SCANPCI # find PCI roots using MPBIOS options ACPI_SCANPCI # find PCI roots using ACPI -acpi0 at mainbus0 +acpi0 at mainbus0 options ACPI_ACTIVATE_DEV # If set, activate inactive devices # ACPI devices apm* at acpi? # ACPI apm emulation -acpiacad* at acpi? # ACPI AC Adapter -acpibat* at acpi? # ACPI Battery -acpibut* at acpi? # ACPI Button +acpiacad* at acpi? # ACPI AC Adapter +acpibat* at acpi? # ACPI Battery +acpibut* at acpi? # ACPI Button acpidalb* at acpi? # ACPI Direct Application Launch Button acpiec* at acpi? # ACPI Embedded Controller (late) -acpiecdt* at acpi? # ACPI Embedded Controller (early) -acpifan* at acpi? # ACPI Fan -acpilid* at acpi? # ACPI Lid Switch +acpiecdt* at acpi? # ACPI Embedded Controller (early) +acpifan* at acpi? # ACPI Fan +acpilid* at acpi? # ACPI Lid Switch acpipmtr* at acpi? # ACPI Power Meter (experimental) # XXX Do not enable this in a real kernel unless you also disable any # XXX native i2c controller. Otherwise you'll have two accessors to @@ -372,35 +372,35 @@ aibs* at acpi? # ASUSTeK AI Booster hardware monitor asus* at acpi? # ASUS hotkeys attimer* at acpi? # AT Timer -com* at acpi? # Serial communications interface -fdc* at acpi? # Floppy disk controller +com* at acpi? # Serial communications interface +fdc* at acpi? # Floppy disk controller fujbp* at acpi? # Fujitsu Brightness Pointer fujhk* at acpi? # Fujitsu Hotkeys hpqlb* at acpi? # HP Quick Launch Buttons -hpet* at acpi? # High Precision Event Timer +hpet* at acpi? # High Precision
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3
Module Name:xsrc
Committed By: christos
Date: Sat May 28 13:20:37 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h
amigaCVCursor.c
Log Message:
fix prototypes, KNF, and missing include
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.3 Fri May 27 17:32:49 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h Sat May 28 09:20:37 2011
@@ -504,7 +504,7 @@
Bool amigaCVCursorInit(ScreenPtr);
void amigaCVRestoreCursor(ScreenPtr);
void amigaCVRepositionCursor(ScreenPtr);
-void amigaCVSetPanning2(fbFd *, unsigned int, unsigned int);
+void amigaCVSetPanning2(fbFd *, unsigned short, unsigned short);
void amigaCVRenewCursorColor(ScreenPtr);
void s3WarpCursor(ScreenPtr, int, int );
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.2 Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c Sat May 28 09:20:37 2011
@@ -38,15 +38,16 @@
#define NEED_EVENTS
#include X.h
#include Xproto.h
-#include misc.h
-#include input.h
-#include cursorstr.h
-#include regionstr.h
-#include scrnintstr.h
-#include servermd.h
-#include windowstr.h
+#include misc.h
+#include input.h
+#include cursorstr.h
+#include regionstr.h
+#include scrnintstr.h
+#include servermd.h
+#include windowstr.h
#include inputstr.h
#include mfb.h
+#include migc.h
#include amiga.h
#include amigaCV.h
@@ -56,7 +57,7 @@
static void amigaCVSetCursor();
static void amigaCVMoveCursor();
static void amigaCVRecolorCursor();
-static void amigaQueryBestSize ();
+static void amigaQueryBestSize();
void amigaCVRestoreCursor();
extern miPointerScreenFuncRec amigaPointerScreenFuncs;
@@ -117,7 +118,7 @@
-__inline short swap16 (unsigned short x)
+__inline short swap16(unsigned short x)
{
unsigned short r;
@@ -129,10 +130,9 @@
Bool
-amigaCVCursorInit(pScr)
- ScreenPtr pScr;
+amigaCVCursorInit(ScreenPtr pScr)
{
- SetupCursor (pScr);
+ SetupCursor(pScr);
s3hotX = 0;
s3hotY = 0;
@@ -156,12 +156,10 @@
}
static void
-amigaQueryBestSize (class, pwidth, pheight, pScreen)
-int class;
-unsigned short *pwidth, *pheight;
-ScreenPtr pScreen;
+amigaQueryBestSize(int class, unsigned short *pwidth, unsigned short *pheight,
+ScreenPtr pScreen)
{
-SetupCursor (pScreen);
+SetupCursor(pScreen);
switch (class)
{
@@ -176,16 +174,13 @@
*pheight = pScreen-height;
break;
default:
-mfbQueryBestSize (class, pwidth, pheight, pScreen);
+mfbQueryBestSize(class, pwidth, pheight, pScreen);
break;
}
}
static Bool
-amigaCVRealizeCursor(pScr, pCurs)
- ScreenPtr pScr;
- CursorPtr pCurs;
-
+amigaCVRealizeCursor(ScreenPtr pScr, CursorPtr pCurs)
{
register int i, j;
unsigned short *pServMsk;
@@ -251,9 +246,7 @@
}
static Bool
-amigaCVUnrealizeCursor(pScr, pCurs)
- ScreenPtr pScr;
- CursorPtr pCurs;
+amigaCVUnrealizeCursor(ScreenPtr pScr, CursorPtr pCurs)
{
pointer priv;
@@ -264,10 +257,7 @@
}
static void
-amigaCVLoadCursor(pScr, pCurs, x, y)
- ScreenPtr pScr;
- CursorPtr pCurs;
- int x, y;
+amigaCVLoadCursor(ScreenPtr pScr, CursorPtr pCurs, int x, int y)
{
int index = pScr-myNum;
int i, j;
@@ -290,24 +280,24 @@
/* turn cursor off */
- WCrt (vgaBase, CRT_ID_HWGC_MODE, 0x00);
+ WCrt(vgaBase, CRT_ID_HWGC_MODE, 0x00);
/* move cursor off-screen */
- WCrt (vgaBase, CRT_ID_HWGC_ORIGIN_X_HI, 0x7);
- WCrt (vgaBase, CRT_ID_HWGC_ORIGIN_X_LO, 0xff);
- WCrt (vgaBase, CRT_ID_HWGC_ORIGIN_Y_LO, 0xff);
- WCrt (vgaBase, CRT_ID_HWGC_DSTART_X, 0x3f);
- WCrt (vgaBase, CRT_ID_HWGC_DSTART_Y, 0x3f);
- WCrt (vgaBase, CRT_ID_HWGC_ORIGIN_Y_HI, 0x7);
+ WCrt(vgaBase, CRT_ID_HWGC_ORIGIN_X_HI, 0x7);
+ WCrt(vgaBase, CRT_ID_HWGC_ORIGIN_X_LO, 0xff);
+ WCrt(vgaBase, CRT_ID_HWGC_ORIGIN_Y_LO, 0xff);
+ WCrt(vgaBase, CRT_ID_HWGC_DSTART_X, 0x3f);
+ WCrt(vgaBase, CRT_ID_HWGC_DSTART_Y, 0x3f);
+ WCrt(vgaBase, CRT_ID_HWGC_ORIGIN_Y_HI, 0x7);
/* Load storage location. */
cpos = (inf-info.gd_fbsize - 2*1024)/1024;
- WCrt (vgaBase,
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc
Module Name:xsrc Committed By: christos Date: Sat May 28 13:24:04 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: vidc.c Log Message: maybe include Xos.h will help. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.9 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.10 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.9 Wed May 25 12:55:44 2011 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c Sat May 28 09:24:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vidc.c,v 1.9 2011/05/25 16:55:44 christos Exp $ */ +/* $NetBSD: vidc.c,v 1.10 2011/05/28 13:24:04 christos Exp $ */ /* * Copyright (c) 1999 Neil A. Carson Mark Brinicombe @@ -52,6 +52,7 @@ /* X11 headers */ +#include Xos.h #include X.h #include Xproto.h #include mi.h
CVS commit: xsrc/external/mit/xf86-video-igs/dist/src
Module Name:xsrc Committed By: christos Date: Sat May 28 13:26:54 UTC 2011 Modified Files: xsrc/external/mit/xf86-video-igs/dist/src: igs_accel.c igs_cursor.c Log Message: include compiler.h for inb/outb To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.6 xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.7 --- xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c:1.6 Tue May 24 15:33:55 2011 +++ xsrc/external/mit/xf86-video-igs/dist/src/igs_accel.c Sat May 28 09:26:54 2011 @@ -21,13 +21,14 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $NetBSD: igs_accel.c,v 1.6 2011/05/24 19:33:55 christos Exp $ */ +/* $NetBSD: igs_accel.c,v 1.7 2011/05/28 13:26:54 christos Exp $ */ #include sys/types.h /* all driver need this */ #include xf86.h #include xf86_OSproc.h +#include compiler.h #include igs.h Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c:1.2 xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c:1.3 --- xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c:1.2 Sun May 22 22:50:05 2011 +++ xsrc/external/mit/xf86-video-igs/dist/src/igs_cursor.c Sat May 28 09:26:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: igs_cursor.c,v 1.2 2011/05/23 02:50:05 christos Exp $ */ +/* $NetBSD: igs_cursor.c,v 1.3 2011/05/28 13:26:54 christos Exp $ */ /* * Copyright (c) 2005 Michael Lorenz * All rights reserved. @@ -40,6 +40,7 @@ /* all driver need this */ #include xf86.h #include xf86_OSproc.h +#include compiler.h #include igs.h
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: phx
Date: Sat May 28 13:59:31 UTC 2011
Modified Files:
src/sys/dev/i2c: ds1307.c m41st84.c rs5c372.c s390.c
Log Message:
Add direct config support for all devices used by sandpoint.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/i2c/ds1307.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/i2c/m41st84.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/i2c/rs5c372.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/s390.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/ds1307.c
diff -u src/sys/dev/i2c/ds1307.c:1.12 src/sys/dev/i2c/ds1307.c:1.13
--- src/sys/dev/i2c/ds1307.c:1.12 Sun Jun 8 03:49:26 2008
+++ src/sys/dev/i2c/ds1307.c Sat May 28 13:59:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1307.c,v 1.12 2008/06/08 03:49:26 tsutsui Exp $ */
+/* $NetBSD: ds1307.c,v 1.13 2011/05/28 13:59:31 phx Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ds1307.c,v 1.12 2008/06/08 03:49:26 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: ds1307.c,v 1.13 2011/05/28 13:59:31 phx Exp $);
#include sys/param.h
#include sys/systm.h
@@ -87,10 +87,16 @@
{
struct i2c_attach_args *ia = arg;
- if (ia-ia_addr == DS1307_ADDR)
- return (1);
-
- return (0);
+ if (ia-ia_name) {
+ /* direct config - check name */
+ if (strcmp(ia-ia_name, dsrtc) == 0)
+ return 1;
+ } else {
+ /* indirect config - check typical address */
+ if (ia-ia_addr == DS1307_ADDR)
+ return 1;
+ }
+ return 0;
}
static void
Index: src/sys/dev/i2c/m41st84.c
diff -u src/sys/dev/i2c/m41st84.c:1.17 src/sys/dev/i2c/m41st84.c:1.18
--- src/sys/dev/i2c/m41st84.c:1.17 Sun Apr 17 14:58:26 2011
+++ src/sys/dev/i2c/m41st84.c Sat May 28 13:59:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: m41st84.c,v 1.17 2011/04/17 14:58:26 phx Exp $ */
+/* $NetBSD: m41st84.c,v 1.18 2011/05/28 13:59:31 phx Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: m41st84.c,v 1.17 2011/04/17 14:58:26 phx Exp $);
+__KERNEL_RCSID(0, $NetBSD: m41st84.c,v 1.18 2011/05/28 13:59:31 phx Exp $);
#include opt_strtc.h
@@ -93,10 +93,16 @@
{
struct i2c_attach_args *ia = arg;
- if (ia-ia_addr == M41ST84_ADDR)
- return (1);
-
- return (0);
+ if (ia-ia_name) {
+ /* direct config - check name */
+ if (strcmp(ia-ia_name, strtc) == 0)
+ return 1;
+ } else {
+ /* indirect config - check typical address */
+ if (ia-ia_addr == M41ST84_ADDR)
+ return 1;
+ }
+ return 0;
}
static void
Index: src/sys/dev/i2c/rs5c372.c
diff -u src/sys/dev/i2c/rs5c372.c:1.10 src/sys/dev/i2c/rs5c372.c:1.11
--- src/sys/dev/i2c/rs5c372.c:1.10 Sat Dec 12 14:44:10 2009
+++ src/sys/dev/i2c/rs5c372.c Sat May 28 13:59:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rs5c372.c,v 1.10 2009/12/12 14:44:10 tsutsui Exp $ */
+/* $NetBSD: rs5c372.c,v 1.11 2011/05/28 13:59:31 phx Exp $ */
/*
* Copyright (c) 2005 Kimihiro Nonaka
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rs5c372.c,v 1.10 2009/12/12 14:44:10 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: rs5c372.c,v 1.11 2011/05/28 13:59:31 phx Exp $);
#include sys/param.h
#include sys/systm.h
@@ -67,9 +67,16 @@
{
struct i2c_attach_args *ia = arg;
- if (ia-ia_addr == RS5C372_ADDR)
- return (1);
- return (0);
+ if (ia-ia_name) {
+ /* direct config - check name */
+ if (strcmp(ia-ia_name, rs5c372rtc) == 0)
+ return 1;
+ } else {
+ /* indirect config - check typical address */
+ if (ia-ia_addr == RS5C372_ADDR)
+ return 1;
+ }
+ return 0;
}
static void
Index: src/sys/dev/i2c/s390.c
diff -u src/sys/dev/i2c/s390.c:1.1 src/sys/dev/i2c/s390.c:1.2
--- src/sys/dev/i2c/s390.c:1.1 Mon Apr 4 17:58:40 2011
+++ src/sys/dev/i2c/s390.c Sat May 28 13:59:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: s390.c,v 1.1 2011/04/04 17:58:40 phx Exp $ */
+/* $NetBSD: s390.c,v 1.2 2011/05/28 13:59:31 phx Exp $ */
/*-
* Copyright (c) 2011 Frank Wille.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: s390.c,v 1.1 2011/04/04 17:58:40 phx Exp $);
+__KERNEL_RCSID(0, $NetBSD: s390.c,v 1.2 2011/05/28 13:59:31 phx Exp $);
#include sys/param.h
#include sys/systm.h
@@ -67,8 +67,15 @@
{
struct i2c_attach_args *ia = arg;
- if (ia-ia_addr == S390_ADDR)
- return 1;
+ if (ia-ia_name) {
+ /* direct config - check name */
+ if (strcmp(ia-ia_name, s390rtc) == 0)
+ return 1;
+ } else {
+ /* indirect config - check typical address */
+ if (ia-ia_addr == S390_ADDR)
+ return 1;
+ }
return 0;
}
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Sat May 28 14:40:13 UTC 2011 Modified Files: src/sys/arch/mips/mips: mipsX_subr.S Log Message: Since we mostly use RAS (even if we have LL/SC), need to check for lock ras addresses even on ll/sc capable CPUs. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/mips/mips/mipsX_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/mipsX_subr.S diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.48 src/sys/arch/mips/mips/mipsX_subr.S:1.49 --- src/sys/arch/mips/mips/mipsX_subr.S:1.48 Sat May 7 18:16:54 2011 +++ src/sys/arch/mips/mips/mipsX_subr.S Sat May 28 14:40:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mipsX_subr.S,v 1.48 2011/05/07 18:16:54 tsutsui Exp $ */ +/* $NetBSD: mipsX_subr.S,v 1.49 2011/05/28 14:40:13 matt Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -708,7 +708,6 @@ nop #endif /* PARANOIA */ -#ifdef notyet /* * Check for kernel restartable atomic sequences. */ @@ -720,7 +719,6 @@ jal _C_LABEL(_restart_lock_ras) # fix the pc (k1) nop 1: -#endif _MTC0 k1, MIPS_COP_0_EXC_PC # set return address COP0_SYNC
CVS commit: src/external/historical/nawk/dist
Module Name:src
Committed By: christos
Date: Sat May 28 15:13:04 UTC 2011
Modified Files:
src/external/historical/nawk/dist: awkgram.y proto.h tran.c
Log Message:
Handle string concatenation in terms:
'{ print foo file .txt; }',
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/historical/nawk/dist/awkgram.y
cvs rdiff -u -r1.3 -r1.4 src/external/historical/nawk/dist/proto.h
cvs rdiff -u -r1.4 -r1.5 src/external/historical/nawk/dist/tran.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/historical/nawk/dist/awkgram.y
diff -u src/external/historical/nawk/dist/awkgram.y:1.2 src/external/historical/nawk/dist/awkgram.y:1.3
--- src/external/historical/nawk/dist/awkgram.y:1.2 Thu Aug 26 10:55:19 2010
+++ src/external/historical/nawk/dist/awkgram.y Sat May 28 11:13:04 2011
@@ -75,6 +75,7 @@
%type i do st
%type i pst opt_pst lbrace rbrace rparen comma nl opt_nl and bor
%type i subop print
+%type cp string
%right ASGNOP
%right '?'
@@ -352,6 +353,11 @@
SUB | GSUB
;
+string:
+ STRING
+ | string STRING { $$ = catstr($1, $2); }
+ ;
+
term:
term '/' ASGNOP term { $$ = op2(DIVEQ, $1, $4); }
| term '+' term { $$ = op2(ADD, $1, $3); }
@@ -414,7 +420,7 @@
| SPLIT '(' pattern comma varname ')'
{ $$ = op4(SPLIT, $3, makearr($5), NIL, (Node*)STRING); } /* default */
| SPRINTF '(' patlist ')' { $$ = op1($1, $3); }
- | STRING { $$ = celltonode($1, CCON); }
+ | string { $$ = celltonode($1, CCON); }
| subop '(' reg_expr comma pattern ')'
{ $$ = op4($1, NIL, (Node*)makedfa($3, 1), $5, rectonode()); }
| subop '(' pattern comma pattern ')'
Index: src/external/historical/nawk/dist/proto.h
diff -u src/external/historical/nawk/dist/proto.h:1.3 src/external/historical/nawk/dist/proto.h:1.4
--- src/external/historical/nawk/dist/proto.h:1.3 Sun Nov 7 17:55:26 2010
+++ src/external/historical/nawk/dist/proto.h Sat May 28 11:13:04 2011
@@ -114,6 +114,7 @@
extern char *tostring(const char *);
extern char *tostringN(const char *, size_t n);
extern char *qstring(const char *, int);
+extern Cell *catstr(Cell *, Cell *);
extern void recinit(unsigned int);
extern void initgetrec(void);
Index: src/external/historical/nawk/dist/tran.c
diff -u src/external/historical/nawk/dist/tran.c:1.4 src/external/historical/nawk/dist/tran.c:1.5
--- src/external/historical/nawk/dist/tran.c:1.4 Thu Jan 20 16:26:20 2011
+++ src/external/historical/nawk/dist/tran.c Sat May 28 11:13:04 2011
@@ -428,6 +428,22 @@
return(p);
}
+Cell *catstr(Cell *a, Cell *b) /* concatenate a and b */
+{
+ Cell *c;
+ char *p;
+ char *sa = getsval(a);
+ char *sb = getsval(b);
+ size_t l = strlen(sa) + strlen(sb) + 1;
+ p = malloc(l);
+ if (p == NULL)
+ FATAL(out of space concatenating %s and %s, sa, sb);
+ snprintf(p, l, %s%s, sa, sb);
+ c = setsymtab(p, p, 0.0, CON|STR|DONTFREE, symtab);
+ free(p);
+ return c;
+}
+
char *tostringN(const char *s, size_t n) /* make a copy of string s */
{
char *p;
CVS commit: src
Module Name:src
Committed By: tron
Date: Sat May 28 15:24:49 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/kernel: Makefile
Added Files:
src/tests/kernel: t_pollts.c
Log Message:
Add two test cases for pollts(2):
- The first tests basic functionality e.g. timeouts and correct events.
- The second tests whether pollts(2) correctly restores the signal mask.
This test currently fails because of PR kern/44986.
To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.10 -r1.11 src/tests/kernel/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/kernel/t_pollts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.338 src/distrib/sets/lists/tests/mi:1.339
--- src/distrib/sets/lists/tests/mi:1.338 Fri May 20 21:43:39 2011
+++ src/distrib/sets/lists/tests/mi Sat May 28 15:24:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.338 2011/05/20 21:43:39 joerg Exp $
+# $NetBSD: mi,v 1.339 2011/05/28 15:24:49 tron Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -324,6 +324,7 @@
./usr/libdata/debug/usr/tests/kernel/t_mkdir.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_pipe.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_poll3w.debug tests-kernel-tests debug,atf
+./usr/libdata/debug/usr/tests/kernel/t_pollts.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_posix_fadvise.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_rnd.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/t_sigaction.debug tests-kernel-tests debug,atf
@@ -1743,6 +1744,7 @@
./usr/tests/kernel/t_mkdir tests-kernel-tests atf
./usr/tests/kernel/t_pipe tests-kernel-tests atf
./usr/tests/kernel/t_poll3w tests-kernel-tests atf
+./usr/tests/kernel/t_pollts tests-kernel-tests atf
./usr/tests/kernel/t_posix_fadvise tests-kernel-tests atf
./usr/tests/kernel/t_ps_strings tests-kernel-tests atf
./usr/tests/kernel/t_rnd tests-kernel-tests atf
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.10 src/tests/kernel/Makefile:1.11
--- src/tests/kernel/Makefile:1.10 Sat Mar 5 18:14:33 2011
+++ src/tests/kernel/Makefile Sat May 28 15:24:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/03/05 18:14:33 pgoyette Exp $
+# $NetBSD: Makefile,v 1.11 2011/05/28 15:24:49 tron Exp $
NOMAN= # defined
@@ -21,6 +21,7 @@
TESTS_C+= t_extattrctl
TESTS_C+= t_sigaction
TESTS_C+= t_filedesc
+TESTS_C+= t_pollts
TESTS_SH= t_umount
TESTS_SH+= t_ps_strings
Added files:
Index: src/tests/kernel/t_pollts.c
diff -u /dev/null src/tests/kernel/t_pollts.c:1.1
--- /dev/null Sat May 28 15:24:50 2011
+++ src/tests/kernel/t_pollts.c Sat May 28 15:24:49 2011
@@ -0,0 +1,166 @@
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matthias Scheler.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/time.h
+
+#include assert.h
+#include fcntl.h
+#include paths.h
+#include poll.h
+#include signal.h
+#include unistd.h
+
+#include atf-c.h
+
+ATF_TC(pollts);
+ATF_TC_HEAD(pollts, tc)
+{
+ atf_tc_set_md_var(tc, timeout, 10);
+ atf_tc_set_md_var(tc, descr,
+ Basis functionality test for pollts(2));
+}
+
+ATF_TC(pollts_sigmask);
+ATF_TC_HEAD(pollts_sigmask, tc)
+{
+ atf_tc_set_md_var(tc, timeout, 10);
+ atf_tc_set_md_var(tc,
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sat May 28 15:33:41 UTC 2011
Modified Files:
src/sys/kern: sys_select.c sys_sig.c
src/sys/sys: signalvar.h
Log Message:
If a signal did not fire, restore the original signal mask for pselect/pollts
using a signal mask. Tested by tron.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/kern/sys_select.c
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/sys_sig.c
cvs rdiff -u -r1.80 -r1.81 src/sys/sys/signalvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_select.c
diff -u src/sys/kern/sys_select.c:1.32 src/sys/kern/sys_select.c:1.33
--- src/sys/kern/sys_select.c:1.32 Wed May 18 10:48:04 2011
+++ src/sys/kern/sys_select.c Sat May 28 11:33:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_select.c,v 1.32 2011/05/18 14:48:04 christos Exp $ */
+/* $NetBSD: sys_select.c,v 1.33 2011/05/28 15:33:41 christos Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_select.c,v 1.32 2011/05/18 14:48:04 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_select.c,v 1.33 2011/05/28 15:33:41 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -304,6 +304,9 @@
}
selclear();
+ if (__predict_false(mask))
+ sigsuspendteardown(l);
+
/* select and poll are not restarted after signals... */
if (error == ERESTART)
return EINTR;
Index: src/sys/kern/sys_sig.c
diff -u src/sys/kern/sys_sig.c:1.33 src/sys/kern/sys_sig.c:1.34
--- src/sys/kern/sys_sig.c:1.33 Tue May 17 23:51:41 2011
+++ src/sys/kern/sys_sig.c Sat May 28 11:33:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_sig.c,v 1.33 2011/05/18 03:51:41 christos Exp $ */
+/* $NetBSD: sys_sig.c,v 1.34 2011/05/28 15:33:40 christos Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.33 2011/05/18 03:51:41 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.34 2011/05/28 15:33:40 christos Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -631,6 +631,19 @@
mutex_exit(p-p_lock);
}
+void
+sigsuspendteardown(struct lwp *l)
+{
+ struct proc *p = l-l_proc;
+
+ mutex_enter(p-p_lock);
+ if (l-l_sigrestore) {
+ l-l_sigrestore = 0;
+ l-l_sigmask = l-l_sigoldmask;
+ }
+ mutex_exit(p-p_lock);
+}
+
int
sigsuspend1(struct lwp *l, const sigset_t *ss)
{
Index: src/sys/sys/signalvar.h
diff -u src/sys/sys/signalvar.h:1.80 src/sys/sys/signalvar.h:1.81
--- src/sys/sys/signalvar.h:1.80 Tue May 17 23:51:41 2011
+++ src/sys/sys/signalvar.h Sat May 28 11:33:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: signalvar.h,v 1.80 2011/05/18 03:51:41 christos Exp $ */
+/* $NetBSD: signalvar.h,v 1.81 2011/05/28 15:33:41 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -149,6 +149,7 @@
int sigprocmask1(struct lwp *, int, const sigset_t *, sigset_t *);
void sigpending1(struct lwp *, sigset_t *);
void sigsuspendsetup(struct lwp *, const sigset_t *);
+void sigsuspendteardown(struct lwp *);
int sigsuspend1(struct lwp *, const sigset_t *);
int sigaltstack1(struct lwp *, const struct sigaltstack *,
struct sigaltstack *);
CVS commit: src/tests/syscall
Module Name:src
Committed By: christos
Date: Sat May 28 15:34:49 UTC 2011
Modified Files:
src/tests/syscall: t_pselect.c
Log Message:
add a timeout test
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/syscall/t_pselect.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/syscall/t_pselect.c
diff -u src/tests/syscall/t_pselect.c:1.2 src/tests/syscall/t_pselect.c:1.3
--- src/tests/syscall/t_pselect.c:1.2 Tue May 17 23:15:12 2011
+++ src/tests/syscall/t_pselect.c Sat May 28 11:34:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pselect.c,v 1.2 2011/05/18 03:15:12 christos Exp $ */
+/* $NetBSD: t_pselect.c,v 1.3 2011/05/28 15:34:49 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
}
static void __attribute__((__noreturn__))
-child(void)
+child(const struct timespec *ts)
{
struct sigaction sa;
sigset_t set;
@@ -76,7 +76,7 @@
fd_set rset;
FD_ZERO(rset);
FD_SET(fd, rset);
- if (pselect(1, rset, NULL, NULL, NULL, set) == -1) {
+ if (pselect(1, rset, NULL, NULL, ts, set) == -1) {
if(errno == EINTR) {
if (!keep_going)
exit(0);
@@ -85,23 +85,23 @@
}
}
-ATF_TC(pselect_signal_mask);
-ATF_TC_HEAD(pselect_signal_mask, tc)
+ATF_TC(pselect_signal_mask_with_signal);
+ATF_TC_HEAD(pselect_signal_mask_with_signal, tc)
{
/* Cf. PR lib/43625. */
- atf_tc_set_md_var(tc, descr,
- Checks pselect's temporary mask setting);
+ atf_tc_set_md_var(tc, descr, Checks pselect's temporary mask
+ setting when a signal is received);
}
-ATF_TC_BODY(pselect_signal_mask, tc)
+ATF_TC_BODY(pselect_signal_mask_with_signal, tc)
{
pid_t pid;
int status;
switch (pid = fork()) {
case 0:
- child();
+ child(NULL);
case -1:
err(1, fork);
default:
@@ -123,11 +123,54 @@
}
}
+ATF_TC(pselect_signal_mask_with_timeout);
+ATF_TC_HEAD(pselect_signal_mask_with_timeout, tc)
+{
+
+ atf_tc_set_md_var(tc, descr, Checks pselect's temporary mask
+ setting when a timeout occurs);
+}
+ATF_TC_BODY(pselect_signal_mask_with_timeout, tc)
+{
+ pid_t pid;
+ int status;
+ sigset_t oset, nset;
+ static const struct timespec zero = { 0, 0 };
+
+ switch (pid = fork()) {
+ case 0:
+ if (sigprocmask(SIG_BLOCK, NULL, oset) == -1)
+ err(1, sigprocmask);
+ child(zero);
+ if (sigprocmask(SIG_BLOCK, NULL, nset) == -1)
+ err(1, sigprocmask);
+ if (memcmp(oset, nset, sizeof(oset)) != 0)
+ atf_tc_fail(pselect() masks don't match
+ after timeout);
+ break;
+ case -1:
+ err(1, fork);
+ default:
+ usleep(500);
+ switch (waitpid(pid, status, WNOHANG)) {
+ case -1:
+ err(1, wait);
+ case 0:
+ if (kill(pid, SIGKILL) == -1)
+err(1, kill);
+ atf_tc_fail(pselect() did not receive signal);
+ break;
+ default:
+ break;
+ }
+ }
+}
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, pselect_signal_mask);
+ ATF_TP_ADD_TC(tp, pselect_signal_mask_with_signal);
+ ATF_TP_ADD_TC(tp, pselect_signal_mask_with_timeout);
return atf_no_error();
}
CVS commit: src/tests/kernel
Module Name:src Committed By: christos Date: Sat May 28 15:37:11 UTC 2011 Modified Files: src/tests/kernel: t_pollts.c Log Message: PR/44896 has been fixed. BTW: We've created a mess here again with the directory structure of the tests. What goes in syscalls, what goes in sys, and what goes in kernel? I think we should follow the userland location for paths where those should be defined, so everything should go into libc/sys. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_pollts.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/kernel/t_pollts.c diff -u src/tests/kernel/t_pollts.c:1.1 src/tests/kernel/t_pollts.c:1.2 --- src/tests/kernel/t_pollts.c:1.1 Sat May 28 11:24:49 2011 +++ src/tests/kernel/t_pollts.c Sat May 28 11:37:11 2011 @@ -126,7 +126,7 @@ sigset_t mask; int ret; - atf_tc_expect_fail(PR kern/44986); + /* Cf kern/44986 */ fd = open(_PATH_DEVNULL, O_RDONLY); assert(fd = 0);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: tsutsui
Date: Sat May 28 15:47:17 UTC 2011
Modified Files:
src/sys/dev/usb: ehci.c ohci.c ohcivar.h uhci.c
Log Message:
Revert changes for PR kern/44907
http://mail-index.NetBSD.org/source-changes/2011/05/27/msg022584.html
for now. It might cause a panic in ehci_freex() on device detach
as reported by Paul Goyette on current-users@.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.214 -r1.215 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/usb/ohcivar.h
cvs rdiff -u -r1.237 -r1.238 src/sys/dev/usb/uhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.176 src/sys/dev/usb/ehci.c:1.177
--- src/sys/dev/usb/ehci.c:1.176 Fri May 27 19:04:24 2011
+++ src/sys/dev/usb/ehci.c Sat May 28 15:47:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.176 2011/05/27 19:04:24 tsutsui Exp $ */
+/* $NetBSD: ehci.c,v 1.177 2011/05/28 15:47:17 tsutsui Exp $ */
/*
* Copyright (c) 2004-2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.176 2011/05/27 19:04:24 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.177 2011/05/28 15:47:17 tsutsui Exp $);
#include ohci.h
#include uhci.h
@@ -1284,7 +1284,6 @@
{
struct ehci_softc *sc = bus-hci_private;
usbd_xfer_handle xfer;
- struct ehci_xfer *exfer;
xfer = SIMPLEQ_FIRST(sc-sc_free_xfers);
if (xfer != NULL) {
@@ -1296,14 +1295,12 @@
}
#endif
} else {
- xfer = malloc(sizeof(*exfer), M_USB, M_NOWAIT);
+ xfer = malloc(sizeof(struct ehci_xfer), M_USB, M_NOWAIT);
}
if (xfer != NULL) {
- exfer = EXFER(xfer);
- memset(exfer, 0, sizeof(*exfer));
- usb_init_task(exfer-abort_task, ehci_timeout_task, exfer);
+ memset(xfer, 0, sizeof(struct ehci_xfer));
#ifdef DIAGNOSTIC
- exfer-isdone = 1;
+ EXFER(xfer)-isdone = 1;
xfer-busy_free = XFER_BUSY;
#endif
}
@@ -1314,7 +1311,6 @@
ehci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
{
struct ehci_softc *sc = bus-hci_private;
- struct ehci_xfer *exfer = EXFER(xfer);
#ifdef DIAGNOSTIC
if (xfer-busy_free != XFER_BUSY) {
@@ -1322,11 +1318,10 @@
xfer-busy_free);
}
xfer-busy_free = XFER_FREE;
- if (!exfer-isdone) {
+ if (!EXFER(xfer)-isdone) {
printf(ehci_freex: !isdone\n);
}
#endif
- usb_rem_task(xfer-pipe-device, exfer-abort_task);
SIMPLEQ_INSERT_HEAD(sc-sc_free_xfers, xfer, next);
}
@@ -3155,6 +3150,7 @@
}
/* Execute the abort in a process context. */
+ usb_init_task(exfer-abort_task, ehci_timeout_task, addr);
usb_add_task(exfer-xfer.pipe-device, exfer-abort_task,
USB_TASKQ_HC);
}
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.214 src/sys/dev/usb/ohci.c:1.215
--- src/sys/dev/usb/ohci.c:1.214 Fri May 27 20:37:13 2011
+++ src/sys/dev/usb/ohci.c Sat May 28 15:47:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.214 2011/05/27 20:37:13 jakllsch Exp $ */
+/* $NetBSD: ohci.c,v 1.215 2011/05/28 15:47:17 tsutsui Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.214 2011/05/27 20:37:13 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.215 2011/05/28 15:47:17 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -945,7 +945,6 @@
{
struct ohci_softc *sc = bus-hci_private;
usbd_xfer_handle xfer;
- struct ohci_xfer *oxfer;
xfer = SIMPLEQ_FIRST(sc-sc_free_xfers);
if (xfer != NULL) {
@@ -957,12 +956,10 @@
}
#endif
} else {
- xfer = malloc(sizeof(*oxfer), M_USB, M_NOWAIT);
+ xfer = malloc(sizeof(struct ohci_xfer), M_USB, M_NOWAIT);
}
if (xfer != NULL) {
- oxfer = OXFER(xfer);
- memset(oxfer, 0, sizeof(*oxfer));
- usb_init_task(oxfer-abort_task, ohci_timeout_task, oxfer);
+ memset(xfer, 0, sizeof (struct ohci_xfer));
#ifdef DIAGNOSTIC
xfer-busy_free = XFER_BUSY;
#endif
@@ -974,7 +971,6 @@
ohci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
{
struct ohci_softc *sc = bus-hci_private;
- struct ohci_xfer *oxfer = OXFER(xfer);
#ifdef DIAGNOSTIC
if (xfer-busy_free != XFER_BUSY) {
@@ -983,7 +979,6 @@
}
xfer-busy_free = XFER_FREE;
#endif
- usb_rem_task(xfer-pipe-device, oxfer-abort_task);
SIMPLEQ_INSERT_HEAD(sc-sc_free_xfers, xfer, next);
}
@@ -1953,6 +1948,7 @@
}
/* Execute the abort in a process context. */
+ usb_init_task(oxfer-abort_task, ohci_timeout_task, addr);
usb_add_task(oxfer-xfer.pipe-device, oxfer-abort_task,
USB_TASKQ_HC);
}
Index: src/sys/dev/usb/ohcivar.h
diff -u src/sys/dev/usb/ohcivar.h:1.50 src/sys/dev/usb/ohcivar.h:1.51
--- src/sys/dev/usb/ohcivar.h:1.50 Fri May 27 19:04:24 2011
+++ src/sys/dev/usb/ohcivar.h Sat May 28 15:47:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcivar.h,v 1.50 2011/05/27 19:04:24
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: tron
Date: Sat May 28 16:07:44 UTC 2011
Modified Files:
src/sys/rump/librump/rumpkern: signals.c
Log Message:
Fix rump build which got broken by the fix for PR kern/44986.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpkern/signals.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/signals.c
diff -u src/sys/rump/librump/rumpkern/signals.c:1.9 src/sys/rump/librump/rumpkern/signals.c:1.10
--- src/sys/rump/librump/rumpkern/signals.c:1.9 Wed May 18 15:57:14 2011
+++ src/sys/rump/librump/rumpkern/signals.c Sat May 28 16:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: signals.c,v 1.9 2011/05/18 15:57:14 christos Exp $ */
+/* $NetBSD: signals.c,v 1.10 2011/05/28 16:07:43 tron Exp $ */
/*-
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: signals.c,v 1.9 2011/05/18 15:57:14 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: signals.c,v 1.10 2011/05/28 16:07:43 tron Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -280,7 +280,7 @@
void
sigsuspendsetup(struct lwp *l, const sigset_t *ss)
{
- /* XXX: Partial copy of kernel code, remove and use the kernel code */
+ /* XXX: Partial copy of kernel code, remove and use the kernel code. */
struct proc *p = l-l_proc;
mutex_enter(p-p_lock);
@@ -290,3 +290,17 @@
sigminusset(sigcantmask, l-l_sigmask);
mutex_exit(p-p_lock);
}
+
+void
+sigsuspendteardown(struct lwp *l)
+{
+ /* XXX: Copy of kernel code, remove and use the kernel code. */
+ struct proc *p = l-l_proc;
+
+ mutex_enter(p-p_lock);
+ if (l-l_sigrestore) {
+ l-l_sigrestore = 0;
+ l-l_sigmask = l-l_sigoldmask;
+ }
+ mutex_exit(p-p_lock);
+}
CVS commit: src
Module Name:src Committed By: tron Date: Sat May 28 16:12:56 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi src/tests/kernel: Makefile src/tests/syscall: Makefile Added Files: src/tests/syscall: t_pollts.c Removed Files: src/tests/kernel: t_pollts.c Log Message: Move regression test for PR kern/44986 from kernel to syscalls as the later directory seems to be a better fit. To generate a diff of this commit: cvs rdiff -u -r1.339 -r1.340 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.11 -r1.12 src/tests/kernel/Makefile cvs rdiff -u -r1.2 -r0 src/tests/kernel/t_pollts.c cvs rdiff -u -r1.27 -r1.28 src/tests/syscall/Makefile cvs rdiff -u -r0 -r1.1 src/tests/syscall/t_pollts.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.339 src/distrib/sets/lists/tests/mi:1.340 --- src/distrib/sets/lists/tests/mi:1.339 Sat May 28 15:24:49 2011 +++ src/distrib/sets/lists/tests/mi Sat May 28 16:12:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.339 2011/05/28 15:24:49 tron Exp $ +# $NetBSD: mi,v 1.340 2011/05/28 16:12:56 tron Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -324,7 +324,7 @@ ./usr/libdata/debug/usr/tests/kernel/t_mkdir.debug tests-kernel-tests debug,atf ./usr/libdata/debug/usr/tests/kernel/t_pipe.debug tests-kernel-tests debug,atf ./usr/libdata/debug/usr/tests/kernel/t_poll3w.debug tests-kernel-tests debug,atf -./usr/libdata/debug/usr/tests/kernel/t_pollts.debug tests-kernel-tests debug,atf +./usr/libdata/debug/usr/tests/kernel/t_pollts.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/t_posix_fadvise.debug tests-kernel-tests debug,atf ./usr/libdata/debug/usr/tests/kernel/t_rnd.debug tests-kernel-tests debug,atf ./usr/libdata/debug/usr/tests/kernel/t_sigaction.debug tests-kernel-tests debug,atf @@ -621,6 +621,7 @@ ./usr/libdata/debug/usr/tests/syscall/t_mprotect.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_msync.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_nanosleep.debug tests-syscall-debug debug,atf +./usr/libdata/debug/usr/tests/syscall/t_pollts.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_pselect.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_setrlimit.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_setuid.debug tests-syscall-debug debug,atf @@ -1744,7 +1745,7 @@ ./usr/tests/kernel/t_mkdir tests-kernel-tests atf ./usr/tests/kernel/t_pipe tests-kernel-tests atf ./usr/tests/kernel/t_poll3w tests-kernel-tests atf -./usr/tests/kernel/t_pollts tests-kernel-tests atf +./usr/tests/kernel/t_pollts tests-obsolete obsolete ./usr/tests/kernel/t_posix_fadvise tests-kernel-tests atf ./usr/tests/kernel/t_ps_strings tests-kernel-tests atf ./usr/tests/kernel/t_rnd tests-kernel-tests atf @@ -2325,6 +2326,7 @@ ./usr/tests/syscall/t_mprotect tests-syscall-tests atf ./usr/tests/syscall/t_msync tests-syscall-tests atf ./usr/tests/syscall/t_nanosleep tests-syscall-tests atf +./usr/tests/syscall/t_pollts tests-syscall-tests atf ./usr/tests/syscall/t_pselect tests-syscall-tests atf ./usr/tests/syscall/t_setrlimit tests-syscall-tests atf ./usr/tests/syscall/t_setuid tests-syscall-tests atf Index: src/tests/kernel/Makefile diff -u src/tests/kernel/Makefile:1.11 src/tests/kernel/Makefile:1.12 --- src/tests/kernel/Makefile:1.11 Sat May 28 15:24:49 2011 +++ src/tests/kernel/Makefile Sat May 28 16:12:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2011/05/28 15:24:49 tron Exp $ +# $NetBSD: Makefile,v 1.12 2011/05/28 16:12:56 tron Exp $ NOMAN= # defined @@ -21,7 +21,6 @@ TESTS_C+= t_extattrctl TESTS_C+= t_sigaction TESTS_C+= t_filedesc -TESTS_C+= t_pollts TESTS_SH= t_umount TESTS_SH+= t_ps_strings Index: src/tests/syscall/Makefile diff -u src/tests/syscall/Makefile:1.27 src/tests/syscall/Makefile:1.28 --- src/tests/syscall/Makefile:1.27 Wed May 18 02:57:48 2011 +++ src/tests/syscall/Makefile Sat May 28 16:12:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2011/05/18 02:57:48 christos Exp $ +# $NetBSD: Makefile,v 1.28 2011/05/28 16:12:56 tron Exp $ .include bsd.own.mk @@ -7,7 +7,7 @@ TESTS_C+= t_access t_cmsg t_dup t_fsync TESTS_C+= t_getgroups t_getpid t_getrusage t_getsid t_gettimeofday TESTS_C+= t_itimer t_kill t_mmap t_mprotect t_msync t_nanosleep -TESTS_C+= t_pselect t_setrlimit t_setuid t_timer t_umask +TESTS_C+= t_pollts t_pselect t_setrlimit t_setuid t_timer t_umask LDADD.t_getpid+= -lpthread LDADD.t_timer+= -lpthread Added files: Index: src/tests/syscall/t_pollts.c diff -u /dev/null src/tests/syscall/t_pollts.c:1.1 --- /dev/null Sat May 28 16:12:56 2011 +++
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: ryo Date: Sat May 28 16:58:52 UTC 2011 Modified Files: src/sys/arch/amd64/conf: GENERIC INSTALL INSTALL_XEN3_DOMU XEN3_DOM0 XEN3_DOMU Log Message: many whitespace cleanup. To generate a diff of this commit: cvs rdiff -u -r1.318 -r1.319 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.85 -r1.86 src/sys/arch/amd64/conf/INSTALL cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/INSTALL_XEN3_DOMU cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.318 src/sys/arch/amd64/conf/GENERIC:1.319 --- src/sys/arch/amd64/conf/GENERIC:1.318 Fri Apr 1 12:11:17 2011 +++ src/sys/arch/amd64/conf/GENERIC Sat May 28 16:58:51 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.318 2011/04/01 12:11:17 jruoho Exp $ +# $NetBSD: GENERIC,v 1.319 2011/05/28 16:58:51 ryo Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.318 $ +#ident GENERIC-$Revision: 1.319 $ maxusers 64 # estimated number of users @@ -100,13 +100,13 @@ # Because gcc omits the frame pointer for any -O level, the line below # is needed to make backtraces in DDB work. # -makeoptions COPTS=-O2 -fno-omit-frame-pointer +makeoptions COPTS=-O2 -fno-omit-frame-pointer options DDB # in-kernel debugger #options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic' options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME=\com\,KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -#makeoptions DEBUG=-g # compile full symbol table +#makeoptions DEBUG=-g # compile full symbol table #options SYSCALL_STATS # per syscall counts #options SYSCALL_TIMES # per syscall times #options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) @@ -180,7 +180,7 @@ #options IPSEC_ESP # IP security (encryption part; define w/IPSEC) #options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) #options IPSEC_DEBUG # debug for IP security -#options MPLS # MultiProtocol Label Switching (needs ifmpls) +#options MPLS # MultiProtocol Label Switching (needs ifmpls) #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast #options ISO,TPIP # OSI @@ -250,7 +250,7 @@ # enable VGA raster mode capable of displaying multilingual text on console #options VGA_RASTERCONSOLE # enable splash screen support; requires genfb or radeonfb -#optionsSPLASHSCREEN +#options SPLASHSCREEN # Kernel root file system and dump configuration. config netbsd root on ? type ? @@ -265,7 +265,7 @@ ipmi0 at mainbus? # ACPI will be used if present. If not it will fall back to MPBIOS -acpi0 at mainbus0 +acpi0 at mainbus0 options ACPI_SCANPCI # find PCI roots using ACPI options MPBIOS # configure CPUs and APICs using MPBIOS options MPBIOS_SCANPCI # MPBIOS configures PCI roots @@ -276,14 +276,14 @@ options VGA_POST # in-kernel support for VGA POST # ACPI devices -acpiacad* at acpi? # ACPI AC Adapter -acpibat* at acpi? # ACPI Battery -acpibut* at acpi? # ACPI Button +acpiacad* at acpi? # ACPI AC Adapter +acpibat* at acpi? # ACPI Battery +acpibut* at acpi? # ACPI Button acpidalb* at acpi? # Direct Application Launch Button acpiec* at acpi? # ACPI Embedded Controller (late) -acpiecdt* at acpi? # ACPI Embedded Controller (early) -acpifan* at acpi? # ACPI Fan -acpilid* at acpi? # ACPI Lid Switch +acpiecdt* at acpi? # ACPI Embedded Controller (early) +acpifan* at acpi? # ACPI Fan +acpilid* at acpi? # ACPI Lid Switch #acpipmtr* at acpi? # ACPI Power Meter (experimental) #acpismbus* at acpi? # ACPI SMBus CMI (experimental) acpitz* at acpi? # ACPI Thermal Zone @@ -296,27 +296,27 @@ aibs* at acpi? # ASUSTeK AI Booster hardware monitor asus* at acpi? # ASUS hotkeys attimer* at acpi? # AT Timer -#com* at acpi? # Serial communications interface -#fdc* at acpi? # Floppy disk controller +#com* at acpi? # Serial communications interface +#fdc* at acpi? # Floppy disk controller fujbp* at acpi? # Fujitsu Brightness Pointer fujhk* at acpi? # Fujitsu Hotkeys hpqlb* at acpi? # HP Quick Launch Buttons hpet* at acpi? # High Precision Event Timer joy* at acpi? # Joystick/Game port -#lpt* at acpi? # Parallel port +#lpt* at acpi? # Parallel port mpu* at acpi? # Roland MPU-401 MIDI UART -pckbc* at acpi? # PC keyboard controller -pcppi* at acpi?# AT-style speaker sound +pckbc* at acpi? # PC keyboard controller +pcppi* at acpi? # AT-style speaker sound sony* at acpi? # Sony Notebook Controller -spic* at acpi? # Sony Programmable I/O Controller -wsmouse* at spic? #
CVS commit: src/sys
Module Name:src
Committed By: matt
Date: Sat May 28 19:30:20 UTC 2011
Modified Files:
src/sys/conf: files
src/sys/dev/ic: com.c comreg.h
Log Message:
Allow COM_TOLERANCE to be tweakable. If comspeed returns an invalid
rate, don't use that error value to set the speed.
To generate a diff of this commit:
cvs rdiff -u -r1.1015 -r1.1016 src/sys/conf/files
cvs rdiff -u -r1.300 -r1.301 src/sys/dev/ic/com.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/comreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1015 src/sys/conf/files:1.1016
--- src/sys/conf/files:1.1015 Mon May 23 15:37:35 2011
+++ src/sys/conf/files Sat May 28 19:30:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1015 2011/05/23 15:37:35 drochner Exp $
+# $NetBSD: files,v 1.1016 2011/05/28 19:30:19 matt Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -838,6 +838,7 @@
# XXX In a perfect world, this would be done with attributes
defflag opt_com.h COM_16650 COM_HAYESP COM_PXA2X0 COM_AU1X00
COM_REGMAP
+defparam opt_com.h COM_TOLERANCE
device com { } : tty
file dev/ic/com.c com needs-flag
Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.300 src/sys/dev/ic/com.c:1.301
--- src/sys/dev/ic/com.c:1.300 Sun Apr 24 16:26:59 2011
+++ src/sys/dev/ic/com.c Sat May 28 19:30:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.300 2011/04/24 16:26:59 rmind Exp $ */
+/* $NetBSD: com.c,v 1.301 2011/05/28 19:30:19 matt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: com.c,v 1.300 2011/04/24 16:26:59 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: com.c,v 1.301 2011/05/28 19:30:19 matt Exp $);
#include opt_com.h
#include opt_ddb.h
@@ -803,7 +803,10 @@
}
/* Turn on interrupts. */
- sc-sc_ier = IER_ERXRDY | IER_ERLS | IER_EMSC;
+ sc-sc_ier = IER_ERXRDY | IER_ERLS;
+ if (!ISSET(tp-t_cflag, CLOCAL))
+ sc-sc_ier |= IER_EMSC;
+
if (sc-sc_type == COM_TYPE_PXA2x0)
sc-sc_ier |= IER_EUART | IER_ERXTOUT;
CSR_WRITE_1(sc-sc_regs, COM_REG_IER, sc-sc_ier);
@@ -2168,17 +2171,19 @@
}
rate = comspeed(rate, frequency, type);
- if (type != COM_TYPE_AU1x00) {
- /* no EFR on alchemy */
- if (type != COM_TYPE_16550_NOERS) {
- CSR_WRITE_1(regsp, COM_REG_LCR, LCR_EERS);
- CSR_WRITE_1(regsp, COM_REG_EFR, 0);
+ if (__predict_true(rate != -1)) {
+ if (type == COM_TYPE_AU1x00) {
+ CSR_WRITE_2(regsp, COM_REG_DLBL, rate);
+ } else {
+ /* no EFR on alchemy */
+ if (type != COM_TYPE_16550_NOERS) {
+CSR_WRITE_1(regsp, COM_REG_LCR, LCR_EERS);
+CSR_WRITE_1(regsp, COM_REG_EFR, 0);
+ }
+ CSR_WRITE_1(regsp, COM_REG_LCR, LCR_DLAB);
+ CSR_WRITE_1(regsp, COM_REG_DLBL, rate 0xff);
+ CSR_WRITE_1(regsp, COM_REG_DLBH, rate 8);
}
- CSR_WRITE_1(regsp, COM_REG_LCR, LCR_DLAB);
- CSR_WRITE_1(regsp, COM_REG_DLBL, rate 0xff);
- CSR_WRITE_1(regsp, COM_REG_DLBH, rate 8);
- } else {
- CSR_WRITE_1(regsp, COM_REG_DLBL, rate);
}
CSR_WRITE_1(regsp, COM_REG_LCR, cflag2lcr(cflag));
CSR_WRITE_1(regsp, COM_REG_MCR, MCR_DTR | MCR_RTS);
Index: src/sys/dev/ic/comreg.h
diff -u src/sys/dev/ic/comreg.h:1.16 src/sys/dev/ic/comreg.h:1.17
--- src/sys/dev/ic/comreg.h:1.16 Tue Jul 20 06:17:20 2010
+++ src/sys/dev/ic/comreg.h Sat May 28 19:30:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: comreg.h,v 1.16 2010/07/20 06:17:20 jklos Exp $ */
+/* $NetBSD: comreg.h,v 1.17 2011/05/28 19:30:19 matt Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -33,8 +33,14 @@
#include dev/ic/ns16550reg.h
+#ifdef _KERNEL_OPT
+#include opt_com.h
+#endif
+
#define COM_FREQ 1843200 /* 16-bit baud rate divisor */
+#ifndef COM_TOLERANCE
#define COM_TOLERANCE 30 /* baud rate tolerance, in 0.1% units */
+#endif
/* interrupt enable register */
#define IER_ERXRDY 0x1 /* Enable receiver interrupt */
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: jakllsch Date: Sat May 28 20:53:57 UTC 2011 Modified Files: src/sys/arch/arm/arm32: irq_dispatch.S Log Message: Remove unused local variable. Spelling fix in comment. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm32/irq_dispatch.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/irq_dispatch.S diff -u src/sys/arch/arm/arm32/irq_dispatch.S:1.10 src/sys/arch/arm/arm32/irq_dispatch.S:1.11 --- src/sys/arch/arm/arm32/irq_dispatch.S:1.10 Sun Apr 27 18:58:44 2008 +++ src/sys/arch/arm/arm32/irq_dispatch.S Sat May 28 20:53:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: irq_dispatch.S,v 1.10 2008/04/27 18:58:44 matt Exp $ */ +/* $NetBSD: irq_dispatch.S,v 1.11 2011/05/28 20:53:57 jakllsch Exp $ */ /* * Copyright (c) 2002 Fujitsu Component Limited @@ -91,8 +91,6 @@ */ .text .align 0 -.Lcurrent_intr_depth: - .word _C_LABEL(cpu_info_store) + CI_INTR_DEPTH LOCK_CAS_CHECK_LOCALS @@ -108,7 +106,7 @@ * Increment the interrupt nesting depth and call the interrupt * dispatch routine. We've pushed a frame, so we can safely use * callee-saved regs here. We use the following registers, which - * we expect to presist: + * we expect to persist: * * r4 address of current cpu_info * r6 old value of `ci_intr_depth'
CVS commit: src/sys/arch/arm/pic
Module Name:src
Committed By: jakllsch
Date: Sat May 28 20:56:37 UTC 2011
Modified Files:
src/sys/arch/arm/pic: pic_splfuncs.c
Log Message:
Restore ci_intr_depth increment for duration of pic_do_pending_ints() lost
when this code was moved.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/pic/pic_splfuncs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/pic/pic_splfuncs.c
diff -u src/sys/arch/arm/pic/pic_splfuncs.c:1.1 src/sys/arch/arm/pic/pic_splfuncs.c:1.2
--- src/sys/arch/arm/pic/pic_splfuncs.c:1.1 Fri Mar 11 03:16:14 2011
+++ src/sys/arch/arm/pic/pic_splfuncs.c Sat May 28 20:56:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_splfuncs.c,v 1.1 2011/03/11 03:16:14 bsh Exp $ */
+/* $NetBSD: pic_splfuncs.c,v 1.2 2011/05/28 20:56:37 jakllsch Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pic_splfuncs.c,v 1.1 2011/03/11 03:16:14 bsh Exp $);
+__KERNEL_RCSID(0, $NetBSD: pic_splfuncs.c,v 1.2 2011/05/28 20:56:37 jakllsch Exp $);
#define _INTR_PRIVATE
#include sys/param.h
@@ -63,7 +63,9 @@
KASSERT(panicstr || newipl = ci-ci_cpl);
if (newipl ci-ci_cpl) {
register_t psw = disable_interrupts(I32_bit);
+ ci-ci_intr_depth++;
pic_do_pending_ints(psw, newipl, NULL);
+ ci-ci_intr_depth--;
restore_interrupts(psw);
}
return oldipl;
@@ -76,7 +78,9 @@
KASSERT(savedipl NIPL);
if (savedipl ci-ci_cpl) {
register_t psw = disable_interrupts(I32_bit);
+ ci-ci_intr_depth++;
pic_do_pending_ints(psw, savedipl, NULL);
+ ci-ci_intr_depth--;
restore_interrupts(psw);
}
ci-ci_cpl = savedipl;
CVS commit: src/usr.bin/make
Module Name:src Committed By: cheusov Date: Sat May 28 21:53:54 UTC 2011 Modified Files: src/usr.bin/make: make.1 Log Message: fix bug in section .ORDER of make.1 To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.191 src/usr.bin/make/make.1:1.192 --- src/usr.bin/make/make.1:1.191 Wed May 4 21:24:59 2011 +++ src/usr.bin/make/make.1 Sat May 28 21:53:54 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: make.1,v 1.191 2011/05/04 21:24:59 wiz Exp $ +.\ $NetBSD: make.1,v 1.192 2011/05/28 21:53:54 cheusov Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\ -.Dd May 4, 2011 +.Dd May 29, 2011 .Dt MAKE 1 .Os .Sh NAME @@ -1867,7 +1867,7 @@ is built by another part of the dependency graph, the following is a dependency loop: .Bd -literal -\.ORDER: a b +\.ORDER: b a b: a .Ed .Pp
CVS commit: src/sys/dev/pci
Module Name:src Committed By: phx Date: Sat May 28 22:47:58 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add VIA VT6410 ATA RAID controller. To generate a diff of this commit: cvs rdiff -u -r1.1081 -r1.1082 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1081 src/sys/dev/pci/pcidevs:1.1082 --- src/sys/dev/pci/pcidevs:1.1081 Sat May 28 10:44:43 2011 +++ src/sys/dev/pci/pcidevs Sat May 28 22:47:58 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1081 2011/05/28 10:44:43 ryo Exp $ +$NetBSD: pcidevs,v 1.1082 2011/05/28 22:47:58 phx Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -4600,6 +4600,7 @@ product VIATECH VT8623 0x3123 VT8623 (Apollo CLE266) CPU-PCI Bridge product VIATECH VT8233A 0x3147 VT8233A PCI-ISA Bridge product VIATECH VT8237_SATA 0x3149 VT8237 Integrated SATA Controller +product VIATECH VT6410 0x3164 VT6410 ATA133 RAID Controller product VIATECH K8HTB 0x3188 K8HTB Host product VIATECH VT6421_RAID 0x3249 VT6421 Serial RAID Controller product VIATECH VT3314_IG 0x3344 VT3314 CN900 UniChrome Integrated Graphics
CVS commit: src/sys/dev/pci
Module Name:src Committed By: phx Date: Sat May 28 22:48:51 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1077 -r1.1078 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1076 -r1.1077 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.1077 src/sys/dev/pci/pcidevs.h:1.1078 --- src/sys/dev/pci/pcidevs.h:1.1077 Sat May 28 10:45:08 2011 +++ src/sys/dev/pci/pcidevs.h Sat May 28 22:48:50 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.1077 2011/05/28 10:45:08 ryo Exp $ */ +/* $NetBSD: pcidevs.h,v 1.1078 2011/05/28 22:48:50 phx Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1080 2011/05/27 15:09:44 matt Exp + * NetBSD: pcidevs,v 1.1082 2011/05/28 22:47:58 phx Exp */ /* @@ -4607,6 +4607,7 @@ #define PCI_PRODUCT_VIATECH_VT8623 0x3123 /* VT8623 (Apollo CLE266) CPU-PCI Bridge */ #define PCI_PRODUCT_VIATECH_VT8233A 0x3147 /* VT8233A PCI-ISA Bridge */ #define PCI_PRODUCT_VIATECH_VT8237_SATA 0x3149 /* VT8237 Integrated SATA Controller */ +#define PCI_PRODUCT_VIATECH_VT6410 0x3164 /* VT6410 ATA133 RAID Controller */ #define PCI_PRODUCT_VIATECH_K8HTB 0x3188 /* K8HTB Host */ #define PCI_PRODUCT_VIATECH_VT6421_RAID 0x3249 /* VT6421 Serial RAID Controller */ #define PCI_PRODUCT_VIATECH_VT3314_IG 0x3344 /* VT3314 CN900 UniChrome Integrated Graphics */ Index: src/sys/dev/pci/pcidevs_data.h diff -u src/sys/dev/pci/pcidevs_data.h:1.1076 src/sys/dev/pci/pcidevs_data.h:1.1077 --- src/sys/dev/pci/pcidevs_data.h:1.1076 Sat May 28 10:45:08 2011 +++ src/sys/dev/pci/pcidevs_data.h Sat May 28 22:48:50 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs_data.h,v 1.1076 2011/05/28 10:45:08 ryo Exp $ */ +/* $NetBSD: pcidevs_data.h,v 1.1077 2011/05/28 22:48:50 phx Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1080 2011/05/27 15:09:44 matt Exp + * NetBSD: pcidevs,v 1.1082 2011/05/28 22:47:58 phx Exp */ /* @@ -7479,34 +7479,36 @@ 26358, 6527, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237_SATA, 26311, 692, 8046, 6150, 0, + PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6410, + 26366, 20966, 6145, 6150, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_K8HTB, 25864, 6643, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6421_RAID, - 26366, 10134, 6145, 6150, 0, + 26373, 10134, 6145, 6150, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT3314_IG, - 26373, 26380, 26386, 692, 1716, 0, + 26380, 26387, 26393, 692, 1716, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237R_SATA, - 26396, 692, 8046, 6150, 0, + 26403, 692, 8046, 6150, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT3351_HB_3351, 25892, 6643, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_KT880_3, 25858, 2544, 6693, 615, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8235, - 26404, 25877, 26411, 6527, 6253, 0, + 26411, 25877, 26418, 6527, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8377, - 26418, 26425, 26432, 2544, 6693, 615, 6253, 0, + 26425, 26432, 26439, 2544, 6693, 615, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8378, - 26438, 26425, 26445, 2544, 6693, 615, 6253, 0, + 26445, 26432, 26452, 2544, 6693, 615, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237, 26311, 21494, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8251, 26171, 21494, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237A_HDA, - 26451, 17838, 17843, 6732, 6150, 0, + 26458, 17838, 17843, 6732, 6150, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237A_ISA, - 26466, 6527, 6253, 0, + 26473, 6527, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237S_ISA, - 26484, 6527, 6253, 0, + 26491, 6527, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237A_PPB, 26002, 7850, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237A_HB, @@ -7516,53 +7518,53 @@ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT3351_HB_4351, 25892, 6643, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_CX700M2_IDE, - 26492, 6316, 6150, 0, + 26499, 6316, 6150, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237A_SATA_2, 26002, 692, 8046, 6150, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT3351_IOAPIC, - 25892, 8004, 26506, 16839, 6150, 0, + 25892, 8004, 26513, 16839, 6150, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237S_SATA, - 26484, 692, 8046, 6150, 0, + 26491, 692, 8046, 6150, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT86C100A, - 26511, 26521, 5514, 5412, 0, +
CVS commit: src/sys/dev/pci
Module Name:src Committed By: phx Date: Sat May 28 22:53:24 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Renamed VT6410 to VT6410_RAID. To generate a diff of this commit: cvs rdiff -u -r1.1082 -r1.1083 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1082 src/sys/dev/pci/pcidevs:1.1083 --- src/sys/dev/pci/pcidevs:1.1082 Sat May 28 22:47:58 2011 +++ src/sys/dev/pci/pcidevs Sat May 28 22:53:23 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1082 2011/05/28 22:47:58 phx Exp $ +$NetBSD: pcidevs,v 1.1083 2011/05/28 22:53:23 phx Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -4600,7 +4600,7 @@ product VIATECH VT8623 0x3123 VT8623 (Apollo CLE266) CPU-PCI Bridge product VIATECH VT8233A 0x3147 VT8233A PCI-ISA Bridge product VIATECH VT8237_SATA 0x3149 VT8237 Integrated SATA Controller -product VIATECH VT6410 0x3164 VT6410 ATA133 RAID Controller +product VIATECH VT6410_RAID 0x3164 VT6410 ATA133 RAID Controller product VIATECH K8HTB 0x3188 K8HTB Host product VIATECH VT6421_RAID 0x3249 VT6421 Serial RAID Controller product VIATECH VT3314_IG 0x3344 VT3314 CN900 UniChrome Integrated Graphics
CVS commit: src/sys/dev/pci
Module Name:src Committed By: phx Date: Sat May 28 22:54:09 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1078 -r1.1079 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1077 -r1.1078 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.1078 src/sys/dev/pci/pcidevs.h:1.1079 --- src/sys/dev/pci/pcidevs.h:1.1078 Sat May 28 22:48:50 2011 +++ src/sys/dev/pci/pcidevs.h Sat May 28 22:54:08 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.1078 2011/05/28 22:48:50 phx Exp $ */ +/* $NetBSD: pcidevs.h,v 1.1079 2011/05/28 22:54:08 phx Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1082 2011/05/28 22:47:58 phx Exp + * NetBSD: pcidevs,v 1.1083 2011/05/28 22:53:23 phx Exp */ /* @@ -4607,7 +4607,7 @@ #define PCI_PRODUCT_VIATECH_VT8623 0x3123 /* VT8623 (Apollo CLE266) CPU-PCI Bridge */ #define PCI_PRODUCT_VIATECH_VT8233A 0x3147 /* VT8233A PCI-ISA Bridge */ #define PCI_PRODUCT_VIATECH_VT8237_SATA 0x3149 /* VT8237 Integrated SATA Controller */ -#define PCI_PRODUCT_VIATECH_VT6410 0x3164 /* VT6410 ATA133 RAID Controller */ +#define PCI_PRODUCT_VIATECH_VT6410_RAID 0x3164 /* VT6410 ATA133 RAID Controller */ #define PCI_PRODUCT_VIATECH_K8HTB 0x3188 /* K8HTB Host */ #define PCI_PRODUCT_VIATECH_VT6421_RAID 0x3249 /* VT6421 Serial RAID Controller */ #define PCI_PRODUCT_VIATECH_VT3314_IG 0x3344 /* VT3314 CN900 UniChrome Integrated Graphics */ Index: src/sys/dev/pci/pcidevs_data.h diff -u src/sys/dev/pci/pcidevs_data.h:1.1077 src/sys/dev/pci/pcidevs_data.h:1.1078 --- src/sys/dev/pci/pcidevs_data.h:1.1077 Sat May 28 22:48:50 2011 +++ src/sys/dev/pci/pcidevs_data.h Sat May 28 22:54:08 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs_data.h,v 1.1077 2011/05/28 22:48:50 phx Exp $ */ +/* $NetBSD: pcidevs_data.h,v 1.1078 2011/05/28 22:54:08 phx Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1082 2011/05/28 22:47:58 phx Exp + * NetBSD: pcidevs,v 1.1083 2011/05/28 22:53:23 phx Exp */ /* @@ -7479,7 +7479,7 @@ 26358, 6527, 6253, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237_SATA, 26311, 692, 8046, 6150, 0, - PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6410, + PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT6410_RAID, 26366, 20966, 6145, 6150, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_K8HTB, 25864, 6643, 0,
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: alnsn Date: Sat May 28 23:24:58 UTC 2011 Modified Files: src/sys/compat/linux/common: linux_ipc.c Log Message: Fix typo in a comment. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/compat/linux/common/linux_ipc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_ipc.c diff -u src/sys/compat/linux/common/linux_ipc.c:1.54 src/sys/compat/linux/common/linux_ipc.c:1.55 --- src/sys/compat/linux/common/linux_ipc.c:1.54 Mon Nov 16 08:44:19 2009 +++ src/sys/compat/linux/common/linux_ipc.c Sat May 28 23:24:58 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ipc.c,v 1.54 2009/11/16 08:44:19 joerg Exp $ */ +/* $NetBSD: linux_ipc.c,v 1.55 2011/05/28 23:24:58 alnsn Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_ipc.c,v 1.54 2009/11/16 08:44:19 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_ipc.c,v 1.55 2011/05/28 23:24:58 alnsn Exp $); #if defined(_KERNEL_OPT) #include opt_sysv.h @@ -74,7 +74,7 @@ * * Function in multiarch: * linux_sys_ipc : linux_ipccall.c - * liunx_semop : linux_ipccall.c + * linux_semop : linux_ipccall.c * linux_semget : linux_ipccall.c * linux_msgsnd : linux_ipccall.c * linux_msgrcv : linux_ipccall.c
CVS commit: src
Module Name:src Committed By: rmind Date: Sun May 29 01:00:50 UTC 2011 Modified Files: src/sys/fs/tmpfs: tmpfs.h src/usr.bin/fstat: tmpfs.c Log Message: - Prevent tmpfs.h from inclusion in userland. - Clean up and KNF tmpfs.h a little bit. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/fs/tmpfs/tmpfs.h cvs rdiff -u -r1.8 -r1.9 src/usr.bin/fstat/tmpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/tmpfs/tmpfs.h diff -u src/sys/fs/tmpfs/tmpfs.h:1.41 src/sys/fs/tmpfs/tmpfs.h:1.42 --- src/sys/fs/tmpfs/tmpfs.h:1.41 Tue May 24 20:17:49 2011 +++ src/sys/fs/tmpfs/tmpfs.h Sun May 29 01:00:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs.h,v 1.41 2011/05/24 20:17:49 rmind Exp $ */ +/* $NetBSD: tmpfs.h,v 1.42 2011/05/29 01:00:50 rmind Exp $ */ /* * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -30,8 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _FS_TMPFS_TMPFS_H_ -#define _FS_TMPFS_TMPFS_H_ +#ifndef _FS_TMPFS_H_ +#define _FS_TMPFS_H_ + +#if !defined(_KERNEL) !defined(_KMEMUSER) +#error not supposed to be exposed to userland +#endif #include sys/dirent.h #include sys/mount.h @@ -197,7 +201,7 @@ (TMPFS_NODE_ACCESSED | TMPFS_NODE_MODIFIED | TMPFS_NODE_CHANGED) /* White-out inode indicator. */ -#define TMPFS_NODE_WHITEOUT ((struct tmpfs_node *)-1) +#define TMPFS_NODE_WHITEOUT ((tmpfs_node_t *)-1) /* * Internal representation of a tmpfs mount point. @@ -237,59 +241,62 @@ * Prototypes for tmpfs_subr.c. */ -int tmpfs_alloc_node(struct tmpfs_mount *, enum vtype, - uid_t uid, gid_t gid, mode_t mode, struct tmpfs_node *, - char *, dev_t, struct tmpfs_node **); -void tmpfs_free_node(struct tmpfs_mount *, struct tmpfs_node *); -int tmpfs_alloc_dirent(struct tmpfs_mount *, struct tmpfs_node *, - const char *, uint16_t, struct tmpfs_dirent **); -void tmpfs_free_dirent(struct tmpfs_mount *, struct tmpfs_dirent *, - bool); -int tmpfs_alloc_vp(struct mount *, struct tmpfs_node *, struct vnode **); -void tmpfs_free_vp(struct vnode *); -int tmpfs_alloc_file(struct vnode *, struct vnode **, struct vattr *, - struct componentname *, char *); -void tmpfs_dir_attach(struct vnode *, struct tmpfs_dirent *); -void tmpfs_dir_detach(struct vnode *, struct tmpfs_dirent *); -struct tmpfs_dirent * tmpfs_dir_lookup(struct tmpfs_node *node, - struct componentname *cnp); -int tmpfs_dir_getdotdent(struct tmpfs_node *, struct uio *); -int tmpfs_dir_getdotdotdent(struct tmpfs_node *, struct uio *); -struct tmpfs_dirent * tmpfs_dir_lookupbycookie(struct tmpfs_node *, off_t); -int tmpfs_dir_getdents(struct tmpfs_node *, struct uio *, off_t *); -int tmpfs_reg_resize(struct vnode *, off_t); -int tmpfs_chflags(struct vnode *, int, kauth_cred_t, struct lwp *); -int tmpfs_chmod(struct vnode *, mode_t, kauth_cred_t, struct lwp *); -int tmpfs_chown(struct vnode *, uid_t, gid_t, kauth_cred_t, struct lwp *); -int tmpfs_chsize(struct vnode *, u_quad_t, kauth_cred_t, struct lwp *); -int tmpfs_chtimes(struct vnode *, const struct timespec *, -const struct timespec *, const struct timespec *, int, kauth_cred_t, -struct lwp *); -void tmpfs_update(struct vnode *, const struct timespec *, - const struct timespec *, const struct timespec *, int); -int tmpfs_truncate(struct vnode *, off_t); +int tmpfs_alloc_node(tmpfs_mount_t *, enum vtype, uid_t, gid_t, + mode_t, tmpfs_node_t *, char *, dev_t, tmpfs_node_t **); +void tmpfs_free_node(tmpfs_mount_t *, tmpfs_node_t *); + +int tmpfs_alloc_file(vnode_t *, vnode_t **, struct vattr *, + struct componentname *, char *); + +int tmpfs_alloc_vp(struct mount *, tmpfs_node_t *, vnode_t **); +void tmpfs_free_vp(vnode_t *); + +int tmpfs_alloc_dirent(tmpfs_mount_t *, tmpfs_node_t *, + const char *, uint16_t, tmpfs_dirent_t **); +void tmpfs_free_dirent(tmpfs_mount_t *, tmpfs_dirent_t *, bool); +void tmpfs_dir_attach(vnode_t *, tmpfs_dirent_t *); +void tmpfs_dir_detach(vnode_t *, tmpfs_dirent_t *); + +tmpfs_dirent_t *tmpfs_dir_lookup(tmpfs_node_t *, struct componentname *); +int tmpfs_dir_getdotdent(tmpfs_node_t *, struct uio *); +int tmpfs_dir_getdotdotdent(tmpfs_node_t *, struct uio *); +tmpfs_dirent_t *tmpfs_dir_lookupbycookie(tmpfs_node_t *, off_t); +int tmpfs_dir_getdents(tmpfs_node_t *, struct uio *, off_t *); + +int tmpfs_reg_resize(vnode_t *, off_t); +int tmpfs_truncate(vnode_t *, off_t); + +int tmpfs_chflags(vnode_t *, int, kauth_cred_t, lwp_t *); +int tmpfs_chmod(vnode_t *, mode_t, kauth_cred_t, lwp_t *); +int tmpfs_chown(vnode_t *, uid_t, gid_t, kauth_cred_t, lwp_t *); +int tmpfs_chsize(vnode_t *, u_quad_t, kauth_cred_t, lwp_t *); +int tmpfs_chtimes(vnode_t *, const struct timespec *, + const struct timespec *, const struct timespec *, int, + kauth_cred_t, lwp_t *); +void tmpfs_update(vnode_t *, const struct timespec *, + const
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: christos Date: Sun May 29 01:14:31 UTC 2011 Modified Files: src/sys/fs/tmpfs: tmpfs.h Log Message: undo the multiple inclusion protection part. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/fs/tmpfs/tmpfs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/tmpfs/tmpfs.h diff -u src/sys/fs/tmpfs/tmpfs.h:1.42 src/sys/fs/tmpfs/tmpfs.h:1.43 --- src/sys/fs/tmpfs/tmpfs.h:1.42 Sat May 28 21:00:50 2011 +++ src/sys/fs/tmpfs/tmpfs.h Sat May 28 21:14:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs.h,v 1.42 2011/05/29 01:00:50 rmind Exp $ */ +/* $NetBSD: tmpfs.h,v 1.43 2011/05/29 01:14:31 christos Exp $ */ /* * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _FS_TMPFS_H_ -#define _FS_TMPFS_H_ +#ifndef _FS_TMPFS_TMPFS_H_ +#define _FS_TMPFS_TMPFS_H_ #if !defined(_KERNEL) !defined(_KMEMUSER) #error not supposed to be exposed to userland @@ -352,4 +352,4 @@ return node; } -#endif /* _FS_TMPFS_H_ */ +#endif /* _FS_TMPFS_TMPFS_H_ */
CVS commit: src/sys/kern
Module Name:src
Committed By: manu
Date: Sun May 29 03:32:46 UTC 2011
Modified Files:
src/sys/kern: uipc_domain.c uipc_proto.c uipc_usrreq.c
Log Message:
Add SOCK_SEQPACKET to PL_LOCAL sockets. Based on patch from Jesse Off,
submitted 8 years ago:
http://mail-index.netbsd.org/tech-kern/2003/04/14/0006.html
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/kern/uipc_domain.c
cvs rdiff -u -r1.21 -r1.22 src/sys/kern/uipc_proto.c
cvs rdiff -u -r1.133 -r1.134 src/sys/kern/uipc_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_domain.c
diff -u src/sys/kern/uipc_domain.c:1.85 src/sys/kern/uipc_domain.c:1.86
--- src/sys/kern/uipc_domain.c:1.85 Sat Oct 3 20:24:39 2009
+++ src/sys/kern/uipc_domain.c Sun May 29 03:32:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_domain.c,v 1.85 2009/10/03 20:24:39 elad Exp $ */
+/* $NetBSD: uipc_domain.c,v 1.86 2011/05/29 03:32:46 manu Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_domain.c,v 1.85 2009/10/03 20:24:39 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_domain.c,v 1.86 2011/05/29 03:32:46 manu Exp $);
#include sys/param.h
#include sys/socket.h
@@ -518,6 +518,12 @@
CTL_NET, PF_LOCAL, SOCK_STREAM, CTL_EOL);
sysctl_createv(domain_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
+ CTLTYPE_NODE, seqpacket,
+ SYSCTL_DESCR(SOCK_SEQPACKET settings),
+ NULL, 0, NULL, 0,
+ CTL_NET, PF_LOCAL, SOCK_SEQPACKET, CTL_EOL);
+ sysctl_createv(domain_sysctllog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT,
CTLTYPE_NODE, dgram,
SYSCTL_DESCR(SOCK_DGRAM settings),
NULL, 0, NULL, 0,
@@ -532,6 +538,13 @@
sysctl_createv(domain_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRUCT, pcblist,
+ SYSCTL_DESCR(SOCK_SEQPACKET protocol control
+block list),
+ sysctl_unpcblist, 0, NULL, 0,
+ CTL_NET, PF_LOCAL, SOCK_SEQPACKET, CTL_CREATE, CTL_EOL);
+ sysctl_createv(domain_sysctllog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT,
+ CTLTYPE_STRUCT, pcblist,
SYSCTL_DESCR(SOCK_DGRAM protocol control block list),
sysctl_unpcblist, 0, NULL, 0,
CTL_NET, PF_LOCAL, SOCK_DGRAM, CTL_CREATE, CTL_EOL);
Index: src/sys/kern/uipc_proto.c
diff -u src/sys/kern/uipc_proto.c:1.21 src/sys/kern/uipc_proto.c:1.22
--- src/sys/kern/uipc_proto.c:1.21 Thu Apr 24 11:38:36 2008
+++ src/sys/kern/uipc_proto.c Sun May 29 03:32:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_proto.c,v 1.21 2008/04/24 11:38:36 ad Exp $ */
+/* $NetBSD: uipc_proto.c,v 1.22 2011/05/29 03:32:46 manu Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_proto.c,v 1.21 2008/04/24 11:38:36 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_proto.c,v 1.22 2011/05/29 03:32:46 manu Exp $);
#include sys/param.h
#include sys/socket.h
@@ -65,6 +65,13 @@
.pr_ctloutput = uipc_ctloutput,
.pr_usrreq = uipc_usrreq,
}, {
+ .pr_type = SOCK_SEQPACKET,
+ .pr_domain = unixdomain,
+ .pr_flags = PR_CONNREQUIRED|PR_WANTRCVD|PR_RIGHTS|PR_LISTEN|
+ PR_ATOMIC,
+ .pr_ctloutput = uipc_ctloutput,
+ .pr_usrreq = uipc_usrreq,
+ }, {
.pr_input = raw_input,
.pr_ctlinput = raw_ctlinput,
.pr_usrreq = raw_usrreq,
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.133 src/sys/kern/uipc_usrreq.c:1.134
--- src/sys/kern/uipc_usrreq.c:1.133 Fri Nov 19 06:44:43 2010
+++ src/sys/kern/uipc_usrreq.c Sun May 29 03:32:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.133 2010/11/19 06:44:43 dholland Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.134 2011/05/29 03:32:46 manu Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.133 2010/11/19 06:44:43 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.134 2011/05/29 03:32:46 manu Exp $);
#include sys/param.h
#include sys/systm.h
@@ -124,7 +124,7 @@
* Unix communications domain.
*
* TODO:
- * SEQPACKET, RDM
+ * RDM
* rethink name space problems
* need a proper out-of-band
*
@@ -487,6 +487,7 @@
panic(uipc 1);
/*NOTREACHED*/
+ case SOCK_SEQPACKET: /* FALLTHROUGH */
case SOCK_STREAM:
#define rcv (so-so_rcv)
#define snd (so2-so_snd)
@@ -567,6 +568,7 @@
break;
}
+ case SOCK_SEQPACKET: /* FALLTHROUGH */
case SOCK_STREAM:
#define rcv (so2-so_rcv)
#define snd (so-so_snd)
@@ -579,7 +581,7 @@
if (unp-unp_conn-unp_flags UNP_WANTCRED) {
/*
* Credentials are passed only once on
- * SOCK_STREAM.
+ * SOCK_STREAM and SOCK_SEQPACKET.
*/
unp-unp_conn-unp_flags = ~UNP_WANTCRED;
control = unp_addsockcred(l, control);
@@ -592,8
CVS commit: src/doc
Module Name:src Committed By: manu Date: Sun May 29 03:34:33 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Add SOCK_SEQPACKET for local sockets To generate a diff of this commit: cvs rdiff -u -r1.1549 -r1.1550 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1549 src/doc/CHANGES:1.1550 --- src/doc/CHANGES:1.1549 Thu May 26 04:29:18 2011 +++ src/doc/CHANGES Sun May 29 03:34:33 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1549 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1550 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1012,3 +1012,4 @@ userconf(4), boot.cfg(5), boot(8), i386, amd64: Support userconf(4) command in boot.cfg(5)/boot(8) on i386/amd64. [uebayasi 20110526] + kernel: add SOCK_SEQPACKET for local sockets [manu 20110529]
CVS commit: src/usr.bin
Module Name:src
Committed By: manu
Date: Sun May 29 04:45:08 UTC 2011
Modified Files:
src/usr.bin/netstat: unix.c
src/usr.bin/sockstat: sockstat.c
Log Message:
Display SOCK_SEQPACKET local sockets in sockstat and netstat
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/netstat/unix.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/sockstat/sockstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/netstat/unix.c
diff -u src/usr.bin/netstat/unix.c:1.32 src/usr.bin/netstat/unix.c:1.33
--- src/usr.bin/netstat/unix.c:1.32 Wed May 4 01:11:29 2011
+++ src/usr.bin/netstat/unix.c Sun May 29 04:45:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: unix.c,v 1.32 2011/05/04 01:11:29 dyoung Exp $ */
+/* $NetBSD: unix.c,v 1.33 2011/05/29 04:45:08 manu Exp $ */
/*-
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)unix.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: unix.c,v 1.32 2011/05/04 01:11:29 dyoung Exp $);
+__RCSID($NetBSD: unix.c,v 1.33 2011/05/29 04:45:08 manu Exp $);
#endif
#endif /* not lint */
@@ -152,66 +152,70 @@
struct kinfo_pcb *pcblist;
int mib[8];
size_t namelen = 0, size = 0, i;
- const char *mibname = net.local.stream.pcblist;
+ const char *mibnames[] = {
+ net.local.stream.pcblist,
+ net.local.dgram.pcblist,
+ net.local.seqpacket.pcblist,
+ NULL,
+ };
+ const char **mibname;
static int first = 1;
- int done = 0;
- again:
- memset(mib, 0, sizeof(mib));
+ for (mibname = mibnames; *mibname; mibname++) {
+ memset(mib, 0, sizeof(mib));
- if (sysctlnametomib(mibname, mib,
-namelen) == -1)
- err(1, sysctlnametomib: %s, mibname);
-
- if (prog_sysctl(mib, sizeof(mib) / sizeof(*mib),
- NULL, size, NULL, 0) == -1)
- err(1, sysctl (query));
-
- if ((pcblist = malloc(size)) == NULL)
- err(1, malloc);
- memset(pcblist, 0, size);
-
- mib[6] = sizeof(*pcblist);
- mib[7] = size / sizeof(*pcblist);
-
- if (prog_sysctl(mib, sizeof(mib) / sizeof(*mib), pcblist,
- size, NULL, 0) == -1)
- err(1, sysctl (copy));
-
- for (i = 0; i size / sizeof(*pcblist); i++) {
- struct kinfo_pcb *ki = pcblist[i];
- struct sockaddr_un *sun;
- int remote = 0;
-
- if (first) {
-unixdomainprhdr();
-first = 0;
+ if (sysctlnametomib(*mibname, mib,
+ namelen) == -1)
+err(1, sysctlnametomib: %s, *mibname);
+
+ if (prog_sysctl(mib, sizeof(mib) / sizeof(*mib),
+ NULL, size, NULL, 0) == -1)
+err(1, sysctl (query));
+
+ if ((pcblist = malloc(size)) == NULL)
+err(1, malloc);
+ memset(pcblist, 0, size);
+
+ mib[6] = sizeof(*pcblist);
+ mib[7] = size / sizeof(*pcblist);
+
+ if (prog_sysctl(mib, sizeof(mib) / sizeof(*mib),
+ pcblist, size, NULL, 0) == -1)
+err(1, sysctl (copy));
+
+ for (i = 0; i size / sizeof(*pcblist); i++) {
+struct kinfo_pcb *ki = pcblist[i];
+struct sockaddr_un *sun;
+int remote = 0;
+
+if (first) {
+ unixdomainprhdr();
+ first = 0;
+}
+
+sun = (struct sockaddr_un *)ki-ki_dst;
+if (sun-sun_path[0] != '\0') {
+ remote = 1;
+} else {
+ sun = (struct sockaddr_un *)ki-ki_src;
+}
+
+unixdomainpr0(ki-ki_pcbaddr, ki-ki_type,
+ ki-ki_rcvq, ki-ki_sndq,
+ ki-ki_vnode, ki-ki_conn,
+ ki-ki_refs, ki-ki_nextref,
+ ki-ki_sockaddr, sun, remote);
}
- sun = (struct sockaddr_un *)ki-ki_dst;
- if (sun-sun_path[0] != '\0') {
-remote = 1;
- } else {
-sun = (struct sockaddr_un *)ki-ki_src;
- }
-
- unixdomainpr0(ki-ki_pcbaddr, ki-ki_type,
- ki-ki_rcvq, ki-ki_sndq,
- ki-ki_vnode, ki-ki_conn, ki-ki_refs,
- ki-ki_nextref, ki-ki_sockaddr, sun, remote);
+ free(pcblist);
}
- free(pcblist);
-
- if (!done mibname) {
- mibname = net.local.dgram.pcblist;
- done = 1;
- goto again;
- }
} else {
- filebuf = (char *)kvm_getfiles(get_kvmd(), KERN_FILE, 0, ns_nfiles);
+ filebuf = (char *)kvm_getfiles(get_kvmd(), KERN_FILE,
+ 0, ns_nfiles);
if (filebuf == 0) {
- printf(file table read error: %s, kvm_geterr(get_kvmd()));
+ printf(file table read error: %s,
+ kvm_geterr(get_kvmd()));
return;
}
file = (struct file *)(filebuf + sizeof(fp));
Index: src/usr.bin/sockstat/sockstat.c
diff -u src/usr.bin/sockstat/sockstat.c:1.16 src/usr.bin/sockstat/sockstat.c:1.17
--- src/usr.bin/sockstat/sockstat.c:1.16 Fri Jan 28 18:52:49 2011
+++ src/usr.bin/sockstat/sockstat.c Sun May 29 04:45:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sockstat.c,v 1.16 2011/01/28 18:52:49 pooka Exp $ */
+/* $NetBSD: sockstat.c,v 1.17 2011/05/29 04:45:08 manu Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: sockstat.c,v 1.16 2011/01/28 18:52:49 pooka Exp $);
+__RCSID($NetBSD: sockstat.c,v 1.17
CVS commit: src/share/man/man4
Module Name:src Committed By: manu Date: Sun May 29 04:51:15 UTC 2011 Modified Files: src/share/man/man4: unix.4 Log Message: Document that SOCK_SEQPACKET is supported To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man4/unix.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/unix.4 diff -u src/share/man/man4/unix.4:1.22 src/share/man/man4/unix.4:1.23 --- src/share/man/man4/unix.4:1.22 Thu May 19 21:16:45 2011 +++ src/share/man/man4/unix.4 Sun May 29 04:51:15 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: unix.4,v 1.22 2011/05/19 21:16:45 riastradh Exp $ +.\ $NetBSD: unix.4,v 1.23 2011/05/29 04:51:15 manu Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -49,7 +49,8 @@ The .Tn UNIX Ns -domain family supports the -.Dv SOCK_STREAM +.Dv SOCK_STREAM , +.Dv SOCK_SEQPACKET and .Dv SOCK_DGRAM socket types and uses @@ -125,11 +126,14 @@ .Tn UNIX Ns -domain protocol family comprises simple transport protocols that support the -.Dv SOCK_STREAM +.Dv SOCK_STREAM , +.Dv SOCK_SEQPACKET and .Dv SOCK_DGRAM abstractions. .Dv SOCK_STREAM +and +.Dv SOCK_SEQPACKET sockets also support the communication of .Ux file descriptors through the use of the @@ -178,7 +182,8 @@ The .Dv LOCAL_CREDS option may be enabled on a -.Dv SOCK_DGRAM +.Dv SOCK_DGRAM , +.Dv SOCK_SEQPACKET or a .Dv SOCK_STREAM socket. @@ -208,6 +213,8 @@ .Xr getsockopt 2 to get the PID and effective user and group IDs of a .Dv SOCK_STREAM +or +.Dv SOCK_SEQPACKET peer when it did .Xr connect 2 or
CVS commit: src/usr.bin/sockstat
Module Name:src Committed By: manu Date: Sun May 29 04:54:45 UTC 2011 Modified Files: src/usr.bin/sockstat: sockstat.1 Log Message: Document that localsocket may be of type SOCK_SEQPACKET To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/sockstat/sockstat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/sockstat/sockstat.1 diff -u src/usr.bin/sockstat/sockstat.1:1.7 src/usr.bin/sockstat/sockstat.1:1.8 --- src/usr.bin/sockstat/sockstat.1:1.7 Sun May 4 19:43:06 2008 +++ src/usr.bin/sockstat/sockstat.1 Sun May 29 04:54:45 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: sockstat.1,v 1.7 2008/05/04 19:43:06 martin Exp $ +.\ $NetBSD: sockstat.1,v 1.8 2011/05/29 04:54:45 manu Exp $ .\- .\ Copyright (c) 2005 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -152,7 +152,7 @@ The file descriptor number of the socket. .It Li PROTO The transport protocol associated with the socket for Internet -sockets, or the type of socket (stream or datagram) for +sockets, or the type of socket (stream, seqpacket or datagram) for .Ux sockets. .It Li LOCAL ADDRESS
