CVS commit: src/sys/dev
Module Name:src Committed By: msaitoh Date: Sun Mar 7 07:53:38 UTC 2010 Modified Files: src/sys/dev/mii: igphy.c src/sys/dev/pci: if_wm.c if_wmreg.h Added Files: src/sys/dev/mii: igphyvar.h Log Message: Add two workarounds for ICH8 with igp3. - Workaround for 82566 Kumeran PCS lock loss. - WOL from S5 stops working. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mii/igphy.c cvs rdiff -u -r0 -r1.1 src/sys/dev/mii/igphyvar.h cvs rdiff -u -r1.201 -r1.202 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_wmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Sun Mar 7 07:53:38 UTC 2010
Modified Files:
src/sys/dev/mii: igphy.c
src/sys/dev/pci: if_wm.c if_wmreg.h
Added Files:
src/sys/dev/mii: igphyvar.h
Log Message:
Add two workarounds for ICH8 with igp3.
- Workaround for 82566 Kumeran PCS lock loss.
- WOL from S5 stops working.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mii/igphy.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/mii/igphyvar.h
cvs rdiff -u -r1.201 -r1.202 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_wmreg.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/mii/igphy.c
diff -u src/sys/dev/mii/igphy.c:1.20 src/sys/dev/mii/igphy.c:1.21
--- src/sys/dev/mii/igphy.c:1.20 Wed Dec 16 14:37:26 2009
+++ src/sys/dev/mii/igphy.c Sun Mar 7 07:53:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: igphy.c,v 1.20 2009/12/16 14:37:26 msaitoh Exp $ */
+/* $NetBSD: igphy.c,v 1.21 2010/03/07 07:53:37 msaitoh Exp $ */
/*
* The Intel copyright applies to the analog register setup, and the
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.20 2009/12/16 14:37:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.21 2010/03/07 07:53:37 msaitoh Exp $");
#include "opt_mii.h"
@@ -88,15 +88,9 @@
#include
#include
#include
+#include
#include
-struct igphy_softc {
- struct mii_softc sc_mii;
- int sc_smartspeed;
- uint32_t sc_mactype;
- uint32_t sc_macflags;
-};
-
static void igphy_reset(struct mii_softc *);
static void igphy_load_dspcode(struct mii_softc *);
static void igphy_load_dspcode_igp3(struct mii_softc *);
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.201 src/sys/dev/pci/if_wm.c:1.202
--- src/sys/dev/pci/if_wm.c:1.201 Sun Mar 7 07:09:00 2010
+++ src/sys/dev/pci/if_wm.c Sun Mar 7 07:53:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.201 2010/03/07 07:09:00 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.202 2010/03/07 07:53:37 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.201 2010/03/07 07:09:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.202 2010/03/07 07:53:37 msaitoh Exp $");
#include "rnd.h"
@@ -118,9 +118,11 @@
#include
#include
+#include
#include
#include
#include
+#include
#include
#include
@@ -576,6 +578,8 @@
static int wm_check_reset_block(struct wm_softc *);
static void wm_get_hw_control(struct wm_softc *);
static int wm_check_for_link(struct wm_softc *);
+static void wm_kmrn_lock_loss_workaround_ich8lan(struct wm_softc *);
+static void wm_gig_downshift_workaround_ich8lan(struct wm_softc *);
static void wm_hv_phy_workaround_ich8lan(struct wm_softc *);
static void wm_k1_gig_workaround_hv(struct wm_softc *, int);
static void wm_configure_k1_ich8lan(struct wm_softc *, int);
@@ -3179,6 +3183,9 @@
sc->sc_ctrl |= CTRL_FD;
CSR_WRITE(sc, WMREG_CTRL, sc->sc_ctrl);
}
+ } else if ((sc->sc_type == WM_T_ICH8)
+ && (sc->sc_phytype == WMPHY_IGP_3)) {
+ wm_kmrn_lock_loss_workaround_ich8lan(sc);
} else if (sc->sc_type == WM_T_PCH) {
wm_k1_gig_workaround_hv(sc,
((sc->sc_mii.mii_media_status & IFM_ACTIVE) != 0));
@@ -5433,7 +5440,20 @@
ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE);
sc->sc_phytype = WMPHY_NONE;
} else {
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+ /* Check PHY type */
+ uint32_t model;
+ struct mii_softc *child;
+
+ child = LIST_FIRST(&sc->sc_mii.mii_phys);
+ if (device_is_a(child->mii_dev, "igphy")) {
+ struct igphy_softc *isc = (struct igphy_softc *)child;
+
+ model = isc->sc_mii.mii_mpd_model;
+ if (model == MII_MODEL_yyINTEL_I82566)
+sc->sc_phytype = WMPHY_IGP_3;
+ }
+
+ ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER | IFM_AUTO);
}
}
@@ -6848,6 +6868,68 @@
return 0;
}
+/* Work-around for 82566 Kumeran PCS lock loss */
+static void
+wm_kmrn_lock_loss_workaround_ich8lan(struct wm_softc *sc)
+{
+ int miistatus, active, i;
+ int reg;
+
+ miistatus = sc->sc_mii.mii_media_status;
+
+ /* If the link is not up, do nothing */
+ if ((miistatus & IFM_ACTIVE) != 0)
+ return;
+
+ active = sc->sc_mii.mii_media_active;
+
+ /* Nothing to do if the link is other than 1Gbps */
+ if (IFM_SUBTYPE(active) != IFM_1000_T)
+ return;
+
+ for (i = 0; i < 10; i++) {
+ /* read twice */
+ reg = wm_gmii_i80003_readreg(sc->sc_dev, 1, IGP3_KMRN_DIAG);
+ reg = wm_gmii_i80003_readreg(sc->sc_dev, 1, IGP3_KMRN_DIAG);
+ if ((reg & IGP3_KMRN_DIAG_PCS_LOCK_LOSS) != 0)
+ goto out; /* GOOD! */
+
+ /* Reset the PHY */
+ wm_gmii_reset(sc);
+ delay(5*1000);
+ }
+
+ /* Disable GigE link negotiation */
+ reg = CSR_READ(sc, WMREG_PHY_CTRL);
+ reg |= PHY_CTRL_GBE_DIS | PHY_CTRL_NOND0A_GBE_DIS;
+ CSR_WRITE(sc, WMREG_PHY_CTRL, reg);
+
+ /*
+ * Call gig s
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sun Mar 7 07:33:30 UTC 2010 Modified Files: src/sys/arch/evbarm/conf: GUMSTIX Log Message: Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/GUMSTIX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sun Mar 7 07:33:30 UTC 2010 Modified Files: src/sys/arch/evbarm/conf: GUMSTIX Log Message: Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/GUMSTIX 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/evbarm/conf/GUMSTIX diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.43 src/sys/arch/evbarm/conf/GUMSTIX:1.44 --- src/sys/arch/evbarm/conf/GUMSTIX:1.43 Sun Jan 3 09:52:16 2010 +++ src/sys/arch/evbarm/conf/GUMSTIX Sun Mar 7 07:33:29 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GUMSTIX,v 1.43 2010/01/03 09:52:16 kiyohara Exp $ +# $NetBSD: GUMSTIX,v 1.44 2010/03/07 07:33:29 kiyohara Exp $ # # GUMSTIX -- Gumstix. Inc. gumstix platforms kernel # @@ -68,7 +68,7 @@ #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP -options INET6 # IPV6 +options INET6 # IPv6 options IPSEC # IP security options IPSEC_ESP # IP security (encryption part; define w/ IPSEC) options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) @@ -261,7 +261,7 @@ # PCMCIA network interfaces ne* at pcmcia? function ? # NE2000-compatible Ethernet -wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11) +wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11) #xirc* at pcmcia? function ? # Xircom CreditCard Ethernet #xi* at xirc? @@ -373,8 +373,8 @@ #pseudo-device tap # virtual Ethernet #pseudo-device tun # network tunneling over tty #pseudo-device gre # generic L3 over IP tunnel -#pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) -#pseudo-device faith # IPv[46] tcp relay translation i/f +#pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933) +#pseudo-device faith # IPv[46] TCP relay translation i/f #pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation #pseudo-device vlan # IEEE 802.1q encapsulation #pseudo-device bridge # simple inter-network bridging @@ -387,7 +387,7 @@ pseudo-device pty # pseudo-terminals #pseudo-device sequencer 1 # MIDI sequencer pseudo-device rnd # /dev/random and in-kernel generator -options RND_COM +options RND_COM pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms pseudo-device bcsp # BlueCore Serial Protocol
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun Mar 7 07:09:00 UTC 2010 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Add the detach code. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Sun Mar 7 07:09:00 UTC 2010
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Add the detach code.
To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/sys/dev/pci/if_wm.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.200 src/sys/dev/pci/if_wm.c:1.201
--- src/sys/dev/pci/if_wm.c:1.200 Thu Feb 25 15:07:06 2010
+++ src/sys/dev/pci/if_wm.c Sun Mar 7 07:09:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.200 2010/02/25 15:07:06 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.201 2010/03/07 07:09:00 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.200 2010/02/25 15:07:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.201 2010/03/07 07:09:00 msaitoh Exp $");
#include "rnd.h"
@@ -245,13 +245,12 @@
device_t sc_dev; /* generic device information */
bus_space_tag_t sc_st; /* bus space tag */
bus_space_handle_t sc_sh; /* bus space handle */
+ bus_space_handle_t sc_ss; /* bus space size */
bus_space_tag_t sc_iot; /* I/O space tag */
bus_space_handle_t sc_ioh; /* I/O space handle */
bus_space_tag_t sc_flasht; /* flash registers space tag */
bus_space_handle_t sc_flashh; /* flash registers space handle */
bus_dma_tag_t sc_dmat; /* bus DMA tag */
- bus_dmamap_t sc_cddmamap; /* control data DMA map */
-#define sc_cddma sc_cddmamap->dm_segs[0].ds_addr
struct ethercom sc_ethercom; /* ethernet common data */
struct mii_data sc_mii; /* MII/media information */
@@ -288,8 +287,13 @@
/*
* Control data structures.
*/
- int sc_ntxdesc; /* must be a power of two */
+ int sc_ntxdesc; /* must be a power of two */
struct wm_control_data_82544 *sc_control_data;
+ bus_dmamap_t sc_cddmamap; /* control data DMA map */
+ bus_dma_segment_t sc_cd_seg; /* control data segment */
+ int sc_cd_rseg; /* real number of control segment */
+ size_t sc_cd_size; /* control data size */
+#define sc_cddma sc_cddmamap->dm_segs[0].ds_addr
#define sc_txdescs sc_control_data->wcd_txdescs
#define sc_rxdescs sc_control_data->wcd_rxdescs
@@ -544,6 +548,7 @@
static void wm_set_spiaddrbits(struct wm_softc *);
static int wm_match(device_t, cfdata_t, void *);
static void wm_attach(device_t, device_t, void *);
+static int wm_detach(device_t, int);
static int wm_is_onboard_nvm_eeprom(struct wm_softc *);
static void wm_get_auto_rd_done(struct wm_softc *);
static void wm_lan_init_done(struct wm_softc *);
@@ -577,8 +582,8 @@
static void wm_set_pcie_completion_timeout(struct wm_softc *);
static void wm_reset_init_script_82575(struct wm_softc *);
-CFATTACH_DECL_NEW(wm, sizeof(struct wm_softc),
-wm_match, wm_attach, NULL, NULL);
+CFATTACH_DECL3_NEW(wm, sizeof(struct wm_softc),
+wm_match, wm_attach, wm_detach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
/*
* Devices supported by this driver.
@@ -1060,14 +1065,13 @@
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
pci_chipset_tag_t pc = pa->pa_pc;
pci_intr_handle_t ih;
- size_t cdata_size;
const char *intrstr = NULL;
const char *eetype, *xname;
bus_space_tag_t memt;
bus_space_handle_t memh;
- bus_dma_segment_t seg;
+ bus_size_t memsize;
int memh_valid;
- int i, rseg, error;
+ int i, error;
const struct wm_product *wmp;
prop_data_t ea;
prop_number_t pn;
@@ -1125,7 +1129,7 @@
case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT:
case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT:
memh_valid = (pci_mapreg_map(pa, WM_PCI_MMBA,
- memtype, 0, &memt, &memh, NULL, NULL) == 0);
+ memtype, 0, &memt, &memh, NULL, &memsize) == 0);
break;
default:
memh_valid = 0;
@@ -1135,6 +1139,7 @@
if (memh_valid) {
sc->sc_st = memt;
sc->sc_sh = memh;
+ sc->sc_ss = memsize;
} else {
aprint_error_dev(sc->sc_dev,
"unable to map device registers\n");
@@ -1344,26 +1349,28 @@
*/
WM_NTXDESC(sc) = sc->sc_type < WM_T_82544 ?
WM_NTXDESC_82542 : WM_NTXDESC_82544;
- cdata_size = sc->sc_type < WM_T_82544 ?
+ sc->sc_cd_size = sc->sc_type < WM_T_82544 ?
sizeof(struct wm_control_data_82542) :
sizeof(struct wm_control_data_82544);
- if ((error = bus_dmamem_alloc(sc->sc_dmat, cdata_size, PAGE_SIZE,
- (bus_size_t) 0x1ULL, &seg, 1, &rseg, 0)) != 0) {
+ if ((error = bus_dmamem_alloc(sc->sc_dmat, sc->sc_cd_size, PAGE_SIZE,
+ (bus_size_t) 0x1ULL, &sc->sc_cd_seg, 1,
+ &sc->sc_cd_rseg, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
"unable to allocate control data, error = %d\n",
error);
goto fail_0;
}
- if ((error = bus_dmamem_map(sc->sc_dmat, &seg, rseg, cdata_size,
+ if ((error = bus_dmamem_map(sc->sc_dmat, &sc->sc_cd_seg,
+ sc->sc_cd_rseg, sc->sc_cd_size,
(void **)&sc->sc_control_data, BUS_DMA_COHERE
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Sun Mar 7 05:37:25 UTC 2010 Modified Files: src/share/man/man9: sched_4bsd.9 Log Message: Use .Bx to write 4.4BSD. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/sched_4bsd.9 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/man9/sched_4bsd.9 diff -u src/share/man/man9/sched_4bsd.9:1.6 src/share/man/man9/sched_4bsd.9:1.7 --- src/share/man/man9/sched_4bsd.9:1.6 Sat Mar 6 22:02:15 2010 +++ src/share/man/man9/sched_4bsd.9 Sun Mar 7 05:37:25 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sched_4bsd.9,v 1.6 2010/03/06 22:02:15 wiz Exp $ +.\" $NetBSD: sched_4bsd.9,v 1.7 2010/03/07 05:37:25 jruoho Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -48,7 +48,9 @@ .Ft void .Fn updatepri "lwp_t *l" .Sh DESCRIPTION -The traditional 4.4BSD scheduler employs a +The traditional +.Bx 4.4 +scheduler employs a .Dq multilevel feedback queues algorithm, favouring interactive, short-running threads to CPU-bound ones. @@ -83,7 +85,9 @@ All pathnames are relative to .Pa /usr/src . .Pp -The 4.4BSD scheduler subsystem is implemented within the file +The +.Bx 4.4 +scheduler subsystem is implemented within the file .Pa sys/kern/sched_4bsd.c . .Sh SEE ALSO .Xr csf 9 ,
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Sun Mar 7 05:37:25 UTC 2010 Modified Files: src/share/man/man9: sched_4bsd.9 Log Message: Use .Bx to write 4.4BSD. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/sched_4bsd.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: [netbsd-5] src/sys/dev/ic
> ...so how does a sata patch break usb? Something related interrupt? usb(4) attachment runs in thread context. Masao
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: mrg Date: Sun Mar 7 01:52:44 UTC 2010 Modified Files: src/sys/arch/sparc64/include: locore.h src/sys/arch/sparc64/sparc64: locore.s Log Message: need _ALIGN in locore.h as well, for DEBUG kernels. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/include/locore.h cvs rdiff -u -r1.324 -r1.325 src/sys/arch/sparc64/sparc64/locore.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/sparc64/include/locore.h diff -u src/sys/arch/sparc64/include/locore.h:1.2 src/sys/arch/sparc64/include/locore.h:1.3 --- src/sys/arch/sparc64/include/locore.h:1.2 Sun Mar 7 00:42:58 2010 +++ src/sys/arch/sparc64/include/locore.h Sun Mar 7 01:52:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.h,v 1.2 2010/03/07 00:42:58 mrg Exp $ */ +/* $NetBSD: locore.h,v 1.3 2010/03/07 01:52:44 mrg Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath @@ -86,3 +86,7 @@ /* if < 32, copy by bytes, memcpy, kcopy, ... */ #define BCOPY_SMALL 32 + +/* use as needed to align things on longword boundaries */ +#define _ALIGN .align 8 +#define ICACHE_ALIGN .align 32 Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.324 src/sys/arch/sparc64/sparc64/locore.s:1.325 --- src/sys/arch/sparc64/sparc64/locore.s:1.324 Sun Mar 7 00:42:58 2010 +++ src/sys/arch/sparc64/sparc64/locore.s Sun Mar 7 01:52:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.324 2010/03/07 00:42:58 mrg Exp $ */ +/* $NetBSD: locore.s,v 1.325 2010/03/07 01:52:44 mrg Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath @@ -117,10 +117,6 @@ .register %g2,#scratch .register %g3,#scratch -/* use as needed to align things on longword boundaries */ -#define _ALIGN .align 8 -#define ICACHE_ALIGN .align 32 - /* * This macro will clear out a cache line before an explicit * access to that location. It's mostly used to make certain
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: mrg Date: Sun Mar 7 01:52:44 UTC 2010 Modified Files: src/sys/arch/sparc64/include: locore.h src/sys/arch/sparc64/sparc64: locore.s Log Message: need _ALIGN in locore.h as well, for DEBUG kernels. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/include/locore.h cvs rdiff -u -r1.324 -r1.325 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/acpi
This doesn't sound right: if sysmon_envsys(9) functions are specifically used in these drivers, then depending on header pollution for the prototypes of these functions instead of explicitly including sounds like a definite bug, not at all a feature. C. On 05/03/2010, Jukka Ruohonen wrote: > Module Name:src > Committed By: jruoho > > Date: Fri Mar 5 14:00:17 UTC 2010 > > Modified Files: > src/sys/dev/acpi: acpi.c acpi_acad.c acpi_apm.c acpi_bat.c > acpi_button.c acpi_ec.c acpi_lid.c acpi_madt.c acpi_pci.c > acpi_pci_link.c acpi_powerres.c acpi_quirks.c acpi_resource.c > acpi_slit.c acpi_srat.c acpi_timer.c acpi_tz.c acpi_wakedev.c > aiboost.c asus_acpi.c atk0110.c atppc_acpi.c attimer_acpi.c > com_acpi.c dalb_acpi.c fdc_acpi.c hpet_acpi.c hpqlb_acpi.c > joy_acpi.c lpt_acpi.c mpu_acpi.c pckbc_acpi.c pcppi_acpi.c > smbus_acpi.c sony_acpi.c spic_acpi.c thinkpad_acpi.c ug_acpi.c > wb_acpi.c wmi_acpi.c wss_acpi.c ym_acpi.c > > Log Message: > Remove from all files. It is included from > . Ditto for , , > , and . > > Also nuke a lot of unused and invalid headers. Some of these are audibly > provided by standard headers (namely and ), some > have nothing to do with ACPI devices (e.g. ), and some are > nonexistent local includes (e.g. "mpu_ym.h"). Moreoever, try to group the > includes into their respective blocks. > > Tested with GENERIC and ALL (i386). No functional change. > > > > To generate a diff of this commit: > > cvs rdiff -u -r1.154 -r1.155 src/sys/dev/acpi/acpi.c > cvs rdiff -u -r1.41 -r1.42 src/sys/dev/acpi/acpi_acad.c > cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpi_apm.c \ > src/sys/dev/acpi/acpi_timer.c src/sys/dev/acpi/sony_acpi.c \ > src/sys/dev/acpi/wmi_acpi.c > cvs rdiff -u -r1.83 -r1.84 src/sys/dev/acpi/acpi_bat.c > cvs rdiff -u -r1.33 -r1.34 src/sys/dev/acpi/acpi_button.c > cvs rdiff -u -r1.61 -r1.62 src/sys/dev/acpi/acpi_ec.c > cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/acpi_lid.c > cvs rdiff -u -r1.20 -r1.21 src/sys/dev/acpi/acpi_madt.c > cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_pci.c \ > src/sys/dev/acpi/acpi_slit.c src/sys/dev/acpi/acpi_srat.c \ > src/sys/dev/acpi/acpi_wakedev.c > cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpi_pci_link.c > cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/acpi_powerres.c \ > src/sys/dev/acpi/acpi_quirks.c src/sys/dev/acpi/ym_acpi.c > cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/acpi_resource.c > cvs rdiff -u -r1.60 -r1.61 src/sys/dev/acpi/acpi_tz.c > cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/aiboost.c > cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/asus_acpi.c > cvs rdiff -u -r1.8 -r1.9 src/sys/dev/acpi/atk0110.c \ > src/sys/dev/acpi/dalb_acpi.c src/sys/dev/acpi/smbus_acpi.c > cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/atppc_acpi.c > cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/attimer_acpi.c > cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/com_acpi.c > cvs rdiff -u -r1.37 -r1.38 src/sys/dev/acpi/fdc_acpi.c > cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/hpet_acpi.c > cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/hpqlb_acpi.c > cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/joy_acpi.c \ > src/sys/dev/acpi/mpu_acpi.c > cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/lpt_acpi.c > cvs rdiff -u -r1.32 -r1.33 src/sys/dev/acpi/pckbc_acpi.c > cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/pcppi_acpi.c > cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/spic_acpi.c \ > src/sys/dev/acpi/ug_acpi.c > cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/thinkpad_acpi.c > cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/wb_acpi.c > cvs rdiff -u -r1.25 -r1.26 src/sys/dev/acpi/wss_acpi.c > > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: mrg Date: Sun Mar 7 00:42:58 UTC 2010 Modified Files: src/sys/arch/sparc64/include: locore.h src/sys/arch/sparc64/sparc64: locore.s memcpyset.s Log Message: gas has supported SPARC ".empty" for a long while; get rid of an ancient workaround. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/include/locore.h cvs rdiff -u -r1.323 -r1.324 src/sys/arch/sparc64/sparc64/locore.s cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/sparc64/memcpyset.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: mrg Date: Sun Mar 7 00:42:58 UTC 2010 Modified Files: src/sys/arch/sparc64/include: locore.h src/sys/arch/sparc64/sparc64: locore.s memcpyset.s Log Message: gas has supported SPARC ".empty" for a long while; get rid of an ancient workaround. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/include/locore.h cvs rdiff -u -r1.323 -r1.324 src/sys/arch/sparc64/sparc64/locore.s cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/sparc64/memcpyset.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/sparc64/include/locore.h diff -u src/sys/arch/sparc64/include/locore.h:1.1 src/sys/arch/sparc64/include/locore.h:1.2 --- src/sys/arch/sparc64/include/locore.h:1.1 Sat Mar 6 23:26:10 2010 +++ src/sys/arch/sparc64/include/locore.h Sun Mar 7 00:42:58 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.h,v 1.1 2010/03/06 23:26:10 mrg Exp $ */ +/* $NetBSD: locore.h,v 1.2 2010/03/07 00:42:58 mrg Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath @@ -81,8 +81,6 @@ #define CCCR %icc #endif -#define EMPTY .empty - /* Give this real authority: reset the machine */ #define NOTREACHED sir Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.323 src/sys/arch/sparc64/sparc64/locore.s:1.324 --- src/sys/arch/sparc64/sparc64/locore.s:1.323 Sat Mar 6 23:26:10 2010 +++ src/sys/arch/sparc64/sparc64/locore.s Sun Mar 7 00:42:58 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.323 2010/03/06 23:26:10 mrg Exp $ */ +/* $NetBSD: locore.s,v 1.324 2010/03/07 00:42:58 mrg Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath @@ -3254,7 +3254,7 @@ CASPTR [%g1] ASI_N, %g3, %g7 cmp %g7, %g3 ! Did it work? bne,pn CCCR, 1b ! No, try again - EMPTY + .empty 2: #ifdef NOT_DEBUG set _C_LABEL(intrdebug), %g7 @@ -3662,7 +3662,7 @@ CASPTR [%l4] ASI_N, %l2, %l7 ! Grab the entire list cmp %l7, %l2 bne,pn CCCR, 1b - EMPTY + .empty 2: add %sp, CC64FSZ+STKB, %o2 ! tf = %sp + CC64FSZ + STKB LDPTR [%l2 + IH_PEND], %l7 ! save ih->ih_pending @@ -5574,7 +5574,7 @@ ! check for common case first: everything lines up. ! btst 7, %o0 ! done already bne 1f - EMPTY + .empty btst 7, %o1 be,a Lcopyin_doubles dec 8, %o2 ! if all lined up, len -= 8, goto copyin_doubes @@ -5765,7 +5765,7 @@ */ deccc %o2 ! while (--len >= 0) bl 1f - EMPTY + .empty 0: inc %o0 ldsb [%o0 - 1], %o4! (++dst)[-1] = *src++; @@ -5785,7 +5785,7 @@ ! check for common case first: everything lines up. ! btst 7, %o0 ! done already bne 1f - EMPTY + .empty btst 7, %o1 be,a Lcopyout_doubles dec 8, %o2 ! if all lined up, len -= 8, goto copyout_doubes @@ -6144,7 +6144,7 @@ ENTRY(fuword) btst 3, %o0 ! has low bits set... bnz Lfsbadaddr ! go return -1 - EMPTY + .empty sethi %hi(CPCB), %o2 ! cpcb->pcb_onfault = Lfserr; set Lfserr, %o3 LDPTR [%o2 + %lo(CPCB)], %o2 @@ -6224,7 +6224,7 @@ ENTRY(suword) btst 3, %o0 ! or has low bits set ... bnz Lfsbadaddr ! go return error - EMPTY + .empty sethi %hi(CPCB), %o2 ! cpcb->pcb_onfault = Lfserr; LDPTR [%o2 + %lo(CPCB)], %o2 set Lfserr, %o3 @@ -6814,7 +6814,7 @@ */ deccc %o2 ! while (--len >= 0) bl 1f - EMPTY + .empty 0: ldsb [%o0], %o4 ! *dst++ = *src++; inc %o0 @@ -6837,7 +6837,7 @@ ! check for common case first: everything lines up. ! btst 7, %o0 ! done already bne 1f - EMPTY + .empty btst 7, %o1 be,a Lkcopy_doubles dec 8, %o2 ! if all lined up, len -= 8, goto kcopy_doubes @@ -7341,7 +7341,7 @@ CASPTR [%o3] ASI_N, %o5, %o4 cmp %o4, %o5 ! Did it work? bne,pn CCCR, 2b ! No, try again - EMPTY + .empty mov 1, %o4 ! Change from level to bitmask sllx %o4, %o1, %o4 Index: src/sys/arch/sparc64/sparc64/memcpyset.s diff -u src/sys/arch/sparc64/sparc64/memcpyset.s:1.1 src/sys/arch/sparc64/sparc64/memcpyset.s:1.2 --- src/sys/arch/sparc64/sparc64/memcpyset.s:1.1 Sat Mar 6 23:26:10 2010 +++ src/sys/arch/sparc64/sparc64/memcpyset.s Sun Mar 7 00:42:58 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: memcpyset.s,v 1.1 2010/03/06 23:26:10 mrg Exp $ */ +/* $NetBSD: memcpyset.s,v 1.2 2010/03/07 00:42:58 mrg Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath @@ -174,7 +174,7 @@ */ deccc %o2 ! while (--len >= 0) bl 1f - EMPTY + .empty 0: inc %o0 ldsb [%o0 - 1], %o4 ! (++dst)[-1] = *src++;
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: mrg Date: Sun Mar 7 00:42:08 UTC 2010 Modified Files: src/sys/arch/sparc/sparc: locore.s Log Message: gas has supported SPARC ".empty" for a long while; get rid of an ancient workaround. To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/sys/arch/sparc/sparc/locore.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/sparc/sparc/locore.s diff -u src/sys/arch/sparc/sparc/locore.s:1.255 src/sys/arch/sparc/sparc/locore.s:1.256 --- src/sys/arch/sparc/sparc/locore.s:1.255 Thu Jan 28 05:08:11 2010 +++ src/sys/arch/sparc/sparc/locore.s Sun Mar 7 00:42:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.255 2010/01/28 05:08:11 mrg Exp $ */ +/* $NetBSD: locore.s,v 1.256 2010/03/07 00:42:08 mrg Exp $ */ /* * Copyright (c) 1996 Paul Kranenburg @@ -75,18 +75,6 @@ #include -/* - * GNU assembler does not understand `.empty' directive; Sun assembler - * gripes about labels without it. To allow cross-compilation using - * the Sun assembler, and because .empty directives are useful documentation, - * we use this trick. - */ -#ifdef SUN_AS -#define EMPTY .empty -#else -#define EMPTY /* .empty */ -#endif - /* use as needed to align things on longword boundaries */ #define _ALIGN .align 4 @@ -1276,7 +1264,7 @@ cmp pte, -1; \ be,a 1f; andn addr, page_offset, pte; \ tst pte; \ - bne bad; EMPTY; \ + bne bad; .empty; \ andn addr, page_offset, pte; \ 1: @@ -1703,14 +1691,14 @@ st %g7, [%g6 + PCB_UW] ! cpcb->pcb_uw--; btst 7, %sp ! if not aligned, bne ctw_invalid ! choke on it - EMPTY + .empty sethi %hi(_C_LABEL(pgofset)), %g6 ! trash %g6=curpcb ld [%g6 + %lo(_C_LABEL(pgofset))], %g6 PTE_OF_ADDR(%sp, %g7, ctw_invalid, %g6, NOP_ON_4M_1) CMP_PTE_USER_WRITE(%g7, %g5, NOP_ON_4M_2) ! likewise if not writable bne ctw_invalid - EMPTY + .empty /* Note side-effect of SLT_IF_1PAGE_RW: decrements %g6 by 62 */ SLT_IF_1PAGE_RW(%sp, %g7, %g6) bl,a ctw_merge ! all ok if only 1 @@ -2076,7 +2064,7 @@ btst PSR_PS, %l0 ! slowtrap() if from kernel bnz slowtrap - EMPTY + .empty ! clear fault status set SRMMU_SFSR, %l7 @@ -2099,7 +2087,7 @@ lda [%l7]ASI_SRMMU, %l6 ! fault status andcc %l6, SFSR_FAV, %l6 ! get fault status bits bnz slowtrap - EMPTY + .empty ! we got the insn; check whether it was a FLUSH ! instruction format: op=2, op3=0x3b (see also instr.h) @@ -2129,7 +2117,7 @@ set special_fp_store, %l4 ! see if we came from the special one cmp %l1, %l4 ! pc == special_fp_store? bne slowtrap ! no, go handle per usual - EMPTY + .empty sethi %hi(savefpcont), %l4 ! yes, "return" to the special code or %lo(savefpcont), %l4, %l4 jmp %l4 @@ -2205,17 +2193,17 @@ ld [%l6 + %lo(_EINTSTACKP)], %l7 cmp %sp, %l7 bge Lslowtrap_reenter - EMPTY + .empty set INT_STACK_SIZE, %l6 sub %l7, %l6, %l7 cmp %sp, %l7 blu Lslowtrap_reenter - EMPTY + .empty #else sethi %hi(_C_LABEL(eintstack)), %l7 cmp %sp, %l7 bge Lslowtrap_reenter - EMPTY + .empty #endif sethi %hi(cpcb), %l6 ld [%l6 + %lo(cpcb)], %l6 @@ -3413,14 +3401,14 @@ */ btst 7, %sp ! if unaligned, it is invalid bne winuf_invalid - EMPTY + .empty sethi %hi(_C_LABEL(pgofset)), %l4 ld [%l4 + %lo(_C_LABEL(pgofset))], %l4 PTE_OF_ADDR(%sp, %l7, winuf_invalid, %l4, NOP_ON_4M_5) CMP_PTE_USER_READ(%l7, %l5, NOP_ON_4M_6) ! if first page not readable, bne winuf_invalid ! it is invalid - EMPTY + .empty SLT_IF_1PAGE_RW(%sp, %l7, %l4) ! first page is readable bl,a winuf_ok ! if only one page, enter window X restore %g0, 1, %l1 ! and goto ok, & set %l1 to 1 @@ -3637,14 +3625,14 @@ 1: btst 7, %fp ! if unaligned, address is invalid bne rft_invalid - EMPTY + .empty sethi %hi(_C_LABEL(pgofset)), %l3 ld [%l3 + %lo(_C_LABEL(pgofset))], %l3 PTE_OF_ADDR(%fp, %l7, rft_invalid, %l3, NOP_ON_4M_9) CMP_PTE_USER_READ(%l7, %l5, NOP_ON_4M_10) ! try first page bne rft_invalid ! no good - EMPTY + .empty SLT_IF_1PAGE_RW(%fp, %l7, %l3) bl,a rft_user_ok ! only 1 page: ok wr %g0, 0, %wim @@ -5053,10 +5041,10 @@ set KERNBASE, %o2 cmp %o0, %o2 ! if addr >= KERNBASE... bgeu Lfsbadaddr - EMPTY + .empty btst 3, %o0 ! or has low bits set... bnz Lfsbadaddr ! go return -1 - EMPTY + .empty sethi %hi(cpcb), %o2 ! cpcb->pcb_onfault = Lfserr; ld [%o2 + %lo(cpcb)], %o2 set Lfserr, %o3 @@ -5090,7 +5078,7 @@ set KERNBASE, %o2 cmp %o0, %o2 ! if addr >= KERNBASE bgeu Lfsbadaddr ! return error - EMPTY + .empty sethi %hi(cpcb), %o2 ! cpcb->pcb_onfault = Lfsbail; ld [%o2 + %lo(cpcb)], %o2 set _C_LABEL(Lfsbail), %o3 @@ -5103,7 +5091,7 @@ set KERNBASE, %o2 cmp %o0, %o2 ! if addr >= KERNBASE bgeu Lfsbadaddr ! return error - EMPTY + .empty sethi %hi(cpcb), %o2 ! cpcb->pcb_onfault = Lfserr; ld [%o2 + %lo(cpcb)], %o2 set Lfserr, %o3 @@ -5117,7 +5105,7 @@
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: mrg Date: Sun Mar 7 00:42:08 UTC 2010 Modified Files: src/sys/arch/sparc/sparc: locore.s Log Message: gas has supported SPARC ".empty" for a long while; get rid of an ancient workaround. To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/sys/arch/sparc/sparc/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/distrib/sets
On Fri, Mar 05, 2010 at 12:05:20AM +0900, Masao Uebayashi wrote: > The difference between pkgsrc & base is that we don't have control of > sources in pkgsrc, which is the reason why we have build options. In > base (kernel + userland), we have control & fix code, and can make > everything modular. In theory. In practice, who's going to make the pam and krb stuff in e.g. su into plugins? Even if someone wants to take the time to try, it's a big can of worms... -- David A. Holland dholl...@netbsd.org
Re: CVS commit: [netbsd-5] src/sys/dev/ic
On Sun, Mar 07, 2010 at 12:13:38AM +0100, Bernd Ernesti wrote: > > Log Message: > > Pull up the following revisions(s) (requested by bouyer in ticket #1317): > >sys/dev/ic/ahcisata_core.c: revision 1.23 > > > > Move ahci_channel_start() after BSY has cleared (do not touch SError while > > BSY is asserted). Fixes random behaviour of Intel ESB2 controller with some > > models of Hitachi drives (serial console corruption/misfunction, > > misbehavior > > of USB controllers, crazy interrupts crashing the Xen hypervisor, etc.). > > That was maybe not such a good idea to pull it up: > http://mail-index.netbsd.org/current-users/2010/03/01/msg012774.html > http://mail-index.netbsd.org/current-users/2010/03/04/msg012810.html ...so how does a sata patch break usb? -- David A. Holland dholl...@netbsd.org
CVS commit: src/sys
Module Name:src Committed By: plunky Date: Sat Mar 6 23:45:40 UTC 2010 Modified Files: src/sys/arch/algor/conf: majors.algor src/sys/arch/alpha/conf: majors.alpha src/sys/arch/amd64/conf: majors.amd64 src/sys/arch/arm/conf: majors.arm32 src/sys/arch/cobalt/conf: majors.cobalt src/sys/arch/evbmips/conf: majors.evbmips src/sys/arch/evbppc/conf: majors.evbppc src/sys/arch/hpcarm/conf: majors.hpcarm src/sys/arch/hpcmips/conf: majors.hpcmips src/sys/arch/i386/conf: majors.i386 src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/landisk/conf: majors.landisk src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/sgimips/conf: majors.sgimips src/sys/arch/sparc/conf: majors.sparc src/sys/arch/sparc64/conf: majors.sparc64 src/sys/arch/x68k/conf: majors.x68k src/sys/arch/zaurus/conf: majors.zaurus src/sys/conf: majors Log Message: use a MI major number for uhso(4) driver (requested by mrg) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/conf/majors.algor cvs rdiff -u -r1.24 -r1.25 src/sys/arch/alpha/conf/majors.alpha cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/conf/majors.amd64 cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/conf/majors.arm32 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cobalt/conf/majors.cobalt cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbmips/conf/majors.evbmips cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/conf/majors.evbppc cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcarm/conf/majors.hpcarm cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcmips/conf/majors.hpcmips cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/conf/majors.i386 cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/conf/majors.ia64 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/landisk/conf/majors.landisk cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/conf/majors.powerpc cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sgimips/conf/majors.sgimips cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/conf/majors.sparc cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/conf/majors.sparc64 cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x68k/conf/majors.x68k cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/conf/majors.zaurus cvs rdiff -u -r1.47 -r1.48 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: plunky Date: Sat Mar 6 23:45:40 UTC 2010 Modified Files: src/sys/arch/algor/conf: majors.algor src/sys/arch/alpha/conf: majors.alpha src/sys/arch/amd64/conf: majors.amd64 src/sys/arch/arm/conf: majors.arm32 src/sys/arch/cobalt/conf: majors.cobalt src/sys/arch/evbmips/conf: majors.evbmips src/sys/arch/evbppc/conf: majors.evbppc src/sys/arch/hpcarm/conf: majors.hpcarm src/sys/arch/hpcmips/conf: majors.hpcmips src/sys/arch/i386/conf: majors.i386 src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/landisk/conf: majors.landisk src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/sgimips/conf: majors.sgimips src/sys/arch/sparc/conf: majors.sparc src/sys/arch/sparc64/conf: majors.sparc64 src/sys/arch/x68k/conf: majors.x68k src/sys/arch/zaurus/conf: majors.zaurus src/sys/conf: majors Log Message: use a MI major number for uhso(4) driver (requested by mrg) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/conf/majors.algor cvs rdiff -u -r1.24 -r1.25 src/sys/arch/alpha/conf/majors.alpha cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/conf/majors.amd64 cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/conf/majors.arm32 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cobalt/conf/majors.cobalt cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbmips/conf/majors.evbmips cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/conf/majors.evbppc cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcarm/conf/majors.hpcarm cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcmips/conf/majors.hpcmips cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/conf/majors.i386 cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/conf/majors.ia64 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/landisk/conf/majors.landisk cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/conf/majors.powerpc cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sgimips/conf/majors.sgimips cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/conf/majors.sparc cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/conf/majors.sparc64 cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x68k/conf/majors.x68k cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/conf/majors.zaurus cvs rdiff -u -r1.47 -r1.48 src/sys/conf/majors 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/algor/conf/majors.algor diff -u src/sys/arch/algor/conf/majors.algor:1.20 src/sys/arch/algor/conf/majors.algor:1.21 --- src/sys/arch/algor/conf/majors.algor:1.20 Sat Mar 6 21:31:50 2010 +++ src/sys/arch/algor/conf/majors.algor Sat Mar 6 23:45:38 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.algor,v 1.20 2010/03/06 21:31:50 plunky Exp $ +# $NetBSD: majors.algor,v 1.21 2010/03/06 23:45:38 plunky Exp $ # # Device majors for algor # @@ -67,7 +67,6 @@ device-major ksyms char 69 ksyms device-major wsfont char 70 wsfont device-major nsmb char 71 nsmb -device-major uhso char 72 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/alpha/conf/majors.alpha diff -u src/sys/arch/alpha/conf/majors.alpha:1.24 src/sys/arch/alpha/conf/majors.alpha:1.25 --- src/sys/arch/alpha/conf/majors.alpha:1.24 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/alpha/conf/majors.alpha Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.alpha,v 1.24 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.alpha,v 1.25 2010/03/06 23:45:39 plunky Exp $ # # Device majors for alpha # @@ -76,7 +76,6 @@ device-major nsmb char 77 nsmb device-major joy char 78 joy device-major twe char 79 twe -device-major uhso char 80 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/amd64/conf/majors.amd64 diff -u src/sys/arch/amd64/conf/majors.amd64:1.22 src/sys/arch/amd64/conf/majors.amd64:1.23 --- src/sys/arch/amd64/conf/majors.amd64:1.22 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/amd64/conf/majors.amd64 Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.amd64,v 1.22 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.amd64,v 1.23 2010/03/06 23:45:39 plunky Exp $ # # Device majors for amd64 # @@ -89,7 +89,6 @@ device-major dpt char 96 dpt device-major twe char 97 twe device-major nsmb char 98 nsmb -device-major uhso char 99 uhso # # Device majors for Xen. These are assigned here so that: Index: src/sys/arch/arm/conf/majors.arm32 diff -u src/sys/arch/arm/conf/majors.arm32:1.30 src/sys/arch/arm/conf/majors.arm32:1.31 --- src/sys/arch/arm/conf/majors.arm32:1.30 Sat Mar 6 21:31:51 2010 +++ src/sys/arch/arm/conf/majors.arm32 Sat Mar 6 23:45:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.arm32,v 1.30 2010/03/06 21:31:51 plunky Exp $ +# $NetBSD: majors.arm32,v 1.31 2010/03/06 23:45:39 plunky Exp $ #
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: mrg Date: Sat Mar 6 23:26:10 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 src/sys/arch/sparc64/sparc64: locore.s Added Files: src/sys/arch/sparc64/include: locore.h src/sys/arch/sparc64/sparc64: memcpyset.s Log Message: move the memcpy/memset implementations out into their own file, with the block copy versions as well. move some of the definitions in locore.s into a new locore.h. locore.s is almost 2000 lines shorter with this change. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/sys/arch/sparc64/conf/files.sparc64 cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/include/locore.h cvs rdiff -u -r1.322 -r1.323 src/sys/arch/sparc64/sparc64/locore.s cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/sparc64/memcpyset.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 23:21:18 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1320 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-5.0.3 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-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.5 src/doc/CHANGES-5.0.3:1.1.2.6 --- src/doc/CHANGES-5.0.3:1.1.2.5 Mon Feb 22 16:07:24 2010 +++ src/doc/CHANGES-5.0.3 Sat Mar 6 23:21:18 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.5 2010/02/22 16:07:24 snj Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.6 2010/03/06 23:21:18 sborrill Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -152,3 +152,9 @@ Fix ticket #793: s/setfunc_trampoline/lwp_trampoline/. [skrll, ticket #1312] +crypto/dist/openssl/crypto/evp/m_sha1.c patch + + Ensure that SHA384 always calls the SHA384 functions. + Should fix PR#42881. + [joerg, ticket #1320] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 23:21:18 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1320 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-5.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch
> Module Name: src > Committed By: plunky > Date: Sat Mar 6 21:31:52 UTC 2010 > > Modified Files: > src/sys/arch/algor/conf: majors.algor > src/sys/arch/alpha/conf: majors.alpha > src/sys/arch/amd64/conf: majors.amd64 > src/sys/arch/arm/conf: majors.arm32 > src/sys/arch/cobalt/conf: majors.cobalt > src/sys/arch/evbmips/conf: majors.evbmips > src/sys/arch/evbppc/conf: majors.evbppc > src/sys/arch/hpcarm/conf: majors.hpcarm > src/sys/arch/hpcmips/conf: majors.hpcmips > src/sys/arch/ia64/conf: majors.ia64 > src/sys/arch/landisk/conf: majors.landisk > src/sys/arch/powerpc/conf: majors.powerpc > src/sys/arch/sgimips/conf: majors.sgimips > src/sys/arch/sparc/conf: majors.sparc > src/sys/arch/sparc64/conf: majors.sparc64 > src/sys/arch/x68k/conf: majors.x68k > src/sys/arch/zaurus/conf: majors.zaurus > > Log Message: > add major device for usho(4) driver Why not in MI sys/conf/majors? --- Izumi Tsutsui
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/crypto/evp
Module Name:src
Committed By: sborrill
Date: Sat Mar 6 23:20:03 UTC 2010
Modified Files:
src/crypto/dist/openssl/crypto/evp [netbsd-5-0]: m_sha1.c
Log Message:
Pull up the following revisions(s) (requested by joerg in ticket #1320):
crypto/dist/openssl/crypto/evp/m_sha1.c:patch
Ensure that SHA384 always calls the SHA384 functions.
Should fix PR#42881.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.2 \
src/crypto/dist/openssl/crypto/evp/m_sha1.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/crypto/evp/m_sha1.c
diff -u src/crypto/dist/openssl/crypto/evp/m_sha1.c:1.1.1.5.8.1 src/crypto/dist/openssl/crypto/evp/m_sha1.c:1.1.1.5.8.2
--- src/crypto/dist/openssl/crypto/evp/m_sha1.c:1.1.1.5.8.1 Tue Jul 14 19:35:22 2009
+++ src/crypto/dist/openssl/crypto/evp/m_sha1.c Sat Mar 6 23:20:02 2010
@@ -158,8 +158,12 @@
static int init512(EVP_MD_CTX *ctx)
{ return SHA512_Init(ctx->md_data); }
/* See comment in SHA224/256 section */
+static int update384(EVP_MD_CTX *ctx,const void *data,size_t count)
+ { return SHA384_Update(ctx->md_data,data,count); }
static int update512(EVP_MD_CTX *ctx,const void *data,size_t count)
{ return SHA512_Update(ctx->md_data,data,count); }
+static int final384(EVP_MD_CTX *ctx,unsigned char *md)
+ { return SHA384_Final(md,ctx->md_data); }
static int final512(EVP_MD_CTX *ctx,unsigned char *md)
{ return SHA512_Final(md,ctx->md_data); }
@@ -170,8 +174,8 @@
SHA384_DIGEST_LENGTH,
EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
init384,
- update512,
- final512,
+ update384,
+ final384,
NULL,
NULL,
EVP_PKEY_RSA_method,
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/crypto/evp
Module Name:src Committed By: sborrill Date: Sat Mar 6 23:20:03 UTC 2010 Modified Files: src/crypto/dist/openssl/crypto/evp [netbsd-5-0]: m_sha1.c Log Message: Pull up the following revisions(s) (requested by joerg in ticket #1320): crypto/dist/openssl/crypto/evp/m_sha1.c:patch Ensure that SHA384 always calls the SHA384 functions. Should fix PR#42881. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.2 \ src/crypto/dist/openssl/crypto/evp/m_sha1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/lib/libedit
On Mar 7, 7:46am, takehiko.noz...@gmail.com (Takehiko NOZAKI) wrote: -- Subject: Re: CVS commit: src/lib/libedit | oh, i see. i don't recognize NARROW_READ flag. | source/binary compatibility are still **kept**, | i withdrawn previous mail, sorry. | | | BTW, this hack is not good for MB_CUR_MAX > 1 case. | if el_set(EL_GETCFN) called without EL_BUILTIN_GETCFN, | we can't treat multibyte correctly. | # because where we convert multibyte -> wide-character is | # EL_BUILTIN_GETCFN(=3Dread_char) itself. Totally agree, but there is other breakage for the non UTF8 and MB_CUR_MAX > 1 case. christos
Re: CVS commit: [netbsd-5] src/sys/dev/ic
On Sat, Mar 06, 2010 at 10:10:46PM +, Stephen Borrill wrote: > Module Name: src > Committed By: sborrill > Date: Sat Mar 6 22:10:46 UTC 2010 > > Modified Files: > src/sys/dev/ic [netbsd-5]: ahcisata_core.c > > Log Message: > Pull up the following revisions(s) (requested by bouyer in ticket #1317): > sys/dev/ic/ahcisata_core.c: revision 1.23 > > Move ahci_channel_start() after BSY has cleared (do not touch SError while > BSY is asserted). Fixes random behaviour of Intel ESB2 controller with some > models of Hitachi drives (serial console corruption/misfunction, misbehavior > of USB controllers, crazy interrupts crashing the Xen hypervisor, etc.). That was maybe not such a good idea to pull it up: http://mail-index.netbsd.org/current-users/2010/03/01/msg012774.html http://mail-index.netbsd.org/current-users/2010/03/04/msg012810.html Bernd
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:58:27 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1320 To generate a diff of this commit: cvs rdiff -u -r1.1.2.209 -r1.1.2.210 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:58:27 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1320 To generate a diff of this commit: cvs rdiff -u -r1.1.2.209 -r1.1.2.210 src/doc/CHANGES-5.1 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-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.209 src/doc/CHANGES-5.1:1.1.2.210 --- src/doc/CHANGES-5.1:1.1.2.209 Sat Mar 6 22:48:46 2010 +++ src/doc/CHANGES-5.1 Sat Mar 6 22:58:27 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.209 2010/03/06 22:48:46 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.210 2010/03/06 22:58:27 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16893,3 +16893,9 @@ Fixes PR/42811. Improve print order. [skrll, ticket #1318] +crypto/dist/openssl/crypto/evp/m_sha1.c patch + + Ensure that SHA384 always calls the SHA384 functions. + Should fix PR#42881. + [joerg, ticket #1320] +
CVS commit: [netbsd-5] src/crypto/dist/openssl/crypto/evp
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:57:49 UTC 2010 Modified Files: src/crypto/dist/openssl/crypto/evp [netbsd-5]: m_sha1.c Log Message: Pull up the following revisions(s) (requested by joerg in ticket #1320): crypto/dist/openssl/crypto/evp/m_sha1.c:patch Ensure that SHA384 always calls the SHA384 functions. Should fix PR#42881. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5.4.1 -r1.1.1.5.4.2 \ src/crypto/dist/openssl/crypto/evp/m_sha1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/crypto/dist/openssl/crypto/evp
Module Name:src
Committed By: sborrill
Date: Sat Mar 6 22:57:49 UTC 2010
Modified Files:
src/crypto/dist/openssl/crypto/evp [netbsd-5]: m_sha1.c
Log Message:
Pull up the following revisions(s) (requested by joerg in ticket #1320):
crypto/dist/openssl/crypto/evp/m_sha1.c:patch
Ensure that SHA384 always calls the SHA384 functions.
Should fix PR#42881.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.4.1 -r1.1.1.5.4.2 \
src/crypto/dist/openssl/crypto/evp/m_sha1.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/crypto/evp/m_sha1.c
diff -u src/crypto/dist/openssl/crypto/evp/m_sha1.c:1.1.1.5.4.1 src/crypto/dist/openssl/crypto/evp/m_sha1.c:1.1.1.5.4.2
--- src/crypto/dist/openssl/crypto/evp/m_sha1.c:1.1.1.5.4.1 Tue Jul 14 19:48:03 2009
+++ src/crypto/dist/openssl/crypto/evp/m_sha1.c Sat Mar 6 22:57:49 2010
@@ -158,8 +158,12 @@
static int init512(EVP_MD_CTX *ctx)
{ return SHA512_Init(ctx->md_data); }
/* See comment in SHA224/256 section */
+static int update384(EVP_MD_CTX *ctx,const void *data,size_t count)
+ { return SHA384_Update(ctx->md_data,data,count); }
static int update512(EVP_MD_CTX *ctx,const void *data,size_t count)
{ return SHA512_Update(ctx->md_data,data,count); }
+static int final384(EVP_MD_CTX *ctx,unsigned char *md)
+ { return SHA384_Final(md,ctx->md_data); }
static int final512(EVP_MD_CTX *ctx,unsigned char *md)
{ return SHA512_Final(md,ctx->md_data); }
@@ -170,8 +174,8 @@
SHA384_DIGEST_LENGTH,
EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
init384,
- update512,
- final512,
+ update384,
+ final384,
NULL,
NULL,
EVP_PKEY_RSA_method,
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:48:46 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1318 To generate a diff of this commit: cvs rdiff -u -r1.1.2.208 -r1.1.2.209 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:48:46 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1318 To generate a diff of this commit: cvs rdiff -u -r1.1.2.208 -r1.1.2.209 src/doc/CHANGES-5.1 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-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.208 src/doc/CHANGES-5.1:1.1.2.209 --- src/doc/CHANGES-5.1:1.1.2.208 Sat Mar 6 22:35:34 2010 +++ src/doc/CHANGES-5.1 Sat Mar 6 22:48:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.208 2010/03/06 22:35:34 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.209 2010/03/06 22:48:46 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16887,3 +16887,9 @@ are not desired. [joerg, ticket #1328] +usr.bin/ldd/ldd.c1.13 + + Mark each object as printed as visited and then print. + Fixes PR/42811. Improve print order. + [skrll, ticket #1318] +
CVS commit: [netbsd-5] src/usr.bin/ldd
Module Name:src
Committed By: sborrill
Date: Sat Mar 6 22:48:22 UTC 2010
Modified Files:
src/usr.bin/ldd [netbsd-5]: ldd.c
Log Message:
Pull up the following revisions(s) (requested by skrll in ticket #1318):
usr.bin/ldd/ldd.c: revision 1.13
Mark each object as printed as visited and then print. Fixes PR/42811.
Improve print order.
To generate a diff of this commit:
cvs rdiff -u -r1.2.12.2 -r1.2.12.3 src/usr.bin/ldd/ldd.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/ldd/ldd.c
diff -u src/usr.bin/ldd/ldd.c:1.2.12.2 src/usr.bin/ldd/ldd.c:1.2.12.3
--- src/usr.bin/ldd/ldd.c:1.2.12.2 Wed Feb 25 03:09:31 2009
+++ src/usr.bin/ldd/ldd.c Sat Mar 6 22:48:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd.c,v 1.2.12.2 2009/02/25 03:09:31 snj Exp $ */
+/* $NetBSD: ldd.c,v 1.2.12.3 2010/03/06 22:48:22 sborrill Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.2.12.2 2009/02/25 03:09:31 snj Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.2.12.3 2010/03/06 22:48:22 sborrill Exp $");
#endif /* not lint */
#include
@@ -283,10 +283,10 @@
const char *libname = obj->strtab + needed->name;
if (needed->obj != NULL) {
- print_needed(needed->obj, fmt1, fmt2);
if (!needed->obj->printed) {
fmtprint(libname, needed->obj, fmt1, fmt2);
needed->obj->printed = 1;
+print_needed(needed->obj, fmt1, fmt2);
}
} else {
fmtprint(libname, needed->obj, fmt1, fmt2);
CVS commit: [netbsd-5] src/usr.bin/ldd
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:48:22 UTC 2010 Modified Files: src/usr.bin/ldd [netbsd-5]: ldd.c Log Message: Pull up the following revisions(s) (requested by skrll in ticket #1318): usr.bin/ldd/ldd.c: revision 1.13 Mark each object as printed as visited and then print. Fixes PR/42811. Improve print order. To generate a diff of this commit: cvs rdiff -u -r1.2.12.2 -r1.2.12.3 src/usr.bin/ldd/ldd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/lib/libedit
oh, i see. i don't recognize NARROW_READ flag.
source/binary compatibility are still **kept**,
i withdrawn previous mail, sorry.
BTW, this hack is not good for MB_CUR_MAX > 1 case.
if el_set(EL_GETCFN) called without EL_BUILTIN_GETCFN,
we can't treat multibyte correctly.
# because where we convert multibyte -> wide-character is
# EL_BUILTIN_GETCFN(=read_char) itself.
very truly yours.
--
Takehiko NOZAKI
2010/3/7 Christos Zoulas :
> On Mar 7, Â 5:24am, takehiko.noz...@gmail.com (Takehiko NOZAKI) wrote:
> -- Subject: Re: CVS commit: src/lib/libedit
>
> | -typedef int (*el_rfunc_t)(EditLine *, char *);
> | +typedef int (*el_rfunc_t)(EditLine *, Char *);
> |
> | Â typedef struct el_read_t {
> |     el_rfunc_t    read_char;    /* Function to read a character */
> |
> |
> | what shoulld we do to solve this problem?
> | Â i believe tempolary backout this patch is the way we have to go.
>
> Are you sure? because the code handles the narrow case?
> (That is what the NARROW_READ flag is for.
>
> | # i'm now started completely rewriting wide-character support for libedit.
> | # but it still need lots of time.
>
> Good luck.
>
> christos
CVS commit: [netbsd-5] src
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:42:08 UTC 2010 Modified Files: src/dist/pf/sbin/pfctl [netbsd-5]: pfctl_altq.c src/gnu/dist/binutils/libiberty [netbsd-5]: floatformat.c src/gnu/dist/gcc4/libiberty [netbsd-5]: floatformat.c src/gnu/dist/gdb6/libiberty [netbsd-5]: floatformat.c src/usr.sbin/altq/libaltq [netbsd-5]: qop_hfsc.c Log Message: Pull up the following revisions(s) (requested by joerg in ticket #1328): usr.sbin/altq/libaltq/qop_hfsc.c: revision 1.9 dist/pf/sbin/pfctl/pfctl_altq.c:revision 1.9 gnu/dist/binutils/libiberty/floatformat.c: patch gnu/dist/gcc4/libiberty/floatformat.c: revision 1.2 gnu/dist/gdb6/libiberty/floatformat.c: revision 1.2 Fix standard-violating use of INFINITY in build of NetBSD/vax. Use HUGE_VAL instead of INFINITY as positive infinity (or maximum value) is good enough and the side effects of ISO C99 7.12 (4) are not desired. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.4.1 src/dist/pf/sbin/pfctl/pfctl_altq.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.32.1 \ src/gnu/dist/binutils/libiberty/floatformat.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.26.1 \ src/gnu/dist/gcc4/libiberty/floatformat.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.26.1 \ src/gnu/dist/gdb6/libiberty/floatformat.c cvs rdiff -u -r1.8 -r1.8.24.1 src/usr.sbin/altq/libaltq/qop_hfsc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src
Module Name:src
Committed By: sborrill
Date: Sat Mar 6 22:42:08 UTC 2010
Modified Files:
src/dist/pf/sbin/pfctl [netbsd-5]: pfctl_altq.c
src/gnu/dist/binutils/libiberty [netbsd-5]: floatformat.c
src/gnu/dist/gcc4/libiberty [netbsd-5]: floatformat.c
src/gnu/dist/gdb6/libiberty [netbsd-5]: floatformat.c
src/usr.sbin/altq/libaltq [netbsd-5]: qop_hfsc.c
Log Message:
Pull up the following revisions(s) (requested by joerg in ticket #1328):
usr.sbin/altq/libaltq/qop_hfsc.c: revision 1.9
dist/pf/sbin/pfctl/pfctl_altq.c:revision 1.9
gnu/dist/binutils/libiberty/floatformat.c: patch
gnu/dist/gcc4/libiberty/floatformat.c: revision 1.2
gnu/dist/gdb6/libiberty/floatformat.c: revision 1.2
Fix standard-violating use of INFINITY in build of NetBSD/vax.
Use HUGE_VAL instead of INFINITY as positive infinity (or maximum value)
is good enough and the side effects of ISO C99 7.12 (4) are not desired.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.4.1 src/dist/pf/sbin/pfctl/pfctl_altq.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.32.1 \
src/gnu/dist/binutils/libiberty/floatformat.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.26.1 \
src/gnu/dist/gcc4/libiberty/floatformat.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.26.1 \
src/gnu/dist/gdb6/libiberty/floatformat.c
cvs rdiff -u -r1.8 -r1.8.24.1 src/usr.sbin/altq/libaltq/qop_hfsc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pf/sbin/pfctl/pfctl_altq.c
diff -u src/dist/pf/sbin/pfctl/pfctl_altq.c:1.8 src/dist/pf/sbin/pfctl/pfctl_altq.c:1.8.4.1
--- src/dist/pf/sbin/pfctl/pfctl_altq.c:1.8 Wed Jun 18 09:06:26 2008
+++ src/dist/pf/sbin/pfctl/pfctl_altq.c Sat Mar 6 22:42:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pfctl_altq.c,v 1.8 2008/06/18 09:06:26 yamt Exp $ */
+/* $NetBSD: pfctl_altq.c,v 1.8.4.1 2010/03/06 22:42:08 sborrill Exp $ */
/* $OpenBSD: pfctl_altq.c,v 1.92 2007/05/27 05:15:17 claudio Exp $ */
/*
@@ -881,9 +881,6 @@
/*
* admission control using generalized service curve
*/
-#ifndef __NetBSD__
-#define INFINITY HUGE_VAL /* positive infinity defined in */
-#endif /* !__NetBSD__ */
/* add a new service curve to a generalized service curve */
static void
@@ -893,7 +890,7 @@
return;
if (sc->d != 0)
gsc_add_seg(gsc, 0.0, 0.0, (double)sc->d, (double)sc->m1);
- gsc_add_seg(gsc, (double)sc->d, 0.0, INFINITY, (double)sc->m2);
+ gsc_add_seg(gsc, (double)sc->d, 0.0, HUGE_VAL, (double)sc->m2);
}
/*
@@ -917,10 +914,10 @@
return (1);
}
/*
- * gsc has a dummy entry at the end with x = INFINITY.
+ * gsc has a dummy entry at the end with x = HUGE_VAL.
* loop through up to this dummy entry.
*/
- end = gsc_getentry(gsc, INFINITY);
+ end = gsc_getentry(gsc, HUGE_VAL);
if (end == NULL)
return (1);
last = NULL;
@@ -977,10 +974,10 @@
return (NULL);
new->x = x;
- if (x == INFINITY || s == NULL)
+ if (x == HUGE_VAL || s == NULL)
new->d = 0;
- else if (s->x == INFINITY)
- new->d = INFINITY;
+ else if (s->x == HUGE_VAL)
+ new->d = HUGE_VAL;
else
new->d = s->x - x;
if (prev == NULL) {
@@ -993,12 +990,12 @@
* the start point intersects with the segment pointed by
* prev. divide prev into 2 segments
*/
- if (x == INFINITY) {
- prev->d = INFINITY;
+ if (x == HUGE_VAL) {
+ prev->d = HUGE_VAL;
if (prev->m == 0)
new->y = prev->y;
else
-new->y = INFINITY;
+new->y = HUGE_VAL;
} else {
prev->d = x - prev->x;
new->y = prev->d * prev->m + prev->y;
@@ -1016,8 +1013,8 @@
struct segment *start, *end, *s;
double x2;
- if (d == INFINITY)
- x2 = INFINITY;
+ if (d == HUGE_VAL)
+ x2 = HUGE_VAL;
else
x2 = x + d;
start = gsc_getentry(gsc, x);
@@ -1030,7 +1027,7 @@
s->y += y + (s->x - x) * m;
}
- end = gsc_getentry(gsc, INFINITY);
+ end = gsc_getentry(gsc, HUGE_VAL);
for (; s != end; s = LIST_NEXT(s, _next)) {
s->y += m * d;
}
Index: src/gnu/dist/binutils/libiberty/floatformat.c
diff -u src/gnu/dist/binutils/libiberty/floatformat.c:1.1.1.2 src/gnu/dist/binutils/libiberty/floatformat.c:1.1.1.2.32.1
--- src/gnu/dist/binutils/libiberty/floatformat.c:1.1.1.2 Wed Dec 8 09:11:51 2004
+++ src/gnu/dist/binutils/libiberty/floatformat.c Sat Mar 6 22:42:08 2010
@@ -318,7 +318,11 @@
if (nan)
dto = NAN;
else
+#ifdef __vax__
+ dto = HUGE_VAL;
+#else
dto = INFINITY;
+#endif
if (get_field (ufrom, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1))
dto = -dto;
Index: src/gnu/dist/gcc4/libiberty/floatformat.c
diff -u src/gnu/dist/gcc4/libiberty/floatformat.c:1.1.1.1 src/gnu/dist/gcc4/libiberty/floatformat.c:1.1.1.1.26.1
--- src/gnu/dist/gcc4/libiberty/floatformat.c:1.1.1.1 Thu Apr 20 09:59:34 2006
+++ src/gnu/dist/gcc4/libiberty/floatformat.c Sat Mar 6 22:42:08 2010
@@ -351,7 +351,11 @@
if (nan)
dto = NAN;
else
+#ifdef __vax__
+ dto = HU
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:35:34 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1328 To generate a diff of this commit: cvs rdiff -u -r1.1.2.207 -r1.1.2.208 src/doc/CHANGES-5.1 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-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.207 src/doc/CHANGES-5.1:1.1.2.208 --- src/doc/CHANGES-5.1:1.1.2.207 Sat Mar 6 22:11:08 2010 +++ src/doc/CHANGES-5.1 Sat Mar 6 22:35:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.207 2010/03/06 22:11:08 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.208 2010/03/06 22:35:34 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16875,3 +16875,15 @@ crazy interrupts crashing the Xen hypervisor, etc.). [bouyer, ticket #1317] +usr.sbin/altq/libaltq/qop_hfsc.c 1.9 +dist/pf/sbin/pfctl/pfctl_altq.c 1.9 +gnu/dist/binutils/libiberty/floatformat.c patch +gnu/dist/gcc4/libiberty/floatformat.c 1.2 +gnu/dist/gdb6/libiberty/floatformat.c 1.2 + + Fix standard-violating use of INFINITY in build of NetBSD/vax. + Use HUGE_VAL instead of INFINITY as positive infinity (or maximum + value) is good enough and the side effects of ISO C99 7.12 (4) + are not desired. + [joerg, ticket #1328] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:35:34 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1328 To generate a diff of this commit: cvs rdiff -u -r1.1.2.207 -r1.1.2.208 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:11:08 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1317 To generate a diff of this commit: cvs rdiff -u -r1.1.2.206 -r1.1.2.207 src/doc/CHANGES-5.1 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-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.206 src/doc/CHANGES-5.1:1.1.2.207 --- src/doc/CHANGES-5.1:1.1.2.206 Sat Mar 6 22:03:19 2010 +++ src/doc/CHANGES-5.1 Sat Mar 6 22:11:08 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.206 2010/03/06 22:03:19 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.207 2010/03/06 22:11:08 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16866,3 +16866,12 @@ Use the GCC builtins if possible to implement them. [joerg, ticket #1315] +sys/dev/ic/ahcisata_core.c 1.23 + + Move ahci_channel_start() after BSY has cleared (do not touch + SError while BSY is asserted). Fixes random behaviour of Intel + ESB2 controller with some models of Hitachi drives (serial + console corruption/misfunction, misbehavior of USB controllers, + crazy interrupts crashing the Xen hypervisor, etc.). + [bouyer, ticket #1317] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:11:08 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1317 To generate a diff of this commit: cvs rdiff -u -r1.1.2.206 -r1.1.2.207 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/ic
Module Name:src
Committed By: sborrill
Date: Sat Mar 6 22:10:46 UTC 2010
Modified Files:
src/sys/dev/ic [netbsd-5]: ahcisata_core.c
Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #1317):
sys/dev/ic/ahcisata_core.c: revision 1.23
Move ahci_channel_start() after BSY has cleared (do not touch SError while
BSY is asserted). Fixes random behaviour of Intel ESB2 controller with some
models of Hitachi drives (serial console corruption/misfunction, misbehavior
of USB controllers, crazy interrupts crashing the Xen hypervisor, etc.).
To generate a diff of this commit:
cvs rdiff -u -r1.18.4.1 -r1.18.4.2 src/sys/dev/ic/ahcisata_core.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/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.18.4.1 src/sys/dev/ic/ahcisata_core.c:1.18.4.2
--- src/sys/dev/ic/ahcisata_core.c:1.18.4.1 Thu Feb 19 20:30:15 2009
+++ src/sys/dev/ic/ahcisata_core.c Sat Mar 6 22:10:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.18.4.1 2009/02/19 20:30:15 snj Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.18.4.2 2010/03/06 22:10:46 sborrill Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.18.4.1 2009/02/19 20:30:15 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.18.4.2 2010/03/06 22:10:46 sborrill Exp $");
#include
#include
@@ -510,7 +510,6 @@
chp->ch_queue->active_xfer->c_kill_xfer(chp,
chp->ch_queue->active_xfer, KILL_RESET);
}
- ahci_channel_start(sc, chp);
/* wait 31s for BSY to clear */
for (i = 0; i <3100; i++) {
tfd = AHCI_READ(sc, AHCI_P_TFD(chp->ch_channel));
@@ -526,6 +525,8 @@
DEBUG_PROBE);
/* clear port interrupt register */
AHCI_WRITE(sc, AHCI_P_IS(chp->ch_channel), 0x);
+ /* and start channel */
+ ahci_channel_start(sc, chp);
return;
}
@@ -570,8 +571,6 @@
switch (sata_reset_interface(chp, sc->sc_ahcit, achp->ahcic_scontrol,
achp->ahcic_sstatus)) {
case SStatus_DET_DEV:
- /* clear SErrors and start operations */
- ahci_channel_start(sc, chp);
/* wait 31s for BSY to clear */
for (i = 0; i <3100; i++) {
sig = AHCI_READ(sc, AHCI_P_TFD(chp->ch_channel));
@@ -580,9 +579,11 @@
break;
tsleep(&sc, PRIBIO, "ahcid2h", mstohz(10));
}
- if (i == 1500)
+ if (i == 1500) {
aprint_error("%s: BSY never cleared, TD 0x%x\n",
AHCINAME(sc), sig);
+ return;
+ }
AHCIDEBUG_PRINT(("%s: BSY took %d ms\n", AHCINAME(sc), i * 10),
DEBUG_PROBE);
sig = AHCI_READ(sc, AHCI_P_SIG(chp->ch_channel));
@@ -599,7 +600,11 @@
} else
chp->ch_drive[0].drive_flags |= DRIVE_ATA;
splx(s);
- /* enable interrupts */
+ /* clear port interrupt register */
+ AHCI_WRITE(sc, AHCI_P_IS(chp->ch_channel), 0x);
+ /* start channel */
+ ahci_channel_start(sc, chp);
+ /* and enable interrupts */
AHCI_WRITE(sc, AHCI_P_IE(chp->ch_channel),
AHCI_P_IX_TFES | AHCI_P_IX_HBFS | AHCI_P_IX_IFS |
AHCI_P_IX_OFS | AHCI_P_IX_DPS | AHCI_P_IX_UFS |
CVS commit: [netbsd-5] src/sys/dev/ic
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:10:46 UTC 2010 Modified Files: src/sys/dev/ic [netbsd-5]: ahcisata_core.c Log Message: Pull up the following revisions(s) (requested by bouyer in ticket #1317): sys/dev/ic/ahcisata_core.c: revision 1.23 Move ahci_channel_start() after BSY has cleared (do not touch SError while BSY is asserted). Fixes random behaviour of Intel ESB2 controller with some models of Hitachi drives (serial console corruption/misfunction, misbehavior of USB controllers, crazy interrupts crashing the Xen hypervisor, etc.). To generate a diff of this commit: cvs rdiff -u -r1.18.4.1 -r1.18.4.2 src/sys/dev/ic/ahcisata_core.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:03:19 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1315 To generate a diff of this commit: cvs rdiff -u -r1.1.2.205 -r1.1.2.206 src/doc/CHANGES-5.1 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-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.205 src/doc/CHANGES-5.1:1.1.2.206 --- src/doc/CHANGES-5.1:1.1.2.205 Sat Mar 6 21:19:49 2010 +++ src/doc/CHANGES-5.1 Sat Mar 6 22:03:19 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.205 2010/03/06 21:19:49 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.206 2010/03/06 22:03:19 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16859,3 +16859,10 @@ and FreeBSD versions of "wc". [tron, ticket #1313] +include/math.h 1.51 + + Address PR#36988: ISO C99 mandates that HUGE_VAL, HUGE_VALF, + HUGE_VALL and INFINITY are constant expressions. + Use the GCC builtins if possible to implement them. + [joerg, ticket #1315] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:03:19 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1315 To generate a diff of this commit: cvs rdiff -u -r1.1.2.205 -r1.1.2.206 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/include
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:02:41 UTC 2010 Modified Files: src/include [netbsd-5]: math.h Log Message: Pull up the following revisions(s) (requested by joerg in ticket #1315): include/math.h: revision 1.51 Address PR#36988: ISO C99 mandates that HUGE_VAL, HUGE_VALF, HUGE_VALL and INFINITY are constant expressions. Use the GCC builtins if possible to implement them. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.47.8.1 src/include/math.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/math.h diff -u src/include/math.h:1.47 src/include/math.h:1.47.8.1 --- src/include/math.h:1.47 Fri Apr 25 21:20:57 2008 +++ src/include/math.h Sat Mar 6 22:02:41 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: math.h,v 1.47 2008/04/25 21:20:57 christos Exp $ */ +/* $NetBSD: math.h,v 1.47.8.1 2010/03/06 22:02:41 sborrill Exp $ */ /* * @@ -59,8 +59,12 @@ * ANSI/POSIX */ /* 7.12#3 HUGE_VAL, HUGELF, HUGE_VALL */ +#if __GNUC_PREREQ__(3, 3) +#define HUGE_VAL __builtin_huge_val() +#else extern const union __double_u __infinity; #define HUGE_VAL __infinity.__val +#endif /* * ISO C99 @@ -72,14 +76,21 @@ ((_XOPEN_SOURCE - 0) >= 600) || \ defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE) /* 7.12#3 HUGE_VAL, HUGELF, HUGE_VALL */ +#if __GNUC_PREREQ__(3, 3) +#define HUGE_VALF __builtin_huge_valf() +#define HUGE_VALL __builtin_huge_vall() +#else extern const union __float_u __infinityf; #define HUGE_VALF __infinityf.__val extern const union __long_double_u __infinityl; #define HUGE_VALL __infinityl.__val +#endif /* 7.12#4 INFINITY */ -#ifdef __INFINITY +#if __GNUC_PREREQ__(3, 3) +#define INFINITY __builtin_inff() +#elif defined(__INFINITY) #define INFINITY __INFINITY /* float constant which overflows */ #else #define INFINITY HUGE_VALF /* positive infinity */
CVS commit: [netbsd-5] src/include
Module Name:src Committed By: sborrill Date: Sat Mar 6 22:02:41 UTC 2010 Modified Files: src/include [netbsd-5]: math.h Log Message: Pull up the following revisions(s) (requested by joerg in ticket #1315): include/math.h: revision 1.51 Address PR#36988: ISO C99 mandates that HUGE_VAL, HUGE_VALF, HUGE_VALL and INFINITY are constant expressions. Use the GCC builtins if possible to implement them. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.47.8.1 src/include/math.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Mar 6 22:02:31 UTC 2010 Modified Files: src/share/man/man9: sched_m2.9 Log Message: Fix typos and sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/sched_m2.9 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/man9/sched_m2.9 diff -u src/share/man/man9/sched_m2.9:1.1 src/share/man/man9/sched_m2.9:1.2 --- src/share/man/man9/sched_m2.9:1.1 Sat Mar 6 16:42:56 2010 +++ src/share/man/man9/sched_m2.9 Sat Mar 6 22:02:31 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sched_m2.9,v 1.1 2010/03/06 16:42:56 dsieger Exp $ +.\" $NetBSD: sched_m2.9,v 1.2 2010/03/06 22:02:31 wiz Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -36,8 +36,8 @@ .Sh SYNOPSIS .In sys/sched.h .Sh DESCRIPTION -The M2 scheduler implements a scheduling algortithm similar to -the scheduler implementaions of UNIX System V Release 4 and Solaris. +The M2 scheduler implements a scheduling algorithm similar to +the scheduler implementations of UNIX System V Release 4 and Solaris. .Sh CODE REFERENCES This section describes places within the .Nx @@ -49,9 +49,9 @@ .Pa sys/kern/sched_m2.c . .Sh SEE ALSO .Xr csf 9 , -.Xr sched_4bsd 9 , .Xr hardclock 9 , .Xr mi_switch 9 , +.Xr sched_4bsd 9 , .Xr userret 9 .Rs .%A Berny Goodheart
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Mar 6 22:02:31 UTC 2010 Modified Files: src/share/man/man9: sched_m2.9 Log Message: Fix typos and sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/sched_m2.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Mar 6 22:02:15 UTC 2010 Modified Files: src/share/man/man9: sched_4bsd.9 Log Message: Fix Xr and sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/sched_4bsd.9 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/man9/sched_4bsd.9 diff -u src/share/man/man9/sched_4bsd.9:1.5 src/share/man/man9/sched_4bsd.9:1.6 --- src/share/man/man9/sched_4bsd.9:1.5 Sat Mar 6 16:42:56 2010 +++ src/share/man/man9/sched_4bsd.9 Sat Mar 6 22:02:15 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sched_4bsd.9,v 1.5 2010/03/06 16:42:56 dsieger Exp $ +.\" $NetBSD: sched_4bsd.9,v 1.6 2010/03/06 22:02:15 wiz Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -87,9 +87,9 @@ .Pa sys/kern/sched_4bsd.c . .Sh SEE ALSO .Xr csf 9 , -.Xr sched_m2 , .Xr hardclock 9 , .Xr mi_switch 9 , +.Xr sched_m2 9 , .Xr userret 9 .Rs .%A Marshall Kirk McKusick
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Mar 6 22:02:15 UTC 2010 Modified Files: src/share/man/man9: sched_4bsd.9 Log Message: Fix Xr and sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/sched_4bsd.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sat Mar 6 22:00:22 UTC 2010 Modified Files: src/share/man/man4: uhso.4 Log Message: Sort list of supported hardware. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/uhso.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/uhso.4 diff -u src/share/man/man4/uhso.4:1.1 src/share/man/man4/uhso.4:1.2 --- src/share/man/man4/uhso.4:1.1 Sat Mar 6 21:05:36 2010 +++ src/share/man/man4/uhso.4 Sat Mar 6 22:00:22 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: uhso.4,v 1.1 2010/03/06 21:05:36 plunky Exp $ +.\" $NetBSD: uhso.4,v 1.2 2010/03/06 22:00:22 wiz Exp $ .\" .\" Copyright (c) 2009 Iain Hibbert .\" All rights reserved. @@ -37,19 +37,19 @@ driver supports at least the following adapters: .Lp .Bl -tag -compact -offset indent -.It GlobeTrotter Max HSDPA +.It GlobeSurfer HSUPA .It GlobeSurfer iCON 7.2 -.It GlobeTrotter iCON 225 +.It GlobeTrotter Express 40x .It GlobeTrotter Express HSUPA .It GlobeTrotter HSUPA -.It GlobeSurfer HSUPA -.It GlobeTrotter iCON EDGE +.It GlobeTrotter Max HSDPA +.It GlobeTrotter Module 382 +.It GlobeTrotter iCON 225 .It GlobeTrotter iCON 321 .It GlobeTrotter iCON 322 -.It GlobeTrotter Express 40x .It GlobeTrotter iCON 401 -.It GlobeTrotter Module 382 .It GlobeTrotter iCON 505 +.It GlobeTrotter iCON EDGE .El .Sh DESCRIPTION The
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sat Mar 6 22:00:22 UTC 2010 Modified Files: src/share/man/man4: uhso.4 Log Message: Sort list of supported hardware. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/uhso.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: plunky Date: Sat Mar 6 21:33:20 UTC 2010 Modified Files: src/etc: MAKEDEV.tmpl Log Message: include ttyHS0 in usbs target [for uhso(4)] To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.131 src/etc/MAKEDEV.tmpl:1.132 --- src/etc/MAKEDEV.tmpl:1.131 Sat Mar 6 21:05:36 2010 +++ src/etc/MAKEDEV.tmpl Sat Mar 6 21:33:20 2010 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.131 2010/03/06 21:05:36 plunky Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.132 2010/03/06 21:33:20 plunky Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -798,6 +798,7 @@ makedev ulpt0 ulpt1 makedev ttyU0 ttyU1 makedev ttyY0 ttyY1 + makedev ttyHS0 makedev urio0 makedev uscanner0 uscanner1 makedev utoppy0 utoppy1
CVS commit: src/etc
Module Name:src Committed By: plunky Date: Sat Mar 6 21:33:20 UTC 2010 Modified Files: src/etc: MAKEDEV.tmpl Log Message: include ttyHS0 in usbs target [for uhso(4)] To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/lib/libedit
On Mar 7, 5:24am, takehiko.noz...@gmail.com (Takehiko NOZAKI) wrote:
-- Subject: Re: CVS commit: src/lib/libedit
| -typedef int (*el_rfunc_t)(EditLine *, char *);
| +typedef int (*el_rfunc_t)(EditLine *, Char *);
|
| typedef struct el_read_t {
| el_rfunc_t read_char; /* Function to read a character */
|
|
| what shoulld we do to solve this problem?
| i believe tempolary backout this patch is the way we have to go.
Are you sure? because the code handles the narrow case?
(That is what the NARROW_READ flag is for.
| # i'm now started completely rewriting wide-character support for libedit.
| # but it still need lots of time.
Good luck.
christos
CVS commit: src/sys/arch
Module Name:src Committed By: plunky Date: Sat Mar 6 21:31:52 UTC 2010 Modified Files: src/sys/arch/algor/conf: majors.algor src/sys/arch/alpha/conf: majors.alpha src/sys/arch/amd64/conf: majors.amd64 src/sys/arch/arm/conf: majors.arm32 src/sys/arch/cobalt/conf: majors.cobalt src/sys/arch/evbmips/conf: majors.evbmips src/sys/arch/evbppc/conf: majors.evbppc src/sys/arch/hpcarm/conf: majors.hpcarm src/sys/arch/hpcmips/conf: majors.hpcmips src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/landisk/conf: majors.landisk src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/sgimips/conf: majors.sgimips src/sys/arch/sparc/conf: majors.sparc src/sys/arch/sparc64/conf: majors.sparc64 src/sys/arch/x68k/conf: majors.x68k src/sys/arch/zaurus/conf: majors.zaurus Log Message: add major device for usho(4) driver To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/algor/conf/majors.algor cvs rdiff -u -r1.23 -r1.24 src/sys/arch/alpha/conf/majors.alpha cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/conf/majors.amd64 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/conf/majors.arm32 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/cobalt/conf/majors.cobalt cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbmips/conf/majors.evbmips cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/conf/majors.evbppc cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpcarm/conf/majors.hpcarm cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcmips/conf/majors.hpcmips cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/conf/majors.ia64 cvs rdiff -u -r1.4 -r1.5 src/sys/arch/landisk/conf/majors.landisk cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/conf/majors.powerpc cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sgimips/conf/majors.sgimips cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc/conf/majors.sparc cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc64/conf/majors.sparc64 cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x68k/conf/majors.x68k cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/conf/majors.zaurus Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: plunky Date: Sat Mar 6 21:31:52 UTC 2010 Modified Files: src/sys/arch/algor/conf: majors.algor src/sys/arch/alpha/conf: majors.alpha src/sys/arch/amd64/conf: majors.amd64 src/sys/arch/arm/conf: majors.arm32 src/sys/arch/cobalt/conf: majors.cobalt src/sys/arch/evbmips/conf: majors.evbmips src/sys/arch/evbppc/conf: majors.evbppc src/sys/arch/hpcarm/conf: majors.hpcarm src/sys/arch/hpcmips/conf: majors.hpcmips src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/landisk/conf: majors.landisk src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/sgimips/conf: majors.sgimips src/sys/arch/sparc/conf: majors.sparc src/sys/arch/sparc64/conf: majors.sparc64 src/sys/arch/x68k/conf: majors.x68k src/sys/arch/zaurus/conf: majors.zaurus Log Message: add major device for usho(4) driver To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/algor/conf/majors.algor cvs rdiff -u -r1.23 -r1.24 src/sys/arch/alpha/conf/majors.alpha cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/conf/majors.amd64 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/conf/majors.arm32 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/cobalt/conf/majors.cobalt cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbmips/conf/majors.evbmips cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/conf/majors.evbppc cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpcarm/conf/majors.hpcarm cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcmips/conf/majors.hpcmips cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/conf/majors.ia64 cvs rdiff -u -r1.4 -r1.5 src/sys/arch/landisk/conf/majors.landisk cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/conf/majors.powerpc cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sgimips/conf/majors.sgimips cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc/conf/majors.sparc cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc64/conf/majors.sparc64 cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x68k/conf/majors.x68k cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/conf/majors.zaurus 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/algor/conf/majors.algor diff -u src/sys/arch/algor/conf/majors.algor:1.19 src/sys/arch/algor/conf/majors.algor:1.20 --- src/sys/arch/algor/conf/majors.algor:1.19 Wed Nov 12 12:35:55 2008 +++ src/sys/arch/algor/conf/majors.algor Sat Mar 6 21:31:50 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.algor,v 1.19 2008/11/12 12:35:55 ad Exp $ +# $NetBSD: majors.algor,v 1.20 2010/03/06 21:31:50 plunky Exp $ # # Device majors for algor # @@ -67,6 +67,7 @@ device-major ksyms char 69 ksyms device-major wsfont char 70 wsfont device-major nsmb char 71 nsmb +device-major uhso char 72 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/alpha/conf/majors.alpha diff -u src/sys/arch/alpha/conf/majors.alpha:1.23 src/sys/arch/alpha/conf/majors.alpha:1.24 --- src/sys/arch/alpha/conf/majors.alpha:1.23 Wed Nov 12 12:35:56 2008 +++ src/sys/arch/alpha/conf/majors.alpha Sat Mar 6 21:31:51 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.alpha,v 1.23 2008/11/12 12:35:56 ad Exp $ +# $NetBSD: majors.alpha,v 1.24 2010/03/06 21:31:51 plunky Exp $ # # Device majors for alpha # @@ -76,6 +76,7 @@ device-major nsmb char 77 nsmb device-major joy char 78 joy device-major twe char 79 twe +device-major uhso char 80 uhso # Majors up to 143 are reserved for machine-dependant drivers. # New machine-independent driver majors are assigned in Index: src/sys/arch/amd64/conf/majors.amd64 diff -u src/sys/arch/amd64/conf/majors.amd64:1.21 src/sys/arch/amd64/conf/majors.amd64:1.22 --- src/sys/arch/amd64/conf/majors.amd64:1.21 Wed Nov 12 12:35:56 2008 +++ src/sys/arch/amd64/conf/majors.amd64 Sat Mar 6 21:31:51 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.amd64,v 1.21 2008/11/12 12:35:56 ad Exp $ +# $NetBSD: majors.amd64,v 1.22 2010/03/06 21:31:51 plunky Exp $ # # Device majors for amd64 # @@ -89,6 +89,7 @@ device-major dpt char 96 dpt device-major twe char 97 twe device-major nsmb char 98 nsmb +device-major uhso char 99 uhso # # Device majors for Xen. These are assigned here so that: Index: src/sys/arch/arm/conf/majors.arm32 diff -u src/sys/arch/arm/conf/majors.arm32:1.29 src/sys/arch/arm/conf/majors.arm32:1.30 --- src/sys/arch/arm/conf/majors.arm32:1.29 Wed Nov 12 12:35:57 2008 +++ src/sys/arch/arm/conf/majors.arm32 Sat Mar 6 21:31:51 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.arm32,v 1.29 2008/11/12 12:35:57 ad Exp $ +# $NetBSD: majors.arm32,v 1.30 2010/03/06 21:31:51 plunky Exp $ # # Device majors for arm32 # @@ -103,6 +103,7 @@ device-major tslcd char 108 tslcd device-major twe char 109 twe device-major nsmb char 110 nsmb +device-major uhso char 111 uhso # Majors up to 143 are reser
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Sat Mar 6 21:22:43 UTC 2010 Modified Files: src/sys/arch/hp700/hp700: locore.S src/sys/arch/hp700/include: cpu.h src/sys/arch/hppa/hppa: pmap.c src/sys/arch/hppa/include: pmap.h Log Message: Add #include "opt_cputype.h" where necessary. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hp700/hp700/locore.S cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hp700/include/cpu.h cvs rdiff -u -r1.69 -r1.70 src/sys/arch/hppa/hppa/pmap.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hppa/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Sat Mar 6 21:22:43 UTC 2010 Modified Files: src/sys/arch/hp700/hp700: locore.S src/sys/arch/hp700/include: cpu.h src/sys/arch/hppa/hppa: pmap.c src/sys/arch/hppa/include: pmap.h Log Message: Add #include "opt_cputype.h" where necessary. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hp700/hp700/locore.S cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hp700/include/cpu.h cvs rdiff -u -r1.69 -r1.70 src/sys/arch/hppa/hppa/pmap.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hppa/include/pmap.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/arch/hp700/hp700/locore.S diff -u src/sys/arch/hp700/hp700/locore.S:1.41 src/sys/arch/hp700/hp700/locore.S:1.42 --- src/sys/arch/hp700/hp700/locore.S:1.41 Thu Feb 18 21:38:32 2010 +++ src/sys/arch/hp700/hp700/locore.S Sat Mar 6 21:22:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.41 2010/02/18 21:38:32 skrll Exp $ */ +/* $NetBSD: locore.S,v 1.42 2010/03/06 21:22:42 skrll Exp $ */ /* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */ /* @@ -57,6 +57,7 @@ * suitability of this software for any purpose. */ +#include "opt_cputype.h" #include "opt_ddb.h" #include "opt_kgdb.h" #include "opt_lockdebug.h" Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.37 src/sys/arch/hp700/include/cpu.h:1.38 --- src/sys/arch/hp700/include/cpu.h:1.37 Wed Feb 17 11:33:51 2010 +++ src/sys/arch/hp700/include/cpu.h Sat Mar 6 21:22:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.37 2010/02/17 11:33:51 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.38 2010/03/06 21:22:42 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -53,6 +53,10 @@ #ifndef _MACHINE_CPU_H_ #define _MACHINE_CPU_H_ +#ifdef _KERNEL_OPT +#include "opt_cputype.h" +#endif + #include #include #include Index: src/sys/arch/hppa/hppa/pmap.c diff -u src/sys/arch/hppa/hppa/pmap.c:1.69 src/sys/arch/hppa/hppa/pmap.c:1.70 --- src/sys/arch/hppa/hppa/pmap.c:1.69 Wed Feb 24 06:38:53 2010 +++ src/sys/arch/hppa/hppa/pmap.c Sat Mar 6 21:22:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.69 2010/02/24 06:38:53 skrll Exp $ */ +/* $NetBSD: pmap.c,v 1.70 2010/03/06 21:22:42 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -65,7 +65,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.69 2010/02/24 06:38:53 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.70 2010/03/06 21:22:42 skrll Exp $"); + +#include "opt_cputype.h" #include #include Index: src/sys/arch/hppa/include/pmap.h diff -u src/sys/arch/hppa/include/pmap.h:1.24 src/sys/arch/hppa/include/pmap.h:1.25 --- src/sys/arch/hppa/include/pmap.h:1.24 Mon Feb 22 21:32:55 2010 +++ src/sys/arch/hppa/include/pmap.h Sat Mar 6 21:22:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.24 2010/02/22 21:32:55 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.25 2010/03/06 21:22:42 skrll Exp $ */ /* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */ @@ -35,6 +35,10 @@ #ifndef _HPPA_PMAP_H_ #define _HPPA_PMAP_H_ +#ifdef _KERNEL_OPT +#include "opt_cputype.h" +#endif + #include #include #include
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 21:19:49 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1313 To generate a diff of this commit: cvs rdiff -u -r1.1.2.204 -r1.1.2.205 src/doc/CHANGES-5.1 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-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.204 src/doc/CHANGES-5.1:1.1.2.205 --- src/doc/CHANGES-5.1:1.1.2.204 Sat Mar 6 21:06:07 2010 +++ src/doc/CHANGES-5.1 Sat Mar 6 21:19:49 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.204 2010/03/06 21:06:07 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.205 2010/03/06 21:19:49 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16852,3 +16852,10 @@ Addresses PR#42904. [oster, ticket #1325] +usr.bin/wc/wc.c 1.32-1.34 +usr.bin/wc/wc.1 1.14-1.15 + + Add support for "-L" option (longest line) as present in the GNU + and FreeBSD versions of "wc". + [tron, ticket #1313] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 21:19:49 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1313 To generate a diff of this commit: cvs rdiff -u -r1.1.2.204 -r1.1.2.205 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/usr.bin/wc
Module Name:src
Committed By: sborrill
Date: Sat Mar 6 21:19:11 UTC 2010
Modified Files:
src/usr.bin/wc [netbsd-5]: wc.1 wc.c
Log Message:
Pull up the following revisions(s) (requested by tron in ticket #1313):
usr.bin/wc/wc.c:revision 1.32-1.34
usr.bin/wc/wc.1:revision 1.14-1.15
Add support for "-L" option (longest line) as present in the GNU and
FreeBSD versions of "wc".
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.40.1 src/usr.bin/wc/wc.1
cvs rdiff -u -r1.31 -r1.31.4.1 src/usr.bin/wc/wc.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/wc/wc.1
diff -u src/usr.bin/wc/wc.1:1.13 src/usr.bin/wc/wc.1:1.13.40.1
--- src/usr.bin/wc/wc.1:1.13 Thu Aug 7 11:17:15 2003
+++ src/usr.bin/wc/wc.1 Sat Mar 6 21:19:11 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: wc.1,v 1.13 2003/08/07 11:17:15 agc Exp $
+.\" $NetBSD: wc.1,v 1.13.40.1 2010/03/06 21:19:11 sborrill Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" from: @(#)wc.1 8.2 (Berkeley) 4/19/94
.\"
-.Dd April 19, 1994
+.Dd February 18, 2010
.Dt WC 1
.Os
.Sh NAME
@@ -41,7 +41,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl c | Fl m
-.Op Fl lw
+.Op Fl Llw
.Op Ar file ...
.Sh DESCRIPTION
The
@@ -66,6 +66,9 @@
.It Fl c
The number of bytes in each input file
is written to the standard output.
+.It Fl L
+The number of characters in the longest line of each input file
+is written to the standard output.
.It Fl l
The number of lines in each input file
is written to the standard output.
@@ -81,9 +84,8 @@
.Nm
only
reports the
-information requested by that option. The
-default action is equivalent to all the
-flags
+information requested by that option.
+The default action is equivalent to all the flags
.Fl clw
having been specified.
.Pp
@@ -102,17 +104,20 @@
.Bd -literal -offset indent
lines words bytes file_name
.Ed
-.Pp
-The
-.Nm
-utility exits 0 on success, and \*[Gt]0 if an error occurs.
+.Sh EXIT STATUS
+.Ex -std wc
.Sh SEE ALSO
.Xr iswspace 3
.Sh COMPATIBILITY
Historically, the
.Nm
utility was documented to define a word as a ``maximal string of
-characters delimited by \*[Lt]space\*[Gt], \*[Lt]tab\*[Gt] or \*[Lt]newline\*[Gt] characters''.
+characters delimited by
+.Aq space ,
+.Aq tab
+or
+.Aq newline
+characters''.
The implementation, however, didn't handle non-printing characters
correctly so that `` ^D^E '' counted as 6 spaces, while ``foo^D^Ebar''
counted as 8 characters.
@@ -125,6 +130,15 @@
.Xr iswspace 3
function, as required by
.St -p1003.2 .
+.Pp
+The
+.Fl L
+option is a non-standard extension, compatible with the
+.Fl L
+option of the GNU and
+.Fx
+.Nm
+utilities.
.Sh STANDARDS
The
.Nm
Index: src/usr.bin/wc/wc.c
diff -u src/usr.bin/wc/wc.c:1.31 src/usr.bin/wc/wc.c:1.31.4.1
--- src/usr.bin/wc/wc.c:1.31 Mon Jul 21 14:19:28 2008
+++ src/usr.bin/wc/wc.c Sat Mar 6 21:19:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wc.c,v 1.31 2008/07/21 14:19:28 lukem Exp $ */
+/* $NetBSD: wc.c,v 1.31.4.1 2010/03/06 21:19:11 sborrill Exp $ */
/*
* Copyright (c) 1980, 1987, 1991, 1993
@@ -39,11 +39,11 @@
#if 0
static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
#else
-__RCSID("$NetBSD: wc.c,v 1.31 2008/07/21 14:19:28 lukem Exp $");
+__RCSID("$NetBSD: wc.c,v 1.31.4.1 2010/03/06 21:19:11 sborrill Exp $");
#endif
#endif /* not lint */
-/* wc line, word and char count */
+/* wc line, word, char count and optionally longest line. */
#include
#include
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -71,12 +72,13 @@
# define WCCAST unsigned long long
#endif
-static wc_count_t tlinect, twordct, tcharct;
-static int doline, doword, dobyte, dochar;
+static wc_count_t tlinect, twordct, tcharct, tlongest;
+static bool doline, doword, dobyte, dochar, dolongest;
static int rval = 0;
-static void cnt(char *);
-static void print_counts(wc_count_t, wc_count_t, wc_count_t, char *);
+static void cnt(const char *);
+static void print_counts(wc_count_t, wc_count_t, wc_count_t, wc_count_t,
+ const char *);
static void usage(void);
static size_t do_mb(wchar_t *, const char *, size_t, mbstate_t *,
size_t *, const char *);
@@ -89,21 +91,24 @@
setlocale(LC_ALL, "");
- while ((ch = getopt(argc, argv, "lwcm")) != -1)
+ while ((ch = getopt(argc, argv, "lwcmL")) != -1)
switch (ch) {
case 'l':
- doline = 1;
+ doline = true;
break;
case 'w':
- doword = 1;
+ doword = true;
break;
case 'm':
- dochar = 1;
+ dochar = true;
dobyte = 0;
break;
case 'c':
dochar = 0;
- dobyte = 1;
+ dobyte = true;
+ break;
+ case 'L':
+ dolongest = true;
break;
case '?':
default:
@@ -113,40 +118,42 @@
argc -= optind;
/* Wc's flags are on by default. */
- if (doline + doword + dobyte +
CVS commit: [netbsd-5] src/usr.bin/wc
Module Name:src Committed By: sborrill Date: Sat Mar 6 21:19:11 UTC 2010 Modified Files: src/usr.bin/wc [netbsd-5]: wc.1 wc.c Log Message: Pull up the following revisions(s) (requested by tron in ticket #1313): usr.bin/wc/wc.c:revision 1.32-1.34 usr.bin/wc/wc.1:revision 1.14-1.15 Add support for "-L" option (longest line) as present in the GNU and FreeBSD versions of "wc". To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.40.1 src/usr.bin/wc/wc.1 cvs rdiff -u -r1.31 -r1.31.4.1 src/usr.bin/wc/wc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: plunky Date: Sat Mar 6 21:15:17 UTC 2010 Modified Files: src/doc: CHANGES Log Message: add uhso(4) driver for Option N.V. Wireless WAN modems To generate a diff of this commit: cvs rdiff -u -r1.1367 -r1.1368 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.1367 src/doc/CHANGES:1.1368 --- src/doc/CHANGES:1.1367 Thu Mar 4 15:47:12 2010 +++ src/doc/CHANGES Sat Mar 6 21:15:17 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1367 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1368 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -562,3 +562,5 @@ ld.so_elf: Implement negative symbol lookup cache [roy 20100227] dhcpcd(8): Import dhcpcd-5.2.1. [roy 20100227] ne(4): Add proper support for NE2000 8 bit mode. [tsutsui 20090303] + uhso(4): Add a driver for Option N.V. Wireless WAN modems. + [plunky 20100306]
CVS commit: src/doc
Module Name:src Committed By: plunky Date: Sat Mar 6 21:15:17 UTC 2010 Modified Files: src/doc: CHANGES Log Message: add uhso(4) driver for Option N.V. Wireless WAN modems To generate a diff of this commit: cvs rdiff -u -r1.1367 -r1.1368 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: plunky Date: Sat Mar 6 21:12:04 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL GENERIC XBOX XEN3_DOM0 majors.i386 Log Message: add uhso(4) To generate a diff of this commit: cvs rdiff -u -r1.248 -r1.249 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.972 -r1.973 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/conf/XBOX cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/conf/majors.i386 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.248 src/sys/arch/i386/conf/ALL:1.249 --- src/sys/arch/i386/conf/ALL:1.248 Thu Mar 4 22:30:57 2010 +++ src/sys/arch/i386/conf/ALL Sat Mar 6 21:12:04 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.248 2010/03/04 22:30:57 jruoho Exp $ +# $NetBSD: ALL,v 1.249 2010/03/06 21:12:04 plunky 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.248 $" +#ident "ALL-$Revision: 1.249 $" maxusers 64 # estimated number of users @@ -1200,6 +1200,9 @@ umodem* at uhub? port ? configuration ? ucom* at umodem? +# Option N.V. Wireless WAN modems +uhso* at uhub? port ? configuration ? + # USB Mass Storage umass* at uhub? port ? configuration ? interface ? wd* at umass? Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.972 src/sys/arch/i386/conf/GENERIC:1.973 --- src/sys/arch/i386/conf/GENERIC:1.972 Sat Mar 6 04:28:53 2010 +++ src/sys/arch/i386/conf/GENERIC Sat Mar 6 21:12:04 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.972 2010/03/06 04:28:53 cnst Exp $ +# $NetBSD: GENERIC,v 1.973 2010/03/06 21:12:04 plunky Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.972 $" +#ident "GENERIC-$Revision: 1.973 $" maxusers 64 # estimated number of users @@ -1146,6 +1146,9 @@ umodem* at uhub? port ? configuration ? ucom* at umodem? +# Option N.V. Wireless WAN modems +uhso* at uhub? port ? configuration ? + # USB Mass Storage umass* at uhub? port ? configuration ? interface ? wd* at umass? Index: src/sys/arch/i386/conf/XBOX diff -u src/sys/arch/i386/conf/XBOX:1.20 src/sys/arch/i386/conf/XBOX:1.21 --- src/sys/arch/i386/conf/XBOX:1.20 Thu Jan 7 18:49:30 2010 +++ src/sys/arch/i386/conf/XBOX Sat Mar 6 21:12:04 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XBOX,v 1.20 2010/01/07 18:49:30 tnn Exp $ +# $NetBSD: XBOX,v 1.21 2010/03/06 21:12:04 plunky Exp $ # # XBOX -- A basic Microsoft XBox kernel config file. # @@ -203,6 +203,9 @@ umodem* at uhub? port ? configuration ? ucom* at umodem? +# Option N.V. Wireless WAN modems +uhso* at uhub? port ? configuration ? + # USB Mass Storage umass* at uhub? port ? configuration ? interface ? wd* at umass? Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.30 src/sys/arch/i386/conf/XEN3_DOM0:1.31 --- src/sys/arch/i386/conf/XEN3_DOM0:1.30 Sat Mar 6 04:33:24 2010 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Mar 6 21:12:04 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.30 2010/03/06 04:33:24 cnst Exp $ +# $NetBSD: XEN3_DOM0,v 1.31 2010/03/06 21:12:04 plunky Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -555,6 +555,9 @@ umodem* at uhub? port ? configuration ? ucom* at umodem? +# Option N.V. Wireless WAN modems +uhso* at uhub? port ? configuration ? + # USB Mass Storage umass* at uhub? port ? configuration ? interface ? wd* at umass? Index: src/sys/arch/i386/conf/majors.i386 diff -u src/sys/arch/i386/conf/majors.i386:1.37 src/sys/arch/i386/conf/majors.i386:1.38 --- src/sys/arch/i386/conf/majors.i386:1.37 Wed Nov 12 12:36:02 2008 +++ src/sys/arch/i386/conf/majors.i386 Sat Mar 6 21:12:04 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.i386,v 1.37 2008/11/12 12:36:02 ad Exp $ +# $NetBSD: majors.i386,v 1.38 2010/03/06 21:12:04 plunky Exp $ # # Device majors for i386 # @@ -104,6 +104,7 @@ device-major rd char 105 block 22 rd device-major ct char 106 block 23 ct device-major mt char 107 block 24 mt +device-major uhso char 108 uhso # # Device majors for Xen. These are assigned here so that:
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: plunky Date: Sat Mar 6 21:12:04 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL GENERIC XBOX XEN3_DOM0 majors.i386 Log Message: add uhso(4) To generate a diff of this commit: cvs rdiff -u -r1.248 -r1.249 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.972 -r1.973 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/conf/XBOX cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/conf/majors.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: plunky Date: Sat Mar 6 21:07:47 UTC 2010 Modified Files: src/sys/dev/usb: usb.h Log Message: add UHSO_DEBUG for uhso(4) driver To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/sys/dev/usb/usb.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: plunky Date: Sat Mar 6 21:07:47 UTC 2010 Modified Files: src/sys/dev/usb: usb.h Log Message: add UHSO_DEBUG for uhso(4) driver To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/sys/dev/usb/usb.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/usb/usb.h diff -u src/sys/dev/usb/usb.h:1.83 src/sys/dev/usb/usb.h:1.84 --- src/sys/dev/usb/usb.h:1.83 Fri Sep 4 17:55:48 2009 +++ src/sys/dev/usb/usb.h Sat Mar 6 21:07:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: usb.h,v 1.83 2009/09/04 17:55:48 dyoung Exp $ */ +/* $NetBSD: usb.h,v 1.84 2010/03/06 21:07:47 plunky Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */ /* @@ -88,6 +88,7 @@ #define AXE_DEBUG 1 #define UIPAQ_DEBUG 1 #define UCYCOM_DEBUG 1 +#define UHSO_DEBUG 1 #define Static #else #define Static static
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 21:06:07 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1325 To generate a diff of this commit: cvs rdiff -u -r1.1.2.203 -r1.1.2.204 src/doc/CHANGES-5.1 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-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.203 src/doc/CHANGES-5.1:1.1.2.204 --- src/doc/CHANGES-5.1:1.1.2.203 Sat Mar 6 20:56:44 2010 +++ src/doc/CHANGES-5.1 Sat Mar 6 21:06:07 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.203 2010/03/06 20:56:44 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.204 2010/03/06 21:06:07 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16845,3 +16845,10 @@ the amount of checking that needs to be done.) [oster, ticket #1324] +sys/dev/raidframe/rf_paritymap.c 1.4 + + Don't attempt to read or write component label stuff from/to 'dead + disks'. Update used spares with the correct parity map bits too. + Addresses PR#42904. + [oster, ticket #1325] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 21:06:07 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1325 To generate a diff of this commit: cvs rdiff -u -r1.1.2.203 -r1.1.2.204 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: plunky Date: Sat Mar 6 21:05:37 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/etc: MAKEDEV.tmpl src/share/man/man4: Makefile src/sys/dev: DEVNAMES src/sys/dev/usb: files.usb Added Files: src/share/man/man4: uhso.4 src/sys/dev/usb: uhso.c Log Message: Add uhso(4) driver and manpage for Option N.V. Wireless WAN modems To generate a diff of this commit: cvs rdiff -u -r1.1195 -r1.1196 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.130 -r1.131 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.509 -r1.510 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/uhso.4 cvs rdiff -u -r1.256 -r1.257 src/sys/dev/DEVNAMES cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/files.usb cvs rdiff -u -r0 -r1.1 src/sys/dev/usb/uhso.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/raidframe
Module Name:src Committed By: sborrill Date: Sat Mar 6 21:05:29 UTC 2010 Modified Files: src/sys/dev/raidframe [netbsd-5]: rf_paritymap.c Log Message: Pull up the following revisions(s) (requested by oster in ticket #1325): sys/dev/raidframe/rf_paritymap.c: revision 1.4 Don't attempt to read or write component label stuff from/to 'dead disks'. Update used spares with the correct parity map bits too. Addresses PR#42904. To generate a diff of this commit: cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/dev/raidframe/rf_paritymap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/raidframe
Module Name:src
Committed By: sborrill
Date: Sat Mar 6 21:05:29 UTC 2010
Modified Files:
src/sys/dev/raidframe [netbsd-5]: rf_paritymap.c
Log Message:
Pull up the following revisions(s) (requested by oster in ticket #1325):
sys/dev/raidframe/rf_paritymap.c: revision 1.4
Don't attempt to read or write component label stuff from/to 'dead
disks'. Update used spares with the correct parity map bits too.
Addresses PR#42904.
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/dev/raidframe/rf_paritymap.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/raidframe/rf_paritymap.c
diff -u src/sys/dev/raidframe/rf_paritymap.c:1.3.2.2 src/sys/dev/raidframe/rf_paritymap.c:1.3.2.3
--- src/sys/dev/raidframe/rf_paritymap.c:1.3.2.2 Thu Dec 10 23:01:44 2009
+++ src/sys/dev/raidframe/rf_paritymap.c Sat Mar 6 21:05:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritymap.c,v 1.3.2.2 2009/12/10 23:01:44 snj Exp $ */
+/* $NetBSD: rf_paritymap.c,v 1.3.2.3 2010/03/06 21:05:29 sborrill Exp $ */
/*-
* Copyright (c) 2009 Jed Davis.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.3.2.2 2009/12/10 23:01:44 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritymap.c,v 1.3.2.3 2010/03/06 21:05:29 sborrill Exp $");
#include
#include
@@ -359,12 +359,31 @@
if (todisk) {
raidPtr = pm->raid;
for (col = 0; col < raidPtr->numCol; col++) {
+ if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+continue;
+
clabel = raidget_component_label(raidPtr, col);
clabel->parity_map_ntick = cooldown;
clabel->parity_map_tickms = tickms;
clabel->parity_map_regions = regions;
+
+ /* Don't touch the disk if it's been spared */
+ if (clabel->status == rf_ds_spared)
+continue;
+
raidflush_component_label(raidPtr, col);
}
+
+ /* handle the spares too... */
+ for (col = 0; col < raidPtr->numSpare; col++) {
+ if (raidPtr->Disks[raidPtr->numCol+col].status == rf_ds_used_spare) {
+clabel = raidget_component_label(raidPtr, raidPtr->numCol+col);
+clabel->parity_map_ntick = cooldown;
+clabel->parity_map_tickms = tickms;
+clabel->parity_map_regions = regions;
+raidflush_component_label(raidPtr, raidPtr->numCol+col);
+ }
+ }
}
return 0;
}
@@ -603,6 +622,8 @@
*/
if (!force) {
for (col = 0; col < raidPtr->numCol; col++) {
+ if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+continue;
clabel = raidget_component_label(raidPtr, col);
flags = clabel->parity_map_flags;
/* Check for use by non-parity-map kernel. */
@@ -670,6 +691,8 @@
/* Alter labels in-core to reflect the current view of things. */
for (col = 0; col < raidPtr->numCol; col++) {
+ if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+ continue;
clabel = raidget_component_label(raidPtr, col);
if (pm_use)
@@ -683,12 +706,13 @@
clabel->parity_map_regions = g_regions;
raidflush_component_label(raidPtr, col);
}
+ /* Note that we're just in 'attach' here, and there won't
+ be any spare disks at this point. */
}
/*
* For initializing the parity-map fields of a component label, both on
- * initial creation and on reconstruct/copyback/etc.
- */
+ * initial creation and on reconstruct/copyback/etc. */
void
rf_paritymap_init_label(struct rf_paritymap *pm, RF_ComponentLabel_t *clabel)
{
@@ -724,10 +748,19 @@
dis = 0;
for (col = 0; col < raidPtr->numCol; col++) {
+ if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+ continue;
clabel = raidget_component_label(raidPtr, col);
if (clabel->parity_map_flags & RF_PMLABEL_DISABLE)
dis = 1;
}
+for (col = 0; col < raidPtr->numSpare; col++) {
+ if (raidPtr->Disks[raidPtr->numCol+col].status != rf_ds_used_spare)
+continue;
+clabel = raidget_component_label(raidPtr, raidPtr->numCol+col);
+if (clabel->parity_map_flags & RF_PMLABEL_DISABLE)
+dis = 1;
+}
return dis;
}
@@ -740,6 +773,8 @@
RF_RowCol_t col;
for (col = 0; col < raidPtr->numCol; col++) {
+ if (RF_DEAD_DISK(raidPtr->Disks[col].status))
+ continue;
clabel = raidget_component_label(raidPtr, col);
if (dis)
clabel->parity_map_flags |= RF_PMLABEL_DISABLE;
@@ -747,4 +782,17 @@
clabel->parity_map_flags &= ~RF_PMLABEL_DISABLE;
raidflush_component_label(raidPtr, col);
}
+
+ /* update any used spares as well */
+ for (col = 0; col < raidPtr->numSpare; col++) {
+ if (raidPtr->Disks[raidPtr->numCol+col].status != rf_ds_used_spare)
+ continue;
+
+ clabel = raidget_component_label(raidPtr, raidPtr->numCol+col);
+ if (dis)
+ clabel->parity_map_flags |= RF_PMLABEL_DISABLE;
+ else
+ clabel->parity_map_flags &= ~RF_PMLABEL_DISABLE;
+ raidflush_component_label(raidPtr, raidPtr->numCol+col);
+ }
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: plunky
Date: Sat Mar 6 21:00:07 UTC 2010
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen for uhso(4) driver
To generate a diff of this commit:
cvs rdiff -u -r1.539 -r1.540 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.540 -r1.541 src/sys/dev/usb/usbdevs_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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.539 src/sys/dev/usb/usbdevs.h:1.540
--- src/sys/dev/usb/usbdevs.h:1.539 Fri Feb 19 13:56:39 2010
+++ src/sys/dev/usb/usbdevs.h Sat Mar 6 21:00:07 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.539 2010/02/19 13:56:39 pooka Exp $ */
+/* $NetBSD: usbdevs.h,v 1.540 2010/03/06 21:00:07 plunky Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.544 2010/02/19 13:55:51 pooka Exp
+ * NetBSD: usbdevs,v 1.545 2010/03/06 20:59:07 plunky Exp
*/
/*
@@ -1800,7 +1800,24 @@
#define USB_PRODUCT_OPTIONNV_QUADUMTS 0x6300 /* GlobeTrotter Fusion Quad Lite 3D */
#define USB_PRODUCT_OPTIONNV_QUADPLUSUMTS 0x6600 /* GlobeTrotter 3G Quad Plus */
#define USB_PRODUCT_OPTIONNV_HSDPA 0x6701 /* GlobeTrotter HSDPA Modem */
+#define USB_PRODUCT_OPTIONNV_MAXHSDPA 0x6701 /* GlobeTrotter Max HSDPA Modem */
+#define USB_PRODUCT_OPTIONNV_GSICON72 0x6911 /* GlobeSurfer iCON 7.2 */
+#define USB_PRODUCT_OPTIONNV_ICON225 0x6971 /* iCON 225 */
#define USB_PRODUCT_OPTIONNV_GTMAXHSUPA 0x7001 /* GlobeTrotter HSUPA */
+#define USB_PRODUCT_OPTIONNV_GEHSUPA 0x7011 /* GlobeTrotter Express HSUPA */
+#define USB_PRODUCT_OPTIONNV_GTHSUPA 0x7031 /* GlobeTrotter HSUPA */
+#define USB_PRODUCT_OPTIONNV_GSHSUPA 0x7251 /* GlobeSurfer HSUPA */
+#define USB_PRODUCT_OPTIONNV_GE40X1 0x7301 /* GE40x */
+#define USB_PRODUCT_OPTIONNV_GE40X2 0x7361 /* GE40x */
+#define USB_PRODUCT_OPTIONNV_GE40X3 0x7381 /* GE40x */
+#define USB_PRODUCT_OPTIONNV_ICON401 0x7401 /* iCON 401 */
+#define USB_PRODUCT_OPTIONNV_GTM382 0x7501 /* GTM 382 */
+#define USB_PRODUCT_OPTIONNV_GE40X4 0x7601 /* GE40x */
+#define USB_PRODUCT_OPTIONNV_ICONEDGE 0xc031 /* iCON EDGE */
+#define USB_PRODUCT_OPTIONNV_MODHSXPA 0xd013 /* Module HSxPA */
+#define USB_PRODUCT_OPTIONNV_ICON321 0xd031 /* iCON 321 */
+#define USB_PRODUCT_OPTIONNV_ICON322 0xd033 /* iCON 322 */
+#define USB_PRODUCT_OPTIONNV_ICON505 0xd055 /* iCON 505 */
/* OQO */
#define USB_PRODUCT_OQO_WIFI01 0x0002 /* model 01 WiFi interface */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.540 src/sys/dev/usb/usbdevs_data.h:1.541
--- src/sys/dev/usb/usbdevs_data.h:1.540 Fri Feb 19 13:56:39 2010
+++ src/sys/dev/usb/usbdevs_data.h Sat Mar 6 21:00:07 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.540 2010/02/19 13:56:39 pooka Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.541 2010/03/06 21:00:07 plunky Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.544 2010/02/19 13:55:51 pooka Exp
+ * NetBSD: usbdevs,v 1.545 2010/03/06 20:59:07 plunky Exp
*/
/*
@@ -5271,10 +5271,78 @@
"GlobeTrotter HSDPA Modem",
},
{
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_MAXHSDPA,
+ "GlobeTrotter Max HSDPA Modem",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GSICON72,
+ "GlobeSurfer iCON 7.2",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_ICON225,
+ "iCON 225",
+ },
+ {
USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GTMAXHSUPA,
"GlobeTrotter HSUPA",
},
{
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GEHSUPA,
+ "GlobeTrotter Express HSUPA",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GTHSUPA,
+ "GlobeTrotter HSUPA",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GSHSUPA,
+ "GlobeSurfer HSUPA",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GE40X1,
+ "GE40x",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GE40X2,
+ "GE40x",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GE40X3,
+ "GE40x",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_ICON401,
+ "iCON 401",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GTM382,
+ "GTM 382",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GE40X4,
+ "GE40x",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_ICONEDGE,
+ "iCON EDGE",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_MODHSXPA,
+ "Module HSxPA",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_ICON321,
+ "iCON 321",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_ICON322,
+ "iCON 322",
+ },
+ {
+ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_ICON505,
+ "iCON 505",
+ },
+ {
USB_VENDOR_OQO, USB_PRODUCT_OQO_WIFI01,
"model 01 WiFi interface",
},
@@ -7071,4 +7139,4 @@
"Prestige",
},
};
-const in
CVS commit: src/sys/dev/usb
Module Name:src Committed By: plunky Date: Sat Mar 6 21:00:07 UTC 2010 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: regen for uhso(4) driver To generate a diff of this commit: cvs rdiff -u -r1.539 -r1.540 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.540 -r1.541 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: plunky Date: Sat Mar 6 20:59:07 UTC 2010 Modified Files: src/sys/dev/usb: usbdevs Log Message: add details of Option N.V. Wireless WAN modems for uhso(4) driver To generate a diff of this commit: cvs rdiff -u -r1.544 -r1.545 src/sys/dev/usb/usbdevs 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.544 src/sys/dev/usb/usbdevs:1.545 --- src/sys/dev/usb/usbdevs:1.544 Fri Feb 19 13:55:51 2010 +++ src/sys/dev/usb/usbdevs Sat Mar 6 20:59:07 2010 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.544 2010/02/19 13:55:51 pooka Exp $ +$NetBSD: usbdevs,v 1.545 2010/03/06 20:59:07 plunky Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1793,7 +1793,24 @@ product OPTIONNV QUADUMTS 0x6300 GlobeTrotter Fusion Quad Lite 3D product OPTIONNV QUADPLUSUMTS 0x6600 GlobeTrotter 3G Quad Plus product OPTIONNV HSDPA 0x6701 GlobeTrotter HSDPA Modem +product OPTIONNV MAXHSDPA 0x6701 GlobeTrotter Max HSDPA Modem +product OPTIONNV GSICON72 0x6911 GlobeSurfer iCON 7.2 +product OPTIONNV ICON225 0x6971 iCON 225 product OPTIONNV GTMAXHSUPA 0x7001 GlobeTrotter HSUPA +product OPTIONNV GEHSUPA 0x7011 GlobeTrotter Express HSUPA +product OPTIONNV GTHSUPA 0x7031 GlobeTrotter HSUPA +product OPTIONNV GSHSUPA 0x7251 GlobeSurfer HSUPA +product OPTIONNV GE40X1 0x7301 GE40x +product OPTIONNV GE40X2 0x7361 GE40x +product OPTIONNV GE40X3 0x7381 GE40x +product OPTIONNV ICON401 0x7401 iCON 401 +product OPTIONNV GTM382 0x7501 GTM 382 +product OPTIONNV GE40X4 0x7601 GE40x +product OPTIONNV ICONEDGE 0xc031 iCON EDGE +product OPTIONNV MODHSXPA 0xd013 Module HSxPA +product OPTIONNV ICON321 0xd031 iCON 321 +product OPTIONNV ICON322 0xd033 iCON 322 +product OPTIONNV ICON505 0xd055 iCON 505 /* OQO */ product OQO WIFI01 0x0002 model 01 WiFi interface
CVS commit: src/sys/dev/usb
Module Name:src Committed By: plunky Date: Sat Mar 6 20:59:07 UTC 2010 Modified Files: src/sys/dev/usb: usbdevs Log Message: add details of Option N.V. Wireless WAN modems for uhso(4) driver To generate a diff of this commit: cvs rdiff -u -r1.544 -r1.545 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 20:56:45 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1324 To generate a diff of this commit: cvs rdiff -u -r1.1.2.202 -r1.1.2.203 src/doc/CHANGES-5.1 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-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.202 src/doc/CHANGES-5.1:1.1.2.203 --- src/doc/CHANGES-5.1:1.1.2.202 Tue Mar 2 06:34:57 2010 +++ src/doc/CHANGES-5.1 Sat Mar 6 20:56:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.202 2010/03/02 06:34:57 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.203 2010/03/06 20:56:44 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16837,3 +16837,11 @@ Make atomics usable from C++. [dholland, ticket #1314] +sys/dev/raidframe/rf_netbsdkintf.c 1.272 + + Don't merge a good parity map with random stuff in the event that + the first component is missing. (Since the merging just OR's the + maps, this isn't that big of a deal, as it will just over-estimate + the amount of checking that needs to be done.) + [oster, ticket #1324] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Sat Mar 6 20:56:45 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1324 To generate a diff of this commit: cvs rdiff -u -r1.1.2.202 -r1.1.2.203 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/raidframe
Module Name:src Committed By: sborrill Date: Sat Mar 6 20:56:16 UTC 2010 Modified Files: src/sys/dev/raidframe [netbsd-5]: rf_netbsdkintf.c Log Message: Pull up the following revisions(s) (requested by oster in ticket #1324): sys/dev/raidframe/rf_netbsdkintf.c: revision 1.272 Don't merge a good parity map with random stuff in the event that the first component is missing. (Since the merging just OR's the maps, this isn't that big a deal, as it will just over-estimate the amount of checking that needs to be done.) To generate a diff of this commit: cvs rdiff -u -r1.250.4.5 -r1.250.4.6 src/sys/dev/raidframe/rf_netbsdkintf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/raidframe
Module Name:src
Committed By: sborrill
Date: Sat Mar 6 20:56:16 UTC 2010
Modified Files:
src/sys/dev/raidframe [netbsd-5]: rf_netbsdkintf.c
Log Message:
Pull up the following revisions(s) (requested by oster in ticket #1324):
sys/dev/raidframe/rf_netbsdkintf.c: revision 1.272
Don't merge a good parity map with random stuff in the event that the
first component is missing. (Since the merging just OR's the maps,
this isn't that big a deal, as it will just over-estimate the
amount of checking that needs to be done.)
To generate a diff of this commit:
cvs rdiff -u -r1.250.4.5 -r1.250.4.6 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.5 src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.6
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.5 Thu Dec 10 22:59:17 2009
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Sat Mar 6 20:56:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.250.4.5 2009/12/10 22:59:17 snj Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.250.4.6 2010/03/06 20:56:15 sborrill Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -139,7 +139,7 @@
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.250.4.5 2009/12/10 22:59:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.250.4.6 2010/03/06 20:56:15 sborrill Exp $");
#include
#include
@@ -2587,8 +2587,9 @@
rf_paritymap_kern_read(RF_Raid_t *raidPtr, struct rf_paritymap_ondisk *map)
{
struct rf_paritymap_ondisk tmp;
- int c;
+ int c,first;
+ first=1;
for (c = 0; c < raidPtr->numCol; c++) {
/* Skip dead disks. */
if (RF_DEAD_DISK(raidPtr->Disks[c].status))
@@ -2597,8 +2598,9 @@
raidPtr->raid_cinfo[c].ci_vp, &tmp,
RF_PARITYMAP_NBYTE,
RF_PARITY_MAP_OFFSET, RF_PARITY_MAP_SIZE);
- if (c == 0) {
+ if (first) {
memcpy(map, &tmp, sizeof(*map));
+ first = 0;
} else {
rf_paritymap_merge(map, &tmp);
}
Re: CVS commit: src/lib/libedit
hi, all.
i found one more big problem.
we had lost source/binary level backward compatibility, sigh.
el_set(3) defines EL_GETCFN flag, and some application(such as Asterisk) use it:
el_set()
Set editline parameters. op determines which parameter to set, and
each operation has its own parameter list.
The following values for op are supported, along with the required
argument list:
EL_GETCFN, int (*f)(EditLine *, char *c)
Define the character reading function as f, which is to
return the number of characters read and store them in c.
This function is called internally by el_gets() and
el_getc(). The builtin function can be set or restored with
the special function name ``EL_BUILTIN_GETCFN''.
but, this commit silently added following change(and it doesn't
expected by anyone)
int(*f)(EditLine *, char *) -> int (*f)(EditLine *, wchar_t *)
so if old application binary link new libedit, it doesn't work anymore ;-<.
[src/lib/libedit/el.c]
281 case EL_GETCFN:
282 {
283 el_rfunc_t rc = va_arg(ap, el_rfunc_t);
284 rv = el_read_setfn(el, rc);
285 el->el_flags &= ~NARROW_READ;
286 break;
287 }
[src/lib/libedit/read.h]
@@ -35,7 +35,7 @@
#ifndef_h_el_read
#define_h_el_read
-typedef int (*el_rfunc_t)(EditLine *, char *);
+typedef int (*el_rfunc_t)(EditLine *, Char *);
typedef struct el_read_t {
el_rfunc_t read_char; /* Function to read a character */
what shoulld we do to solve this problem?
i believe tempolary backout this patch is the way we have to go.
# i'm now started completely rewriting wide-character support for libedit.
# but it still need lots of time.
very truly yours.
--
Takehiko NOZAKI
2010/1/14 Takehiko NOZAKI :
> hi, all.
>
> i found following problems this patch:
>
> 1. don't write UTF-8 locale dependent ``cheat'' code in locale
> independent libedit,
> such as enc_width(), utf8_islead() and so on, completely meaningless.
>
> our locale implementation is "CodeSet Independ" policy, wchar_t != UCS4.
> please read itojun@'s paper.
> http://www.usenix.org/events/usenix01/freenix01/hagino.html
>
>
> 2. cast wchar_t -> wint_t in the argument of isw* function.
> consider sizeof(wchar_t) < sizeof(wint_t) case (for integer promotion).
>
>
> 3. kill evil __STDC_ISO_10646__ usage.
> if you want kick some encodings not compatible with ASCII(like EBCDIC),
> use __STDC_MB_MIGHT_NEQ_WC__ instead.
> see http://www.open-std.org/jtc1/sc22/wg14/www/docs/dr_321.htm
>
>
> 4. library function must not use thread unsafe version of mb/wc conversion,
> like mbtowc, wctomb and so on. use mbrtowc/wcrtomb instead.
> this may broke compatibility some old apllication that uses mbtowc/wctomb.
>
>
>
> i'm willing to fix them, but i'm busy now, not enough time to do it til
> April...
>
> very truly yours.
> --
> Takehiko NOZAKI
>
CVS commit: src/share/man/man4
Module Name:src Committed By: cnst Date: Sat Mar 6 19:53:33 UTC 2010 Modified Files: src/share/man/man4: aibs.4 Log Message: make the acpi resource management paragraph more accurate To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/aibs.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/aibs.4 diff -u src/share/man/man4/aibs.4:1.5 src/share/man/man4/aibs.4:1.6 --- src/share/man/man4/aibs.4:1.5 Fri Feb 12 02:16:59 2010 +++ src/share/man/man4/aibs.4 Sat Mar 6 19:53:33 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: aibs.4,v 1.5 2010/02/12 02:16:59 cnst Exp $ +.\" $NetBSD: aibs.4,v 1.6 2010/03/06 19:53:33 cnst Exp $ .\" $OpenBSD: aibs.4,v 1.4 2009/07/30 06:30:45 jmc Exp $ .\" .\" Copyright (c) 2009 Constantine A. Murenin @@ -176,15 +176,13 @@ is present, and may be ignored as appropriate. Whereas on -.Ox -the native drivers have to be specifically disabled should +some supported operating systems +the native drivers may have to be specifically disabled should their presence be judged unnecessary, on -.Dx -the +others +the drivers like .Xr lm 4 -and -.Xr it 4 are not probed provided that .Xr acpi 4 is configured and the system potentially supports
CVS commit: src/share/man/man4
Module Name:src Committed By: cnst Date: Sat Mar 6 19:53:33 UTC 2010 Modified Files: src/share/man/man4: aibs.4 Log Message: make the acpi resource management paragraph more accurate To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/aibs.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Sat Mar 6 19:36:33 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: sti_sgc.c
Log Message:
Fix cputype test.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp700/dev/sti_sgc.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/hp700/dev/sti_sgc.c
diff -u src/sys/arch/hp700/dev/sti_sgc.c:1.18 src/sys/arch/hp700/dev/sti_sgc.c:1.19
--- src/sys/arch/hp700/dev/sti_sgc.c:1.18 Tue Nov 3 05:07:25 2009
+++ src/sys/arch/hp700/dev/sti_sgc.c Sat Mar 6 19:36:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sti_sgc.c,v 1.18 2009/11/03 05:07:25 snj Exp $ */
+/* $NetBSD: sti_sgc.c,v 1.19 2010/03/06 19:36:33 skrll Exp $ */
/* $OpenBSD: sti_sgc.c,v 1.21 2003/12/22 23:39:06 mickey Exp $ */
@@ -35,7 +35,9 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.18 2009/11/03 05:07:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.19 2010/03/06 19:36:33 skrll Exp $");
+
+#include "opt_cputype.h"
#include
#include
@@ -247,7 +249,7 @@
* "pcxl2_ers.{ps,pdf}", (section / chapter . rel. page / abs. page)
* 8.7.4 / 8-12 / 92, 11.3.14 / 11-14 / 122 and 14.8 / 14-5 / 203.
*/
- if (strcmp(hppa_cpu_info->hppa_cpu_info_chip_type, "PCX-L2") == 0
+ if (hppa_cpu_info->hci_cputype == hpcxl2
&& ca->ca_hpa >= PCXL2_ACCEL_IO_START
&& ca->ca_hpa <= PCXL2_ACCEL_IO_END)
eaio_l2(PCXL2_ACCEL_IO_ADDR2MASK(ca->ca_hpa));
CVS commit: src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Sat Mar 6 19:36:33 UTC 2010 Modified Files: src/sys/arch/hp700/dev: sti_sgc.c Log Message: Fix cputype test. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp700/dev/sti_sgc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/share/man/man3
On Thu, Mar 04, 2010 at 05:26:02PM -0500, Greg A. Woods wrote:
> > No such luck, at least not until C grows a stronger type system. See
> > for example strchr(3).
>
> I don't think a stronger type system would really change this issue
> fundamentally unless it was one which was so radical as to change the
> entire language -- All that may really be needed is a new kind of
> qualifier, one that tells the compiler a return value (or other internal
> variable) has the same "const" status as some given input parameter
> ("const_if_{parameter-name}_const" or some such similar nonsense).
That *is* a stronger type system, one with parametric polymorphism for
type qualifiers.
> While strchr()'s interface, and that of strrchr() of course, are indeed
> excellent examples this issue, the use of __UNCONST() within their
> implementation to hide silly warnings that might be encountered by
> compiling their implementations doesn't really "fix" anything except the
> silly warnings. The code _must_ do what it _should_ not do. :-)
Well right...
> And so I think what I said about __UNCONST() being unnecessary
> remains.
...but that makes it necessary. At least given the concept of
"necessary" that I'm familiar with :-)
--
David A. Holland
dholl...@netbsd.org
CVS commit: src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Sat Mar 6 16:57:00 UTC 2010 Modified Files: src/sys/arch/hp700/dev: dino.c Log Message: Improved version detection/reporting. From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hp700/dev/dino.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Sat Mar 6 16:57:00 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: dino.c
Log Message:
Improved version detection/reporting. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hp700/dev/dino.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/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.24 src/sys/arch/hp700/dev/dino.c:1.25
--- src/sys/arch/hp700/dev/dino.c:1.24 Fri Mar 5 17:47:09 2010
+++ src/sys/arch/hp700/dev/dino.c Sat Mar 6 16:57:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.24 2010/03/05 17:47:09 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.25 2010/03/06 16:57:00 skrll Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.24 2010/03/05 17:47:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.25 2010/03/06 16:57:00 skrll Exp $");
/* #include "cardbus.h" */
@@ -1617,7 +1617,7 @@
struct confargs *ca = (struct confargs *)aux, nca;
struct pcibus_attach_args pba;
volatile struct dino_regs *r;
- const char *p;
+ const char *p = NULL;
u_int data;
int s, ver;
@@ -1678,34 +1678,36 @@
/* TODO establish the bus error interrupt */
- r->iodc = 0;
- data = r->iodc;
- ver = (ca->ca_type.iodc_model << 4) |
- (ca->ca_type.iodc_revision >> 4);
- switch (ver) {
- case 0x05d: p = "Dino"; /* j2240 */
- case 0x680: p = "Dino";
- switch (data >> 16) {
- case 0x6800: ver = 0x20; break;
- case 0x6801: ver = 0x21; break;
- case 0x6802: ver = 0x30; break;
- case 0x6803: ver = 0x31; break;
- default: ver = 0x40; break;
+ ver = ca->ca_type.iodc_revision;
+ switch ((ca->ca_type.iodc_model << 4) |
+ (ca->ca_type.iodc_revision >> 4)) {
+ case 0x05d:
+ p = "Dino (card)"; /* j2240 */
+ /* FALLTHROUGH */
+ case 0x680:
+ if (!p)
+ p = "Dino";
+ switch (ver & 0xf) {
+ case 0: ver = 0x20; break;
+ case 1: ver = 0x21; break;
+ case 2: ver = 0x30; break;
+ case 3: ver = 0x31; break;
}
break;
- case 0x682: p = "Cujo";
- switch (data >> 16) {
- case 0x6820: ver = 0x10; break;
- case 0x6821: ver = 0x20; break;
- default: ver = 0x30; break;
+ case 0x682:
+ p = "Cujo";
+ switch (ver & 0xf) {
+ case 0: ver = 0x10; break;
+ case 1: ver = 0x20; break;
}
break;
- default: p = "Mojo";
- ver = (data >> 16) & 0xff;
+ default:
+ p = "Mojo";
break;
}
+
sc->sc_ver = ver;
aprint_normal(": %s V%d.%d\n", p, ver >> 4, ver & 0xf);
CVS commit: src
Module Name:src Committed By: dsieger Date: Sat Mar 6 16:42:56 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile sched_4bsd.9 Added Files: src/share/man/man9: sched_m2.9 Log Message: Since someone (hi ahoka) added a reference to non-existant sched_m2(9), add at least a stub now. To generate a diff of this commit: cvs rdiff -u -r1.1402 -r1.1403 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.319 -r1.320 src/share/man/man9/Makefile cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/sched_4bsd.9 cvs rdiff -u -r0 -r1.1 src/share/man/man9/sched_m2.9 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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1402 src/distrib/sets/lists/comp/mi:1.1403 --- src/distrib/sets/lists/comp/mi:1.1402 Thu Mar 4 08:13:29 2010 +++ src/distrib/sets/lists/comp/mi Sat Mar 6 16:42:55 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1402 2010/03/04 08:13:29 jruoho Exp $ +# $NetBSD: mi,v 1.1403 2010/03/06 16:42:55 dsieger Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -9397,6 +9397,7 @@ ./usr/share/man/cat9/rw_write_held.0 comp-sys-catman .cat ./usr/share/man/cat9/rwlock.0 comp-sys-catman .cat ./usr/share/man/cat9/sched_4bsd.0 comp-sys-catman .cat +./usr/share/man/cat9/sched_m2.0 comp-sys-catman .cat ./usr/share/man/cat9/sched_lock_idle.0 comp-obsolete obsolete ./usr/share/man/cat9/sched_psignal.0 comp-sys-catman .cat ./usr/share/man/cat9/sched_unlock_idle.0 comp-obsolete obsolete @@ -15024,6 +15025,7 @@ ./usr/share/man/html9/rw_write_held.html comp-sys-htmlman html ./usr/share/man/html9/rwlock.html comp-sys-htmlman html ./usr/share/man/html9/sched_4bsd.html comp-sys-htmlman html +./usr/share/man/html9/sched_m2.html comp-sys-htmlman html ./usr/share/man/html9/sched_psignal.html comp-sys-htmlman html ./usr/share/man/html9/scsipi.html comp-sys-htmlman html ./usr/share/man/html9/secmodel.html comp-sys-htmlman html @@ -20842,6 +20844,7 @@ ./usr/share/man/man9/rw_write_held.9 comp-sys-man .man ./usr/share/man/man9/rwlock.9 comp-sys-man .man ./usr/share/man/man9/sched_4bsd.9 comp-sys-man .man +./usr/share/man/man9/sched_m2.9 comp-sys-man .man ./usr/share/man/man9/sched_lock_idle.9 comp-obsolete obsolete ./usr/share/man/man9/sched_psignal.9 comp-sys-man .man ./usr/share/man/man9/sched_unlock_idle.9 comp-obsolete obsolete Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.319 src/share/man/man9/Makefile:1.320 --- src/share/man/man9/Makefile:1.319 Thu Mar 4 08:09:51 2010 +++ src/share/man/man9/Makefile Sat Mar 6 16:42:56 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.319 2010/03/04 08:09:51 jruoho Exp $ +# $NetBSD: Makefile,v 1.320 2010/03/06 16:42:56 dsieger Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -43,7 +43,7 @@ preempt.9 putter.9 \ radio.9 ras.9 rasops.9 ratecheck.9 resettodr.9 rnd.9 roundup.9 \ rssadapt.9 rt_timer.9 rwlock.9 RUN_ONCE.9 \ - sched_4bsd.9 scsipi.9 \ + sched_4bsd.9 sched_m2.9 scsipi.9 \ secmodel.9 secmodel_bsd44.9 secmodel_overlay.9 secmodel_securelevel.9 \ secmodel_suser.9 setbit.9 setjmp.9 shutdownhook_establish.9 \ signal.9 sockopt.9 softintr.9 spl.9 splraiseipl.9 \ Index: src/share/man/man9/sched_4bsd.9 diff -u src/share/man/man9/sched_4bsd.9:1.4 src/share/man/man9/sched_4bsd.9:1.5 --- src/share/man/man9/sched_4bsd.9:1.4 Fri Mar 5 23:08:18 2010 +++ src/share/man/man9/sched_4bsd.9 Sat Mar 6 16:42:56 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sched_4bsd.9,v 1.4 2010/03/05 23:08:18 dsieger Exp $ +.\" $NetBSD: sched_4bsd.9,v 1.5 2010/03/06 16:42:56 dsieger Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -87,6 +87,7 @@ .Pa sys/kern/sched_4bsd.c . .Sh SEE ALSO .Xr csf 9 , +.Xr sched_m2 , .Xr hardclock 9 , .Xr mi_switch 9 , .Xr userret 9 Added files: Index: src/share/man/man9/sched_m2.9 diff -u /dev/null src/share/man/man9/sched_m2.9:1.1 --- /dev/null Sat Mar 6 16:42:56 2010 +++ src/share/man/man9/sched_m2.9 Sat Mar 6 16:42:56 2010 @@ -0,0 +1,62 @@ +.\" $NetBSD: sched_m2.9,v 1.1 2010/03/06 16:42:56 dsieger Exp $ +.\" +.\" Copyright (c) 2010 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Daniel Sieger. +.\" +.\" 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/o
CVS commit: src
Module Name:src Committed By: dsieger Date: Sat Mar 6 16:42:56 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile sched_4bsd.9 Added Files: src/share/man/man9: sched_m2.9 Log Message: Since someone (hi ahoka) added a reference to non-existant sched_m2(9), add at least a stub now. To generate a diff of this commit: cvs rdiff -u -r1.1402 -r1.1403 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.319 -r1.320 src/share/man/man9/Makefile cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/sched_4bsd.9 cvs rdiff -u -r0 -r1.1 src/share/man/man9/sched_m2.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/share/man/man3
On Thu, Mar 04, 2010 at 05:26:02PM -0500, Greg A. Woods wrote: > silly warnings. The code _must_ do what it _should_ not do. :-) And so > I think what I said about __UNCONST() being unnecessary remains. The I agree. As for the legitimate reasons of usage, third-party code was largely the reason why I wrote the manual page in the first place. Linux is (in)famous for not following any kind of "const correctness". And as we have third-party code developed on Linux, and largely for Linux, these issues creep also to NetBSD. Fixing these "problems" in highly complex third-party code is not a trivial nor rewarding task, especially if the upstream refuses to acknowledge the issue. So from a practical point of view, __UNCONST() has its virtues. - Jukka.
CVS commit: src/sbin/fsck_ffs
Module Name:src Committed By: mlelstv Date: Sat Mar 6 11:31:40 UTC 2010 Modified Files: src/sbin/fsck_ffs: wapbl.c Log Message: When clearing a log on failure, not only ask the kernel to ignore an existing log but to remove it on next mount. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sbin/fsck_ffs/wapbl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck_ffs
Module Name:src
Committed By: mlelstv
Date: Sat Mar 6 11:31:40 UTC 2010
Modified Files:
src/sbin/fsck_ffs: wapbl.c
Log Message:
When clearing a log on failure, not only ask the kernel to ignore an
existing log but to remove it on next mount.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sbin/fsck_ffs/wapbl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/wapbl.c
diff -u src/sbin/fsck_ffs/wapbl.c:1.4 src/sbin/fsck_ffs/wapbl.c:1.5
--- src/sbin/fsck_ffs/wapbl.c:1.4 Sun Sep 13 14:25:28 2009
+++ src/sbin/fsck_ffs/wapbl.c Sat Mar 6 11:31:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wapbl.c,v 1.4 2009/09/13 14:25:28 bouyer Exp $ */
+/* $NetBSD: wapbl.c,v 1.5 2010/03/06 11:31:40 mlelstv Exp $ */
/*-
* Copyright (c) 2005,2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define WAPBL_INTERNAL
#include
-__KERNEL_RCSID(0, "$NetBSD: wapbl.c,v 1.4 2009/09/13 14:25:28 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wapbl.c,v 1.5 2010/03/06 11:31:40 mlelstv Exp $");
#include
#include
@@ -170,6 +170,7 @@
}
pwarn("CLEARING EXISTING JOURNAL\n");
sblock->fs_flags &= ~FS_DOWAPBL;
+ sblock->fs_journal_flags = UFS_WAPBL_FLAGS_CLEAR_LOG;
sbdirty();
ret = FSCK_EXIT_CHECK_FAILED;
} else {
@@ -198,6 +199,7 @@
}
pwarn("CLEARING EXISTING JOURNAL\n");
sblock->fs_flags &= ~FS_DOWAPBL;
+sblock->fs_journal_flags = UFS_WAPBL_FLAGS_CLEAR_LOG;
sblock->fs_journal_location =
UFS_WAPBL_JOURNALLOC_NONE;
sbdirty();
@@ -215,6 +217,7 @@
}
pwarn("CLEARING EXISTING JOURNAL\n");
sblock->fs_flags &= ~FS_DOWAPBL;
+ sblock->fs_journal_flags = UFS_WAPBL_FLAGS_CLEAR_LOG;
sbdirty();
ret = FSCK_EXIT_CHECK_FAILED;
}
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: mrg
Date: Sat Mar 6 08:08:30 UTC 2010
Modified Files:
src/sys/arch/sparc64/include: cpu.h intr.h pmap.h
src/sys/arch/sparc64/sparc64: autoconf.c cache.h cpu.c db_interface.c
pmap.c
Log Message:
clean up a bunch of MULTIPROCESSOR:
- always include ci_ipi_evcnt[] in cpuinfo
- #define sparc_ncpus 1 for !MULTIPROCESSOR
- make struct pmap::pm_list an pm_ctx always be an array, and simplify
several functions and lookups to always be the same
tested on U60 and SB2500 before and after with one and two cpus in an
MP kernel, and UP kernels, and i can't find anything besides noise for
benchmark issues. (infact, i can't really tell the difference between
GENERIC and GENERIC.MP on these systems...)
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc64/include/intr.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/include/pmap.h
cvs rdiff -u -r1.171 -r1.172 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/sparc64/cache.h
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/sparc64/sparc64/db_interface.c
cvs rdiff -u -r1.256 -r1.257 src/sys/arch/sparc64/sparc64/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/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.88 src/sys/arch/sparc64/include/cpu.h:1.89
--- src/sys/arch/sparc64/include/cpu.h:1.88 Tue Feb 2 04:28:55 2010
+++ src/sys/arch/sparc64/include/cpu.h Sat Mar 6 08:08:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.88 2010/02/02 04:28:55 mrg Exp $ */
+/* $NetBSD: cpu.h,v 1.89 2010/03/06 08:08:29 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -131,9 +131,9 @@
/* Event counters */
struct evcnt ci_tick_evcnt;
-#ifdef MULTIPROCESSOR
+
+ /* This could be under MULTIPROCESSOR, but there's no good reason */
struct evcnt ci_ipi_evcnt[IPI_EVCNT_NUM];
-#endif
int ci_flags;
int ci_want_ast;
@@ -191,7 +191,12 @@
extern struct cpu_bootargs *cpu_args;
+#if defined(MULTIPROCESSOR)
extern int sparc_ncpus;
+#else
+#define sparc_ncpus 1
+#endif
+
extern struct cpu_info *cpus;
extern struct pool_cache *fpstate_cache;
Index: src/sys/arch/sparc64/include/intr.h
diff -u src/sys/arch/sparc64/include/intr.h:1.27 src/sys/arch/sparc64/include/intr.h:1.28
--- src/sys/arch/sparc64/include/intr.h:1.27 Mon Feb 1 02:42:33 2010
+++ src/sys/arch/sparc64/include/intr.h Sat Mar 6 08:08:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.27 2010/02/01 02:42:33 mrg Exp $ */
+/* $NetBSD: intr.h,v 1.28 2010/03/06 08:08:29 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -73,12 +73,12 @@
int mp_cpu_is_paused (sparc64_cpuset_t);
void mp_resume_cpu(int);
#endif /* _LOCORE */
+#endif
#define IPI_EVCNT_TLB_PTE 0
#define IPI_EVCNT_FPU_SYNCH 1
#define IPI_EVCNT_FPU_FLUSH 2
#define IPI_EVCNT_NUM 3
#define IPI_EVCNT_NAMES { "TLB pte IPI", "FPU synch IPI", "FPU flush IPI" }
-#endif
#endif /* _SPARC64_INTR_H_ */
Index: src/sys/arch/sparc64/include/pmap.h
diff -u src/sys/arch/sparc64/include/pmap.h:1.51 src/sys/arch/sparc64/include/pmap.h:1.52
--- src/sys/arch/sparc64/include/pmap.h:1.51 Thu Mar 4 08:01:35 2010
+++ src/sys/arch/sparc64/include/pmap.h Sat Mar 6 08:08:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.51 2010/03/04 08:01:35 mrg Exp $ */
+/* $NetBSD: pmap.h,v 1.52 2010/03/06 08:08:29 mrg Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -111,19 +111,20 @@
#define va_to_dir(v) (int)paddr_t)(v))>>PDSHIFT)&PDMASK)
#define va_to_pte(v) (int)paddr_t)(v))>>PTSHIFT)&PTMASK)
+#ifdef MULTIPROCESSOR
+#define PMAP_LIST_MAXNUMCPU CPUSET_MAXNUMCPU
+#else
+#define PMAP_LIST_MAXNUMCPU 1
+#endif
+
struct pmap {
struct uvm_object pm_obj;
#define pm_lock pm_obj.vmobjlock
#define pm_refs pm_obj.uo_refs
-#ifdef MULTIPROCESSOR
- LIST_ENTRY(pmap) pm_list[CPUSET_MAXNUMCPU]; /* per cpu ctx used list */
-#else
- LIST_ENTRY(pmap) pm_list; /* single ctx used list */
-#endif
+ LIST_ENTRY(pmap) pm_list[PMAP_LIST_MAXNUMCPU]; /* per cpu ctx used list */
struct pmap_statistics pm_stats;
-#ifdef MULTIPROCESSOR
/*
* We record the context used on any cpu here. If the context
* is actually present in the TLB, it will be the plain context
@@ -132,10 +133,7 @@
* If this pmap has no context allocated on that cpu, the entry
* will be 0.
*/
- int pm_ctx[CPUSET_MAXNUMCPU]; /* Current context per cpu */
-#else
- int pm_ctx; /* Current context */
-#endif
+ int pm_ctx[PMAP_LIST_MAXNUMCPU]; /* Current context per cpu */
/*
* This contains 64-bit pointers to pages that contain
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.171 src/sys/arch/sparc64/sparc64/autoconf.c:1.172
--- src/s
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: mrg Date: Sat Mar 6 08:08:30 UTC 2010 Modified Files: src/sys/arch/sparc64/include: cpu.h intr.h pmap.h src/sys/arch/sparc64/sparc64: autoconf.c cache.h cpu.c db_interface.c pmap.c Log Message: clean up a bunch of MULTIPROCESSOR: - always include ci_ipi_evcnt[] in cpuinfo - #define sparc_ncpus 1 for !MULTIPROCESSOR - make struct pmap::pm_list an pm_ctx always be an array, and simplify several functions and lookups to always be the same tested on U60 and SB2500 before and after with one and two cpus in an MP kernel, and UP kernels, and i can't find anything besides noise for benchmark issues. (infact, i can't really tell the difference between GENERIC and GENERIC.MP on these systems...) To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sparc64/include/cpu.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc64/include/intr.h cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/include/pmap.h cvs rdiff -u -r1.171 -r1.172 src/sys/arch/sparc64/sparc64/autoconf.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/sparc64/cache.h cvs rdiff -u -r1.89 -r1.90 src/sys/arch/sparc64/sparc64/cpu.c cvs rdiff -u -r1.122 -r1.123 src/sys/arch/sparc64/sparc64/db_interface.c cvs rdiff -u -r1.256 -r1.257 src/sys/arch/sparc64/sparc64/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
