CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Tue Feb 16 08:03:15 UTC 2010 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: locore.S Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.167.38.13 -r1.167.38.14 src/sys/arch/mips/mips/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/mips/mips/locore.S diff -u src/sys/arch/mips/mips/locore.S:1.167.38.13 src/sys/arch/mips/mips/locore.S:1.167.38.14 --- src/sys/arch/mips/mips/locore.S:1.167.38.13 Mon Feb 15 07:36:03 2010 +++ src/sys/arch/mips/mips/locore.S Tue Feb 16 08:03:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.167.38.13 2010/02/15 07:36:03 matt Exp $ */ +/* $NetBSD: locore.S,v 1.167.38.14 2010/02/16 08:03:14 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -767,7 +767,7 @@ */ FPReturn: mfc0 t0, MIPS_COP_0_STATUS - REG_S ra, CALLFRAME_RA(sp) + REG_L ra, CALLFRAME_RA(sp) and t0, t0, ~MIPS_SR_COP_1_BIT mtc0 t0, MIPS_COP_0_STATUS COP0_SYNC
CVS commit: [matt-nb5-mips64] src/sys/arch
Module Name:src
Committed By: matt
Date: Tue Feb 16 08:13:58 UTC 2010
Modified Files:
src/sys/arch/evbmips/malta [matt-nb5-mips64]: malta_intr.c
src/sys/arch/mips/adm5120 [matt-nb5-mips64]: adm5120_intr.c
src/sys/arch/mips/atheros [matt-nb5-mips64]: ar5312_intr.c
ar5315_intr.c
src/sys/arch/mips/include [matt-nb5-mips64]: cpu.h intr.h
src/sys/arch/mips/mips [matt-nb5-mips64]: genassym.cf mipsX_subr.S
mips_machdep.c mips_softint.c
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_intr.c
Log Message:
Add __HAVE_PREEMPTION support for NetBSD/mips. Kill IPL_PREEMPT since it
isn't needed.
To generate a diff of this commit:
cvs rdiff -u -r1.19.16.3 -r1.19.16.4 src/sys/arch/evbmips/malta/malta_intr.c
cvs rdiff -u -r1.3.18.1 -r1.3.18.2 src/sys/arch/mips/adm5120/adm5120_intr.c
cvs rdiff -u -r1.6.28.1 -r1.6.28.2 src/sys/arch/mips/atheros/ar5312_intr.c
cvs rdiff -u -r1.5.28.1 -r1.5.28.2 src/sys/arch/mips/atheros/ar5315_intr.c
cvs rdiff -u -r1.90.16.19 -r1.90.16.20 src/sys/arch/mips/include/cpu.h
cvs rdiff -u -r1.3.96.2 -r1.3.96.3 src/sys/arch/mips/include/intr.h
cvs rdiff -u -r1.44.12.16 -r1.44.12.17 src/sys/arch/mips/mips/genassym.cf
cvs rdiff -u -r1.26.36.1.2.23 -r1.26.36.1.2.24 \
src/sys/arch/mips/mips/mipsX_subr.S
cvs rdiff -u -r1.205.4.1.2.1.2.33 -r1.205.4.1.2.1.2.34 \
src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/mips/mips/mips_softint.c
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/arch/mips/rmi/rmixl_intr.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/evbmips/malta/malta_intr.c
diff -u src/sys/arch/evbmips/malta/malta_intr.c:1.19.16.3 src/sys/arch/evbmips/malta/malta_intr.c:1.19.16.4
--- src/sys/arch/evbmips/malta/malta_intr.c:1.19.16.3 Mon Feb 15 07:37:36 2010
+++ src/sys/arch/evbmips/malta/malta_intr.c Tue Feb 16 08:13:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: malta_intr.c,v 1.19.16.3 2010/02/15 07:37:36 matt Exp $ */
+/* $NetBSD: malta_intr.c,v 1.19.16.4 2010/02/16 08:13:57 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: malta_intr.c,v 1.19.16.3 2010/02/15 07:37:36 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: malta_intr.c,v 1.19.16.4 2010/02/16 08:13:57 matt Exp $);
#include sys/param.h
#include sys/device.h
@@ -64,35 +64,12 @@
* given hardware interrupt priority level.
*/
const uint32_t ipl_sr_bits[_IPL_N] = {
- [IPL_NONE] = 0,
- [IPL_PREEMPT] = 0,
- [IPL_SOFTCLOCK] =
- MIPS_SOFT_INT_MASK_0,
- [IPL_SOFTNET] =
- MIPS_SOFT_INT_MASK_0 |
- MIPS_SOFT_INT_MASK_1,
- [IPL_VM] =
- MIPS_SOFT_INT_MASK_0 |
- MIPS_SOFT_INT_MASK_1 |
- MIPS_INT_MASK_0,
- [IPL_SCHED] =
- MIPS_SOFT_INT_MASK_0 |
- MIPS_SOFT_INT_MASK_1 |
- MIPS_INT_MASK_0 |
- MIPS_INT_MASK_1 |
- MIPS_INT_MASK_2 |
- MIPS_INT_MASK_3 |
- MIPS_INT_MASK_4 |
- MIPS_INT_MASK_5,
- [IPL_HIGH] =
- MIPS_SOFT_INT_MASK_0 |
- MIPS_SOFT_INT_MASK_1 |
- MIPS_INT_MASK_0 |
- MIPS_INT_MASK_1 |
- MIPS_INT_MASK_2 |
- MIPS_INT_MASK_3 |
- MIPS_INT_MASK_4 |
- MIPS_INT_MASK_5,
+ [IPL_NONE] = 0,
+ [IPL_SOFTCLOCK] = MIPS_SOFT_INT_MASK_0,
+ [IPL_SOFTNET] = MIPS_SOFT_INT_MASK,
+ [IPL_VM] = MIPS_SOFT_INT_MASK | MIPS_INT_MASK_0,
+ [IPL_SCHED] = MIPS_INT_MASK,
+ [IPL_HIGH] = MIPS_INT_MASK,
};
struct malta_cpuintr {
Index: src/sys/arch/mips/adm5120/adm5120_intr.c
diff -u src/sys/arch/mips/adm5120/adm5120_intr.c:1.3.18.1 src/sys/arch/mips/adm5120/adm5120_intr.c:1.3.18.2
--- src/sys/arch/mips/adm5120/adm5120_intr.c:1.3.18.1 Mon Feb 15 07:37:36 2010
+++ src/sys/arch/mips/adm5120/adm5120_intr.c Tue Feb 16 08:13:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_intr.c,v 1.3.18.1 2010/02/15 07:37:36 matt Exp $ */
+/* $NetBSD: adm5120_intr.c,v 1.3.18.2 2010/02/16 08:13:57 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: adm5120_intr.c,v 1.3.18.1 2010/02/15 07:37:36 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: adm5120_intr.c,v 1.3.18.2 2010/02/16 08:13:57 matt Exp $);
#include opt_ddb.h
@@ -94,7 +94,6 @@
*/
const uint32_t ipl_sr_bits[_IPL_N] = {
[IPL_NONE] = 0,
-[IPL_PREEMPT] = 0,
[IPL_SOFTCLOCK] = MIPS_SOFT_INT_MASK_0,
[IPL_SOFTBIO] = MIPS_SOFT_INT_MASK_0,
[IPL_SOFTNET] = MIPS_SOFT_INT_MASK,
Index: src/sys/arch/mips/atheros/ar5312_intr.c
diff -u src/sys/arch/mips/atheros/ar5312_intr.c:1.6.28.1 src/sys/arch/mips/atheros/ar5312_intr.c:1.6.28.2
--- src/sys/arch/mips/atheros/ar5312_intr.c:1.6.28.1 Mon Feb 15 07:37:36 2010
+++ src/sys/arch/mips/atheros/ar5312_intr.c Tue Feb 16 08:13:57 2010
@@ -1,4 +1,4 @@
-/* $Id: ar5312_intr.c,v 1.6.28.1 2010/02/15 07:37:36 matt Exp $ */
+/* $Id: ar5312_intr.c,v 1.6.28.2 2010/02/16 08:13:57 matt Exp $ */
/*
*
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: dholland Date: Tue Feb 16 09:53:52 UTC 2010 Modified Files: src/games/fortune/datfiles: fortunes fortunes2 Log Message: Latin police: use proper conjugation. (whether the rest of the affected fortune is valid either is debatable) To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/games/fortune/datfiles/fortunes cvs rdiff -u -r1.41 -r1.42 src/games/fortune/datfiles/fortunes2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.45 src/games/fortune/datfiles/fortunes:1.46 --- src/games/fortune/datfiles/fortunes:1.45 Sun Mar 15 05:44:57 2009 +++ src/games/fortune/datfiles/fortunes Tue Feb 16 09:53:51 2010 @@ -10654,7 +10654,7 @@ % Quick, sing me the BUDAPEST NATIONAL ANTHEM!! % -Quidquid latine dictum sit, altum viditur. +Quidquid latine dictum sit, altum videtur. (Whatever is said in Latin sounds profound.) % Index: src/games/fortune/datfiles/fortunes2 diff -u src/games/fortune/datfiles/fortunes2:1.41 src/games/fortune/datfiles/fortunes2:1.42 --- src/games/fortune/datfiles/fortunes2:1.41 Fri Jan 1 00:16:54 2010 +++ src/games/fortune/datfiles/fortunes2 Tue Feb 16 09:53:51 2010 @@ -37383,7 +37383,7 @@ % Quick!! Act as if nothing has happened! % -Quidquid latine dictum sit, altum viditur. +Quidquid latine dictum sit, altum videtur. (Whatever is said in Latin sounds profound.) %
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Feb 16 10:06:19 UTC 2010
Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h
Log Message:
indent, tabify and remove extra spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.36 -r1.37 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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.197 src/sys/dev/pci/if_wm.c:1.198
--- src/sys/dev/pci/if_wm.c:1.197 Thu Feb 4 10:20:54 2010
+++ src/sys/dev/pci/if_wm.c Tue Feb 16 10:06:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.197 2010/02/04 10:20:54 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.198 2010/02/16 10:06:19 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.197 2010/02/04 10:20:54 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.198 2010/02/16 10:06:19 msaitoh Exp $);
#include rnd.h
@@ -650,7 +650,7 @@
Intel i82546EB 1000BASE-T Ethernet,
WM_T_82546, WMP_F_1000T },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD,
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD,
Intel i82546EB 1000BASE-T Ethernet,
WM_T_82546, WMP_F_1000T },
@@ -1147,8 +1147,7 @@
sc-sc_flags |= WM_F_PCIX;
if (pci_get_capability(pa-pa_pc, pa-pa_tag,
- PCI_CAP_PCIX,
- sc-sc_pcix_offset, NULL) == 0)
+PCI_CAP_PCIX, sc-sc_pcix_offset, NULL) == 0)
aprint_error_dev(sc-sc_dev,
unable to find PCIX capability\n);
else if (sc-sc_type != WM_T_82545_3
@@ -1688,7 +1687,7 @@
IFCAP_CSUM_TCPv6_Rx | IFCAP_CSUM_UDPv6_Rx;
}
- /*
+ /*
* If we're a i82544 or greater (except i82547), we can do
* TCP segmentation offload.
*/
@@ -2508,9 +2507,8 @@
case SIOCINITIFADDR:
if (ifa-ifa_addr-sa_family == AF_LINK) {
sdl = satosdl(ifp-if_dl-ifa_addr);
- (void)sockaddr_dl_setaddr(sdl, sdl-sdl_len,
- LLADDR(satosdl(ifa-ifa_addr)),
- ifp-if_addrlen);
+ (void)sockaddr_dl_setaddr(sdl, sdl-sdl_len,
+ LLADDR(satosdl(ifa-ifa_addr)), ifp-if_addrlen);
/* unicast address is first multicast entry */
wm_set_filter(sc);
error = 0;
@@ -3007,7 +3005,7 @@
* NOTE: CTRL will update TFCE and RFCE automatically,
* so we should update sc-sc_ctrl
*/
-
+
sc-sc_ctrl = CSR_READ(sc, WMREG_CTRL);
sc-sc_tctl = ~TCTL_COLD(0x3ff);
sc-sc_fcrtl = ~FCRTL_XONE;
@@ -3130,8 +3128,8 @@
sc-sc_txfifo_stall = 0;
break;
case WM_T_82571:
- case WM_T_82572:
- case WM_T_80003:
+ case WM_T_82572:
+ case WM_T_80003:
sc-sc_pba = PBA_32K;
break;
case WM_T_82573:
@@ -3612,9 +3610,8 @@
/* Bypass RX and TX FIFO's */
wm_kmrn_writereg(sc, KUMCTRLSTA_OFFSET_FIFO_CTRL,
- KUMCTRLSTA_FIFO_CTRL_RX_BYPASS |
- KUMCTRLSTA_FIFO_CTRL_TX_BYPASS);
-
+ KUMCTRLSTA_FIFO_CTRL_RX_BYPASS
+ | KUMCTRLSTA_FIFO_CTRL_TX_BYPASS);
wm_kmrn_writereg(sc, KUMCTRLSTA_OFFSET_INB_CTRL,
KUMCTRLSTA_INB_CTRL_DIS_PADDING |
KUMCTRLSTA_INB_CTRL_LINK_TMOUT_DFLT);
@@ -4007,7 +4004,7 @@
return 1;
}
- if (sc-sc_flags WM_F_EEPROM_HANDSHAKE) {
+ if (sc-sc_flags WM_F_EEPROM_HANDSHAKE) {
reg = CSR_READ(sc, WMREG_EECD);
/* Request EEPROM access. */
@@ -4239,7 +4236,7 @@
*/
static int
wm_validate_eeprom_checksum(struct wm_softc *sc)
-{
+{
uint16_t checksum;
uint16_t eeprom_data;
int i;
@@ -4585,7 +4582,7 @@
#undef ADD
- ifmedia_set(sc-sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(sc-sc_mii.mii_media, IFM_ETHER | IFM_AUTO);
}
/*
@@ -4636,7 +4633,7 @@
if (IFM_SUBTYPE(ife-ifm_media) == IFM_AUTO ||
(sc-sc_mii.mii_media.ifm_media IFM_FLOW) != 0)
sc-sc_txcw |= TXCW_SYM_PAUSE | TXCW_ASYM_PAUSE;
- if (IFM_SUBTYPE(ife-ifm_media) == IFM_AUTO) {
+ if (IFM_SUBTYPE(ife-ifm_media) == IFM_AUTO) {
sc-sc_txcw |= TXCW_ANE;
} else {
/*
@@ -4658,7 +4655,7 @@
i = CSR_READ(sc, WMREG_CTRL) CTRL_SWDPIN(1);
DPRINTF(WM_DEBUG_LINK,(%s: i = 0x%x\n, device_xname(sc-sc_dev),i));
- /*
+ /*
* On 82544 chips and later, the CTRL_SWDPIN(1) bit will be set if the
* optics detect a signal, 0 if they don't.
*/
@@ -5102,7 +5099,6 @@
sc-sc_mii.mii_writereg = wm_gmii_i82543_writereg;
}
break;
-
}
sc-sc_mii.mii_statchg = wm_gmii_statchg;
@@ -5143,8 +5139,8 @@
struct wm_softc *sc = ifp-if_softc;
ether_mediastatus(ifp, ifmr);
- ifmr-ifm_active = (ifmr-ifm_active ~IFM_ETH_FMASK) |
- sc-sc_flowflags;
+ ifmr-ifm_active = (ifmr-ifm_active ~IFM_ETH_FMASK)
+ | sc-sc_flowflags;
}
/*
@@ -5543,7 +5539,7 @@
/* Write page 800 */
wm_gmii_i82544_writereg(self, 1, BM_WUC_ADDRESS_OPCODE, regnum);
-
+
if (rd)
*val = wm_gmii_i82544_readreg(self, 1, BM_WUC_DATA_OPCODE);
else
@@ -5699,7 +5695,7 @@
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 16 10:10:04 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add entries for 82576 and 82580 To generate a diff of this commit: cvs rdiff -u -r1.1022 -r1.1023 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1022 src/sys/dev/pci/pcidevs:1.1023 --- src/sys/dev/pci/pcidevs:1.1022 Tue Feb 9 23:13:09 2010 +++ src/sys/dev/pci/pcidevs Tue Feb 16 10:10:04 2010 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1022 2010/02/09 23:13:09 hubertf Exp $ +$NetBSD: pcidevs,v 1.1023 2010/02/16 10:10:04 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2323,6 +2323,7 @@ product INTEL 82801I_IFE_GT 0x10c3 82801I (GT) LAN Controller product INTEL 82801H_IFE_GT 0x10c4 i82801H IFE (GT) LAN Controller product INTEL 82801H_IFE_G 0x10c5 i82801H IFE (G) LAN Controller +product INTEL 82576_COPPER 0x10c9 82576 1000BaseT Ethernet product INTEL 82801H_IGP_M_V 0x10cb i82801H IGP (MV) LAN Controller product INTEL 82801J_R_BM_LM 0x10cc i82567LM-2 LAN Controller product INTEL 82801J_R_BM_LF 0x10cd i82567LF-2 LAN Controller @@ -2333,6 +2334,9 @@ product INTEL 82801J_D_BM_LF 0x10df i82567LF-3 LAN Controller product INTEL 82575GB_QUAD_COPPER_PM 0x10e2 i82575GB Quad-1000baseT Ethernet (PM) product INTEL 82801I_BM 0x10e5 i82567LM-4 LAN Controller +product INTEL 82576_FIBER 0x10e6 82576 1000BaseX Ethernet +product INTEL 82576_SERDES 0x10e7 82576 gigabit Ethernet (SERDES) +product INTEL 82576_QUAD_COPPER 0x10e8 82576 quad-1000BaseT Ethernet product INTEL PCH_M_LM 0x10ea PCH LAN (82577LM) Controller product INTEL PCH_M_LC 0x10eb PCH LAN (82577LC) Controller product INTEL PCH_D_DM 0x10ef PCH LAN (82578DM) Controller @@ -2373,6 +2377,16 @@ product INTEL 82870P2_HPLUG 0x1462 82870P2 P64H2 Hot Plug Controller product INTEL 82801I_82567V_3 0x1501 i82567V-3 LAN Controller product INTEL 82583V 0x150c i82583V 1000baseT Ethernet +product INTEL 82576_NS 0x150a 82576 gigabit Ethernet +product INTEL 82576_SERDES_QUAD 0x150d 82576 quad-gigabit Ethernet (SERDES) +product INTEL 82580_COPPER 0x150e 82580 1000BaseT Ethernet +product INTEL 82580_FIBER 0x150f 82580 1000BaseX Ethernet +product INTEL 82580_SERDES 0x1510 82580 1000BaseT Ethernet (SERDES) +product INTEL 82580_SGMII 0x1511 82580 gigabit Ethernet (SGMII) +product INTEL 82580_COPPER_DUAL 0x1516 82580 dual-1000BaseT Ethernet +product INTEL 82576_NS_SERDES 0x1518 82576 gigabit Ethernet (SERDES) +product INTEL 82580_ER 0x151d 82580 1000BaseT Ethernet +product INTEL 82580_ER_DUAL 0x151e 82580 dual-1000BaseT Ethernet product INTEL 80960_RP 0x1960 ROB-in i960RP Microprocessor product INTEL 80960RM_2 0x1962 i960 RM PCI-PCI product INTEL 82840_HB 0x1a21 82840 Host
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Tue Feb 16 10:11:47 UTC 2010 Modified Files: src/share/man/man4: mpt.4 Log Message: Add an entry for SAS controller. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/mpt.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/mpt.4 diff -u src/share/man/man4/mpt.4:1.4 src/share/man/man4/mpt.4:1.5 --- src/share/man/man4/mpt.4:1.4 Thu Jan 3 01:51:58 2008 +++ src/share/man/man4/mpt.4 Tue Feb 16 10:11:47 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mpt.4,v 1.4 2008/01/03 01:51:58 jnemeth Exp $ +.\ $NetBSD: mpt.4,v 1.5 2010/02/16 10:11:47 msaitoh Exp $ .\ .\ Copyright (c) 2003 Wasabi Systems, Inc. .\ All rights reserved. @@ -33,7 +33,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 2, 2008 +.Dd February 16, 2009 .Dt MPT 4 .Os .Sh NAME @@ -50,6 +50,8 @@ .Tn SCSI and .Tn Fibre Channel +and +.Tn SAS controllers: .Pp .Bl -bullet -compact -offset indent @@ -60,6 +62,9 @@ 53c1030 .Pq Dual Ultra320 Tn SCSI .It +AS1068 +.Pq SAS/SATA +.It FC909 .Pq 1Gb/s Tn Fibre Channel .It
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Feb 16 15:17:18 UTC 2010
Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h if_wmvar.h
Log Message:
Add support for 82575, 82576 and 82580(ER).
- Apply the patch for 82575 from Wolfgang Stukenbrock (PR#42422). We use
only one RX ring and with the legacy mode.
- Add support for 82576.
- Partial support for 82580.
- Partial support for the serdes systems.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.198 src/sys/dev/pci/if_wm.c:1.199
--- src/sys/dev/pci/if_wm.c:1.198 Tue Feb 16 10:06:19 2010
+++ src/sys/dev/pci/if_wm.c Tue Feb 16 15:17:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.198 2010/02/16 10:06:19 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.199 2010/02/16 15:17:17 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.198 2010/02/16 10:06:19 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.199 2010/02/16 15:17:17 msaitoh Exp $);
#include rnd.h
@@ -231,6 +231,13 @@
#define WM_LINKUP_TIMEOUT 50
+static uint16_t swfwphysem[] = {
+ SWFW_PHY0_SM,
+ SWFW_PHY1_SM,
+ SWFW_PHY2_SM,
+ SWFW_PHY3_SM
+};
+
/*
* Software state per device.
*/
@@ -243,31 +250,33 @@
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 */
+
pci_chipset_tag_t sc_pc;
pcitag_t sc_pcitag;
+ int sc_bus_speed; /* PCI/PCIX bus speed */
+ int sc_pcixe_capoff; /* PCI[Xe] capability register offset */
wm_chip_type sc_type; /* MAC type */
int sc_rev; /* MAC revision */
wm_phy_type sc_phytype; /* PHY type */
+ int sc_funcid; /* unit number of the chip (0 to 3) */
int sc_flags; /* flags; see below */
int sc_if_flags; /* last if_flags */
- int sc_bus_speed; /* PCI/PCIX bus speed */
- int sc_pcix_offset; /* PCIX capability register offset */
int sc_flowflags; /* 802.3x flow control flags */
+ int sc_align_tweak;
void *sc_ih; /* interrupt cookie */
-
- int sc_ee_addrbits; /* EEPROM address bits */
-
- struct mii_data sc_mii; /* MII/media information */
-
callout_t sc_tick_ch; /* tick callout */
- bus_dmamap_t sc_cddmamap; /* control data DMA map */
-#define sc_cddma sc_cddmamap-dm_segs[0].ds_addr
-
- int sc_align_tweak;
+ int sc_ee_addrbits; /* EEPROM address bits */
+ int sc_ich8_flash_base;
+ int sc_ich8_flash_bank_size;
+ int sc_nvm_k1_enabled;
/*
* Software state for the transmit and receive descriptors.
@@ -364,9 +373,6 @@
#if NRND 0
rndsource_element_t rnd_source; /* random source */
#endif
- int sc_ich8_flash_base;
- int sc_ich8_flash_bank_size;
- int sc_nvm_k1_enabled;
};
#define WM_RXCHAIN_RESET(sc) \
@@ -523,6 +529,8 @@
static void wm_gmii_bm_writereg(device_t, int, int, int);
static int wm_gmii_hv_readreg(device_t, int, int);
static void wm_gmii_hv_writereg(device_t, int, int, int);
+static int wm_sgmii_readreg(device_t, int, int);
+static void wm_sgmii_writereg(device_t, int, int, int);
static void wm_gmii_statchg(device_t);
@@ -533,7 +541,7 @@
static int wm_kmrn_readreg(struct wm_softc *, int);
static void wm_kmrn_writereg(struct wm_softc *, int, int);
-static void wm_set_spiaddrsize(struct wm_softc *);
+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_is_onboard_nvm_eeprom(struct wm_softc *);
@@ -566,6 +574,8 @@
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);
+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);
@@ -882,6 +892,72 @@
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH_D_DC,
PCH LAN (82578DC) Controller,
WM_T_PCH, WMP_F_1000T },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575EB_COPPER,
+ 82575EB dual-1000baseT Ethernet,
+ WM_T_82575, WMP_F_1000T },
+#if 0
+ /*
+ * not sure if WMP_F_1000X or WMP_F_SERDES - we do not have it - so
+ * disabled for now ...
+ */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575EB_FIBER_SERDES,
+ 82575EB dual-1000baseX
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Tue Feb 16 16:56:30 UTC 2010
Modified Files:
src/sys/arch/hp700/hp700: machdep.c mainbus.c
src/sys/arch/hppa/hppa: pmap.c
src/sys/arch/hppa/include: vmparam.h
Log Message:
Remove the dma24_ex method of dealing with BUS_DMA_24BIT and replace
with a uvm managed freelist of pages in the right range.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/hp700/hp700/mainbus.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hppa/include/vmparam.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/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.78 src/sys/arch/hp700/hp700/machdep.c:1.79
--- src/sys/arch/hp700/hp700/machdep.c:1.78 Mon Feb 8 19:02:29 2010
+++ src/sys/arch/hp700/hp700/machdep.c Tue Feb 16 16:56:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.78 2010/02/08 19:02:29 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.79 2010/02/16 16:56:29 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.78 2010/02/08 19:02:29 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.79 2010/02/16 16:56:29 skrll Exp $);
#include opt_cputype.h
#include opt_ddb.h
@@ -247,13 +247,6 @@
/* Virtual page frame for /dev/mem (see mem.c) */
vaddr_t vmmap;
-/*
- * Certain devices need DMA'able memory below the 16MB boundary.
- */
-#define DMA24_SIZE (128 * 1024)
-struct extent *dma24_ex;
-long dma24_ex_storage[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
-
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store = {
#ifdef MULTIPROCESSOR
@@ -495,14 +488,6 @@
vstart += MSGBUFSIZE;
vstart = round_page(vstart);
- /* Allocate the 24-bit DMA region. */
- dma24_ex = extent_create(dma24, vstart, vstart + DMA24_SIZE, M_DEVBUF,
- (void *)dma24_ex_storage, sizeof(dma24_ex_storage),
- EX_NOCOALESCE|EX_NOWAIT);
- vstart += DMA24_SIZE;
- vstart = round_page(vstart);
-
-
if (usebtlb) {
/* Allocate and initialize the BTLB slots array. */
btlb_slots = (struct btlb_slot *) ALIGN(vstart);
Index: src/sys/arch/hp700/hp700/mainbus.c
diff -u src/sys/arch/hp700/hp700/mainbus.c:1.61 src/sys/arch/hp700/hp700/mainbus.c:1.62
--- src/sys/arch/hp700/hp700/mainbus.c:1.61 Fri Feb 12 22:34:39 2010
+++ src/sys/arch/hp700/hp700/mainbus.c Tue Feb 16 16:56:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.61 2010/02/12 22:34:39 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.62 2010/02/16 16:56:29 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.61 2010/02/12 22:34:39 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.62 2010/02/16 16:56:29 skrll Exp $);
#include locators.h
#include power.h
@@ -113,7 +113,6 @@
/* from machdep.c */
extern struct extent *hp700_io_extent;
-extern struct extent *dma24_ex;
u_int8_t mbus_r1(void *, bus_space_handle_t, bus_size_t);
u_int16_t mbus_r2(void *, bus_space_handle_t, bus_size_t);
@@ -1192,33 +1191,8 @@
* Allocate physical pages from the VM system.
*/
TAILQ_INIT(mlist);
- error = uvm_pglistalloc(size, low, high, 0, 0,
-mlist, nsegs, (flags BUS_DMA_NOWAIT) == 0);
-
- /*
- * If the allocation failed, and this is a 24-bit
- * device, see if we have space left in the 24-bit
- * region.
- */
- if (error == ENOMEM (flags BUS_DMA_24BIT) dma24_ex != NULL) {
- error = extent_alloc(dma24_ex, size, alignment, 0, 0, pa);
- if (!error) {
- free(mlist, M_DEVBUF);
- /*
- * A _ds_mlist value of NULL is the
- * signal to mbus_dmamem_map that no
- * real mapping needs to be done, and
- * it is the signal to mbus_dmamem_free
- * that an extent_free is needed.
- */
- *rsegs = 1;
- segs[0].ds_addr = 0;
- segs[0].ds_len = size;
- segs[0]._ds_va = (vaddr_t)pa;
- segs[0]._ds_mlist = NULL;
- return (0);
- }
- }
+ error = uvm_pglistalloc(size, low, high, 0, 0, mlist, nsegs,
+ (flags BUS_DMA_NOWAIT) == 0);
/* If we don't have the pages. */
if (error) {
@@ -1226,15 +1200,10 @@
return (error);
}
- /*
- * Since, at least as of revision 1.17 of uvm_pglist.c,
- * uvm_pglistalloc ignores its nsegs argument, we need
- * to check that the pages returned conform to the
- * caller's segment requirements.
- */
pa_next = 0;
seg = -1;
- for (m = TAILQ_FIRST(mlist); m != NULL; m = TAILQ_NEXT(m,pageq.queue)) {
+
+ TAILQ_FOREACH(m, mlist, pageq.queue) {
pa = VM_PAGE_TO_PHYS(m);
if (pa != pa_next) {
if (++seg = nsegs) {
@@ -1269,17 +1238,16 @@
void
mbus_dmamem_free(void *v, bus_dma_segment_t *segs, int nsegs)
{
-
+ struct pglist *mlist;
/*
*
CVS commit: src/usr.sbin/dumplfs
Module Name:src
Committed By: mlelstv
Date: Tue Feb 16 18:57:54 UTC 2010
Modified Files:
src/usr.sbin/dumplfs: dumplfs.c
Log Message:
Read the padded superblocks to avoid problems with disks that have
larger sectors than 512 Bytes.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/dumplfs/dumplfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/dumplfs/dumplfs.c
diff -u src/usr.sbin/dumplfs/dumplfs.c:1.37 src/usr.sbin/dumplfs/dumplfs.c:1.38
--- src/usr.sbin/dumplfs/dumplfs.c:1.37 Mon Jul 21 13:36:58 2008
+++ src/usr.sbin/dumplfs/dumplfs.c Tue Feb 16 18:57:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dumplfs.c,v 1.37 2008/07/21 13:36:58 lukem Exp $ */
+/* $NetBSD: dumplfs.c,v 1.38 2010/02/16 18:57:53 mlelstv Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = @(#)dumplfs.c 8.5 (Berkeley) 5/24/95;
#else
-__RCSID($NetBSD: dumplfs.c,v 1.37 2008/07/21 13:36:58 lukem Exp $);
+__RCSID($NetBSD: dumplfs.c,v 1.38 2010/02/16 18:57:53 mlelstv Exp $);
#endif
#endif /* not lint */
@@ -136,6 +136,7 @@
struct lfs lfs_sb1, lfs_sb2, *lfs_master;
daddr_t seg_addr, idaddr, sbdaddr;
int ch, do_allsb, do_ientries, do_segentries, fd, segnum;
+ void *sbuf;
do_allsb = 0;
do_ientries = 0;
@@ -178,9 +179,14 @@
if ((fd = open(special, O_RDONLY, 0)) 0)
err(1, %s, special);
+ sbuf = malloc(LFS_SBPAD);
+ if (sbuf == NULL)
+ err(1, malloc);
+
if (sbdaddr == 0x0) {
/* Read the proto-superblock */
- get(fd, LFS_LABELPAD, (lfs_sb1.lfs_dlfs), sizeof(struct dlfs));
+ get(fd, LFS_LABELPAD, sbuf, LFS_SBPAD);
+ memcpy((lfs_sb1.lfs_dlfs), sbuf, sizeof(struct dlfs));
/* If that wasn't the real first sb, get the real first sb */
if (lfs_sb1.lfs_version 1
@@ -194,7 +200,8 @@
*/
get(fd,
fsbtobyte(lfs_sb1, lfs_sb1.lfs_sboffs[1]),
- (lfs_sb2.lfs_dlfs), sizeof(struct dlfs));
+ sbuf, LFS_SBPAD);
+ memcpy((lfs_sb2.lfs_dlfs), sbuf, sizeof(struct dlfs));
lfs_master = lfs_sb1;
if (lfs_sb1.lfs_version 1) {
@@ -212,11 +219,13 @@
}
} else {
/* Read the first superblock */
- get(fd, dbtob((off_t)sbdaddr), (lfs_sb1.lfs_dlfs),
- sizeof(struct dlfs));
+ get(fd, dbtob((off_t)sbdaddr), sbuf, LFS_SBPAD);
+ memcpy((lfs_sb1.lfs_dlfs), sbuf, sizeof(struct dlfs));
lfs_master = lfs_sb1;
}
+ free(sbuf);
+
/* Compatibility */
if (lfs_master-lfs_version == 1) {
lfs_master-lfs_sumsize = LFS_V1_SUMMARY_SIZE;
CVS commit: src/share/man/man9
Module Name:src Committed By: rmind Date: Tue Feb 16 19:21:30 UTC 2010 Modified Files: src/share/man/man9: kpreempt.9 mutex.9 spl.9 Log Message: kpreempt(9): add a note when kernel preemption is disabled/deferred. Sprinkle cross-links, bump dates. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/kpreempt.9 cvs rdiff -u -r1.21 -r1.22 src/share/man/man9/mutex.9 cvs rdiff -u -r1.38 -r1.39 src/share/man/man9/spl.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/kpreempt.9 diff -u src/share/man/man9/kpreempt.9:1.2 src/share/man/man9/kpreempt.9:1.3 --- src/share/man/man9/kpreempt.9:1.2 Sun Dec 21 10:32:56 2008 +++ src/share/man/man9/kpreempt.9 Tue Feb 16 19:21:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: kpreempt.9,v 1.2 2008/12/21 10:32:56 ad Exp $ +.\ $NetBSD: kpreempt.9,v 1.3 2010/02/16 19:21:30 rmind Exp $ .\ .\ Copyright (c)2008 YAMAMOTO Takashi, .\ All rights reserved. @@ -25,7 +25,7 @@ .\ SUCH DAMAGE. .\ .\ -.Dd December 21, 2008 +.Dd February 16, 2010 .Dt KPREEMPT 9 .Os .\ @@ -52,6 +52,13 @@ On architectures where kernel preemption is not supported natively, these functions may still be used. .Pp +It should be noted that kernel preemption is also disabled when holding +the interrupt priority level above IPL_NONE, e.g. using +.Xr spl 9 +or spinning +.Xr mutex 9 +calls or holding kernel_lock (indicating that the code is not MT safe). +.Pp .Fn kpreempt_disable disables kernel preemption of the calling LWP. Note that disabling kernel preemption can prevent LWPs with higher priorities @@ -70,10 +77,11 @@ returns .Dv true if preemption of the calling LWP is disabled. -It's for diagnostic purpose. +It is only for diagnostic purpose. .\ .\ .Sh RETURN VALUES .\ .Sh SEE ALSO .Xr intro 9 , +.Xr mutex 9 , .Xr spl 9 Index: src/share/man/man9/mutex.9 diff -u src/share/man/man9/mutex.9:1.21 src/share/man/man9/mutex.9:1.22 --- src/share/man/man9/mutex.9:1.21 Mon Jan 25 17:27:41 2010 +++ src/share/man/man9/mutex.9 Tue Feb 16 19:21:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mutex.9,v 1.21 2010/01/25 17:27:41 jruoho Exp $ +.\ $NetBSD: mutex.9,v 1.22 2010/02/16 19:21:30 rmind Exp $ .\ .\ Copyright (c) 2007, 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 22, 2009 +.Dd February 16, 2010 .Dt MUTEX 9 .Os .Sh NAME @@ -251,6 +251,7 @@ .Xr membar_ops 3 , .Xr lockstat 8 , .Xr condvar 9 , +.Xr kpreempt 9 , .Xr rwlock 9 , .Xr spl 9 .Pp Index: src/share/man/man9/spl.9 diff -u src/share/man/man9/spl.9:1.38 src/share/man/man9/spl.9:1.39 --- src/share/man/man9/spl.9:1.38 Sun Feb 7 10:49:35 2010 +++ src/share/man/man9/spl.9 Tue Feb 16 19:21:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: spl.9,v 1.38 2010/02/07 10:49:35 wiz Exp $ +.\ $NetBSD: spl.9,v 1.39 2010/02/16 19:21:30 rmind Exp $ .\ .\ Copyright (c) 2000, 2001 Jason R. Thorpe. All rights reserved. .\ Copyright (c) 1997 Michael Long. @@ -27,7 +27,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd February 6, 2010 +.Dd February 16, 2010 .Dt SPL 9 .Os .Sh NAME @@ -210,6 +210,7 @@ .Sh SEE ALSO .Xr condvar 9 , .Xr i386/splraise 9 , +.Xr kpreempt 9 , .Xr mutex 9 , .Xr rwlock 9 .Sh HISTORY
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: dyoung
Date: Tue Feb 16 19:29:40 UTC 2010
Modified Files:
src/sys/arch/x86/pci: pci_machdep.c
Log Message:
PCI Configuration Mechanisms #1 and #2 are controlled by two to
three registers. Let us think of the kernel operating the registers
in two steps:
1) Select: enable configuration cycles and select a range of
configuration-space addresses.
2) Access: read or write a word in PCI configuration space.
To make the steps more explicit, extract some helper subroutines
from pci_conf_read(9) and pci_conf_write(9):
pci_conf_selector(tag, reg): from a pcitag_t and a register offset,
create a word that enables configuration cycles and selects a
configuration address range.
pci_conf_select(w): for `w' a word created by pci_conf_selector(),
enable configuration cycles and select the address range indicated
by `w'.
pci_conf_select(0): disable configuration cycles.
pci_conf_port(tag, reg): map a pcitag_t and a register offset to an I/O
port where the configuration access should occur.
While I'm in here, change the panic(9) calls to panic(%s: ...,
__func__) instead of hard-coding a subroutine name.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/pci/pci_machdep.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/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.38 src/sys/arch/x86/pci/pci_machdep.c:1.39
--- src/sys/arch/x86/pci/pci_machdep.c:1.38 Tue Feb 16 00:03:47 2010
+++ src/sys/arch/x86/pci/pci_machdep.c Tue Feb 16 19:29:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.38 2010/02/16 00:03:47 dyoung Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.39 2010/02/16 19:29:40 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.38 2010/02/16 00:03:47 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.39 2010/02/16 19:29:40 dyoung Exp $);
#include sys/types.h
#include sys/param.h
@@ -135,7 +135,6 @@
void *arg;
};
-
__cpu_simple_lock_t pci_conf_lock = __SIMPLELOCK_UNLOCKED;
#define PCI_CONF_LOCK(s) \
@@ -244,6 +243,59 @@
};
#endif
+static uint32_t
+pci_conf_selector(pcitag_t tag, int reg)
+{
+ static const pcitag_t mode2_mask = {
+ .mode2 = {
+ .enable = 0xff
+ , .forward = 0xff
+ }
+ };
+
+ switch (pci_mode) {
+ case 1:
+ return tag.mode1 | reg;
+ case 2:
+ return tag.mode1 mode2_mask.mode1;
+ default:
+ panic(%s: mode not configured, __func__);
+ }
+}
+
+static unsigned int
+pci_conf_port(pcitag_t tag, int reg)
+{
+ switch (pci_mode) {
+ case 1:
+ return PCI_MODE1_DATA_REG;
+ case 2:
+ return tag.mode2.port | reg;
+ default:
+ panic(%s: mode not configured, __func__);
+ }
+}
+
+static void
+pci_conf_select(uint32_t addr)
+{
+ pcitag_t tag;
+
+ switch (pci_mode) {
+ case 1:
+ outl(PCI_MODE1_ADDRESS_REG, addr);
+ return;
+ case 2:
+ tag.mode1 = addr;
+ outb(PCI_MODE2_ENABLE_REG, tag.mode2.enable);
+ if (tag.mode2.enable != 0)
+ outb(PCI_MODE2_FORWARD_REG, tag.mode2.forward);
+ return;
+ default:
+ panic(%s: mode not configured, __func__);
+ }
+}
+
void
pci_attach_hook(device_t parent, device_t self, struct pcibus_attach_args *pba)
{
@@ -295,21 +347,21 @@
switch (pci_mode) {
case 1:
if (bus = 256 || device = 32 || function = 8)
- panic(pci_make_tag: bad request);
+ panic(%s: bad request, __func__);
tag.mode1 = PCI_MODE1_ENABLE |
(bus 16) | (device 11) | (function 8);
return tag;
case 2:
if (bus = 256 || device = 16 || function = 8)
- panic(pci_make_tag: bad request);
+ panic(%s: bad request, __func__);
tag.mode2.port = 0xc000 | (device 8);
tag.mode2.enable = 0xf0 | (function 1);
tag.mode2.forward = bus;
return tag;
default:
- panic(pci_make_tag: mode not configured);
+ panic(%s: mode not configured, __func__);
}
}
@@ -336,7 +388,7 @@
*fp = (tag.mode2.enable 1) 0x7;
return;
default:
- panic(pci_decompose_tag: mode not configured);
+ panic(%s: mode not configured, __func__);
}
}
@@ -357,25 +409,12 @@
}
#endif
- switch (pci_mode) {
- case 1:
- PCI_CONF_LOCK(s);
- outl(PCI_MODE1_ADDRESS_REG, tag.mode1 | reg);
- data = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, 0);
- PCI_CONF_UNLOCK(s);
- return data;
- case 2:
- PCI_CONF_LOCK(s);
- outb(PCI_MODE2_ENABLE_REG, tag.mode2.enable);
- outb(PCI_MODE2_FORWARD_REG, tag.mode2.forward);
- data = inl(tag.mode2.port | reg);
- outb(PCI_MODE2_ENABLE_REG, 0);
- PCI_CONF_UNLOCK(s);
- return data;
- default:
- panic(pci_conf_read: mode not configured);
- }
+ PCI_CONF_LOCK(s);
+ pci_conf_select(pci_conf_selector(tag, reg));
+ data = inl(pci_conf_port(tag, reg));
+ pci_conf_select(0);
+ PCI_CONF_UNLOCK(s);
+ return data;
}
void
@@ -394,25 +433,11 @@
}
#endif
- switch
CVS commit: src/share/man/man9/man9.i386
Module Name:src Committed By: wiz Date: Tue Feb 16 19:59:31 UTC 2010 Modified Files: src/share/man/man9/man9.i386: nmi.9 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/man9.i386/nmi.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/man9.i386/nmi.9 diff -u src/share/man/man9/man9.i386/nmi.9:1.1 src/share/man/man9/man9.i386/nmi.9:1.2 --- src/share/man/man9/man9.i386/nmi.9:1.1 Fri Feb 12 00:45:38 2010 +++ src/share/man/man9/man9.i386/nmi.9 Tue Feb 16 19:59:31 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: nmi.9,v 1.1 2010/02/12 00:45:38 dyoung Exp $ +.\ $NetBSD: nmi.9,v 1.2 2010/02/16 19:59:31 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -34,7 +34,7 @@ .Nm nmi , .Nm nmi_establish , .Nm nmi_disestablish , -.Nd NMI +.Nd NMI .Sh SYNOPSIS .In x86/nmi.h .Ft nmi_handler_t *
CVS commit: src/sys/rump/fs/lib/libntfs
Module Name:src
Committed By: pooka
Date: Tue Feb 16 20:34:04 UTC 2010
Modified Files:
src/sys/rump/fs/lib/libntfs: Makefile
Log Message:
remove -D__NetBSD__ (it's done globally now)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/fs/lib/libntfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libntfs/Makefile
diff -u src/sys/rump/fs/lib/libntfs/Makefile:1.4 src/sys/rump/fs/lib/libntfs/Makefile:1.5
--- src/sys/rump/fs/lib/libntfs/Makefile:1.4 Tue Jul 29 13:17:43 2008
+++ src/sys/rump/fs/lib/libntfs/Makefile Tue Feb 16 20:34:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/07/29 13:17:43 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/16 20:34:03 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../fs/ntfs
@@ -8,7 +8,7 @@
SRCS= ntfs_compr.c ntfs_conv.c ntfs_ihash.c ntfs_subr.c \
ntfs_vfsops.c ntfs_vnops.c
-CFLAGS+=-Wno-pointer-sign -D__NetBSD__
+CFLAGS+=-Wno-pointer-sign
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Tue Feb 16 20:42:47 UTC 2010 Modified Files: src/sys/rump: Makefile.rump src/sys/rump/dev/lib/libcgd: Makefile src/sys/rump/dev/lib/libdisk: Makefile src/sys/rump/dev/lib/libdm: Makefile src/sys/rump/dev/lib/libnetsmb: Makefile src/sys/rump/dev/lib/librnd: Makefile src/sys/rump/dev/lib/libsysmon: Makefile src/sys/rump/dev/lib/libucom: Makefile src/sys/rump/dev/lib/libulpt: Makefile src/sys/rump/dev/lib/libumass: Makefile src/sys/rump/dev/lib/libusb: Makefile src/sys/rump/dev/lib/libwscons: Makefile src/sys/rump/dev/wip/libukbd: Makefile src/sys/rump/dev/wip/libums: Makefile src/sys/rump/dev/wip/libusbrum: Makefile src/sys/rump/fs/lib/libcd9660: Makefile src/sys/rump/fs/lib/libext2fs: Makefile src/sys/rump/fs/lib/libffs: Makefile src/sys/rump/fs/lib/libhfs: Makefile src/sys/rump/fs/lib/liblfs: Makefile src/sys/rump/fs/lib/libmsdos: Makefile src/sys/rump/fs/lib/libnfs: Makefile src/sys/rump/fs/lib/libnfsserver: Makefile src/sys/rump/fs/lib/libnilfs: Makefile src/sys/rump/fs/lib/libntfs: Makefile src/sys/rump/fs/lib/libsmbfs: Makefile src/sys/rump/fs/lib/libudf: Makefile src/sys/rump/librump/rumpcrypto: Makefile.rumpcrypto src/sys/rump/librump/rumpdev: Makefile.rumpdev src/sys/rump/librump/rumpkern: Makefile.rumpkern src/sys/rump/librump/rumpvfs: Makefile.rumpvfs src/sys/rump/net/lib/liblocal: Makefile src/sys/rump/net/lib/libnet80211: Makefile src/sys/rump/net/lib/libnetinet: Makefile.inc Log Message: Globally define -Wno-pointer-sign, as it has become a pointless exercise of add it to every Makefile individually. XXX: should autosynchronize with the rest of the kernel buildflags in sys/conf/Makefile.kern.inc. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/rump/Makefile.rump cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libcgd/Makefile cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libdisk/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libdm/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libnetsmb/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/librnd/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libsysmon/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libucom/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libulpt/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libumass/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libusb/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libwscons/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/wip/libukbd/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/wip/libums/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/libusbrum/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libcd9660/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/fs/lib/libext2fs/Makefile cvs rdiff -u -r1.9 -r1.10 src/sys/rump/fs/lib/libffs/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/fs/lib/libhfs/Makefile cvs rdiff -u -r1.5 -r1.6 src/sys/rump/fs/lib/liblfs/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libmsdos/Makefile cvs rdiff -u -r1.9 -r1.10 src/sys/rump/fs/lib/libnfs/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libnfsserver/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libnilfs/Makefile cvs rdiff -u -r1.5 -r1.6 src/sys/rump/fs/lib/libntfs/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libsmbfs/Makefile cvs rdiff -u -r1.5 -r1.6 src/sys/rump/fs/lib/libudf/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpcrypto/Makefile.rumpcrypto cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpdev/Makefile.rumpdev cvs rdiff -u -r1.73 -r1.74 src/sys/rump/librump/rumpkern/Makefile.rumpkern cvs rdiff -u -r1.23 -r1.24 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/liblocal/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnet80211/Makefile cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/libnetinet/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/Makefile.rump diff -u src/sys/rump/Makefile.rump:1.49 src/sys/rump/Makefile.rump:1.50 --- src/sys/rump/Makefile.rump:1.49 Tue Feb 9 16:16:26 2010 +++ src/sys/rump/Makefile.rump Tue Feb 16 20:42:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rump,v 1.49 2010/02/09 16:16:26 pooka Exp $ +# $NetBSD: Makefile.rump,v 1.50 2010/02/16 20:42:44 pooka Exp $ # WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet @@ -12,7 +12,7 @@ .endif CFLAGS+= -ffreestanding -fno-strict-aliasing -CWARNFLAGS+= -Wno-format-zero-length +CWARNFLAGS+= -Wno-format-zero-length -Wno-pointer-sign CPPFLAGS+= -D_RUMPKERNEL CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR
CVS commit: [netbsd-5] src/sys/arch/i386/i386
Module Name:src Committed By: bouyer Date: Tue Feb 16 21:24:15 UTC 2010 Modified Files: src/sys/arch/i386/i386 [netbsd-5]: ibcs2_machdep.c svr4_machdep.c Log Message: Pull up following revision(s) (requested by drochner in ticket #1307): sys/arch/i386/i386/svr4_machdep.c: revision 1.96 sys/arch/i386/i386/ibcs2_machdep.c: revision 1.40 fix confused CS selector, fixes the panic reported by Mark Davis per PR port-i386/42787 (the panic happens due to a GPF when a privileged descriptor is tried to be loaded with the UPL bit set) The original bug is very old (pre-2.0, i386/svr4_machdep.c rev. 1.69), but it was relatively harmless until the order of GDT entries was shuffled (pre-5.0, i386/segments.h rev. 1.42). Before, it caused a userlevel data selector to be used for CS which broke the emulation (likely the reason of PR port-i386/32424). The shuffle made that a privileged selector was used, causing the GPF. (recent -current doesn't panic on that GPF which seems to be a side effect of another change) To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.10.1 src/sys/arch/i386/i386/ibcs2_machdep.c cvs rdiff -u -r1.92 -r1.92.4.1 src/sys/arch/i386/i386/svr4_machdep.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/i386/i386/ibcs2_machdep.c diff -u src/sys/arch/i386/i386/ibcs2_machdep.c:1.36 src/sys/arch/i386/i386/ibcs2_machdep.c:1.36.10.1 --- src/sys/arch/i386/i386/ibcs2_machdep.c:1.36 Mon Apr 28 20:23:24 2008 +++ src/sys/arch/i386/i386/ibcs2_machdep.c Tue Feb 16 21:24:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_machdep.c,v 1.36 2008/04/28 20:23:24 martin Exp $ */ +/* $NetBSD: ibcs2_machdep.c,v 1.36.10.1 2010/02/16 21:24:15 bouyer Exp $ */ /*- * Copyright (c) 1997, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ibcs2_machdep.c,v 1.36 2008/04/28 20:23:24 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: ibcs2_machdep.c,v 1.36.10.1 2010/02/16 21:24:15 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_vm86.h @@ -78,7 +78,7 @@ pcb-pcb_savefpu.sv_87.sv_env.en_cw = __iBCS2_NPXCW__; tf = l-l_md.md_regs; tf-tf_eax = 0x200; /* XXX base of heap */ - tf-tf_cs = GSEL(LUCODEBIG_SEL, SEL_UPL); + tf-tf_cs = GSEL(GUCODEBIG_SEL, SEL_UPL); } /* Index: src/sys/arch/i386/i386/svr4_machdep.c diff -u src/sys/arch/i386/i386/svr4_machdep.c:1.92 src/sys/arch/i386/i386/svr4_machdep.c:1.92.4.1 --- src/sys/arch/i386/i386/svr4_machdep.c:1.92 Fri Sep 19 19:15:58 2008 +++ src/sys/arch/i386/i386/svr4_machdep.c Tue Feb 16 21:24:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_machdep.c,v 1.92 2008/09/19 19:15:58 christos Exp $ */ +/* $NetBSD: svr4_machdep.c,v 1.92.4.1 2010/02/16 21:24:15 bouyer Exp $ */ /*- * Copyright (c) 1994, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: svr4_machdep.c,v 1.92 2008/09/19 19:15:58 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: svr4_machdep.c,v 1.92.4.1 2010/02/16 21:24:15 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_vm86.h @@ -119,7 +119,7 @@ pcb-pcb_savefpu.sv_xmm.sv_env.en_cw = __SVR4_NPXCW__; else pcb-pcb_savefpu.sv_87.sv_env.en_cw = __SVR4_NPXCW__; - tf-tf_cs = GSEL(LUCODEBIG_SEL, SEL_UPL); + tf-tf_cs = GSEL(GUCODEBIG_SEL, SEL_UPL); } void *
CVS commit: [netbsd-5-0] src/sys/arch/i386/i386
Module Name:src Committed By: bouyer Date: Tue Feb 16 21:24:22 UTC 2010 Modified Files: src/sys/arch/i386/i386 [netbsd-5-0]: ibcs2_machdep.c svr4_machdep.c Log Message: Pull up following revision(s) (requested by drochner in ticket #1307): sys/arch/i386/i386/svr4_machdep.c: revision 1.96 sys/arch/i386/i386/ibcs2_machdep.c: revision 1.40 fix confused CS selector, fixes the panic reported by Mark Davis per PR port-i386/42787 (the panic happens due to a GPF when a privileged descriptor is tried to be loaded with the UPL bit set) The original bug is very old (pre-2.0, i386/svr4_machdep.c rev. 1.69), but it was relatively harmless until the order of GDT entries was shuffled (pre-5.0, i386/segments.h rev. 1.42). Before, it caused a userlevel data selector to be used for CS which broke the emulation (likely the reason of PR port-i386/32424). The shuffle made that a privileged selector was used, causing the GPF. (recent -current doesn't panic on that GPF which seems to be a side effect of another change) To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.16.1 src/sys/arch/i386/i386/ibcs2_machdep.c cvs rdiff -u -r1.92 -r1.92.6.1 src/sys/arch/i386/i386/svr4_machdep.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/i386/i386/ibcs2_machdep.c diff -u src/sys/arch/i386/i386/ibcs2_machdep.c:1.36 src/sys/arch/i386/i386/ibcs2_machdep.c:1.36.16.1 --- src/sys/arch/i386/i386/ibcs2_machdep.c:1.36 Mon Apr 28 20:23:24 2008 +++ src/sys/arch/i386/i386/ibcs2_machdep.c Tue Feb 16 21:24:22 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_machdep.c,v 1.36 2008/04/28 20:23:24 martin Exp $ */ +/* $NetBSD: ibcs2_machdep.c,v 1.36.16.1 2010/02/16 21:24:22 bouyer Exp $ */ /*- * Copyright (c) 1997, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ibcs2_machdep.c,v 1.36 2008/04/28 20:23:24 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: ibcs2_machdep.c,v 1.36.16.1 2010/02/16 21:24:22 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_vm86.h @@ -78,7 +78,7 @@ pcb-pcb_savefpu.sv_87.sv_env.en_cw = __iBCS2_NPXCW__; tf = l-l_md.md_regs; tf-tf_eax = 0x200; /* XXX base of heap */ - tf-tf_cs = GSEL(LUCODEBIG_SEL, SEL_UPL); + tf-tf_cs = GSEL(GUCODEBIG_SEL, SEL_UPL); } /* Index: src/sys/arch/i386/i386/svr4_machdep.c diff -u src/sys/arch/i386/i386/svr4_machdep.c:1.92 src/sys/arch/i386/i386/svr4_machdep.c:1.92.6.1 --- src/sys/arch/i386/i386/svr4_machdep.c:1.92 Fri Sep 19 19:15:58 2008 +++ src/sys/arch/i386/i386/svr4_machdep.c Tue Feb 16 21:24:22 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_machdep.c,v 1.92 2008/09/19 19:15:58 christos Exp $ */ +/* $NetBSD: svr4_machdep.c,v 1.92.6.1 2010/02/16 21:24:22 bouyer Exp $ */ /*- * Copyright (c) 1994, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: svr4_machdep.c,v 1.92 2008/09/19 19:15:58 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: svr4_machdep.c,v 1.92.6.1 2010/02/16 21:24:22 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_vm86.h @@ -119,7 +119,7 @@ pcb-pcb_savefpu.sv_xmm.sv_env.en_cw = __SVR4_NPXCW__; else pcb-pcb_savefpu.sv_87.sv_env.en_cw = __SVR4_NPXCW__; - tf-tf_cs = GSEL(LUCODEBIG_SEL, SEL_UPL); + tf-tf_cs = GSEL(GUCODEBIG_SEL, SEL_UPL); } void *
CVS commit: [netbsd-5] src/tools/compat
Module Name:src Committed By: bouyer Date: Tue Feb 16 21:26:39 UTC 2010 Modified Files: src/tools/compat [netbsd-5]: getmode.c Log Message: Pull up following revision(s) (requested by snj in ticket #1308): tools/compat/getmode.c: revision 1.8 include unistd.h where getmode is traditionally declared To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.6.1 src/tools/compat/getmode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/getmode.c diff -u src/tools/compat/getmode.c:1.7 src/tools/compat/getmode.c:1.7.6.1 --- src/tools/compat/getmode.c:1.7 Mon Apr 28 20:24:12 2008 +++ src/tools/compat/getmode.c Tue Feb 16 21:26:39 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: getmode.c,v 1.7 2008/04/28 20:24:12 martin Exp $ */ +/* $NetBSD: getmode.c,v 1.7.6.1 2010/02/16 21:26:39 bouyer Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,6 +31,7 @@ #include nbtool_config.h #include stdlib.h +#include unistd.h void * setmode(const char *str)
CVS commit: [netbsd-5-0] src/tools/compat
Module Name:src Committed By: bouyer Date: Tue Feb 16 21:26:44 UTC 2010 Modified Files: src/tools/compat [netbsd-5-0]: getmode.c Log Message: Pull up following revision(s) (requested by snj in ticket #1308): tools/compat/getmode.c: revision 1.8 include unistd.h where getmode is traditionally declared To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.8.1 src/tools/compat/getmode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/getmode.c diff -u src/tools/compat/getmode.c:1.7 src/tools/compat/getmode.c:1.7.8.1 --- src/tools/compat/getmode.c:1.7 Mon Apr 28 20:24:12 2008 +++ src/tools/compat/getmode.c Tue Feb 16 21:26:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: getmode.c,v 1.7 2008/04/28 20:24:12 martin Exp $ */ +/* $NetBSD: getmode.c,v 1.7.8.1 2010/02/16 21:26:44 bouyer Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,6 +31,7 @@ #include nbtool_config.h #include stdlib.h +#include unistd.h void * setmode(const char *str)
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Tue Feb 16 21:27:22 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Tickets 1307 1308 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 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.3 src/doc/CHANGES-5.0.3:1.1.2.4 --- src/doc/CHANGES-5.0.3:1.1.2.3 Mon Feb 15 01:20:27 2010 +++ src/doc/CHANGES-5.0.3 Tue Feb 16 21:27:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.3 2010/02/15 01:20:27 snj Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.4 2010/02/16 21:27:22 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -125,3 +125,25 @@ as the version used to build the package [joerg, ticket #1298] +sys/arch/i386/i386/ibcs2_machdep.c 1.40 +sys/arch/i386/i386/svr4_machdep.c 1.96 + + fix confused CS selector, fixes the panic reported by Mark Davis + per PR port-i386/42787 (the panic happens due to a GPF when a + privileged descriptor is tried to be loaded with the UPL bit set) + The original bug is very old (pre-2.0, i386/svr4_machdep.c rev. 1.69), + but it was relatively harmless until the order of GDT entries was + shuffled (pre-5.0, i386/segments.h rev. 1.42). Before, it caused + a userlevel data selector to be used for CS which broke the emulation + (likely the reason of PR port-i386/32424). The shuffle made that + a privileged selector was used, causing the GPF. + (recent -current doesn't panic on that GPF which seems to be a + side effect of another change) + [drochner, ticket #1307] + +tools/compat/getmode.c1.8 + + include unistd.h where getmode is traditionally declared. + Fix build on OS X 10.6. + [snj, ticket #1308] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Tue Feb 16 21:27:25 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 1307 1308 To generate a diff of this commit: cvs rdiff -u -r1.1.2.197 -r1.1.2.198 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.197 src/doc/CHANGES-5.1:1.1.2.198 --- src/doc/CHANGES-5.1:1.1.2.197 Mon Feb 15 18:04:37 2010 +++ src/doc/CHANGES-5.1 Tue Feb 16 21:27:25 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.197 2010/02/15 18:04:37 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.198 2010/02/16 21:27:25 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16764,3 +16764,25 @@ Enable cgd(4) support on all amd64 and i386 XEN kernels. [tron, ticket #1306] +sys/arch/i386/i386/ibcs2_machdep.c 1.40 +sys/arch/i386/i386/svr4_machdep.c 1.96 + + fix confused CS selector, fixes the panic reported by Mark Davis + per PR port-i386/42787 (the panic happens due to a GPF when a + privileged descriptor is tried to be loaded with the UPL bit set) + The original bug is very old (pre-2.0, i386/svr4_machdep.c rev. 1.69), + but it was relatively harmless until the order of GDT entries was + shuffled (pre-5.0, i386/segments.h rev. 1.42). Before, it caused + a userlevel data selector to be used for CS which broke the emulation + (likely the reason of PR port-i386/32424). The shuffle made that + a privileged selector was used, causing the GPF. + (recent -current doesn't panic on that GPF which seems to be a + side effect of another change) + [drochner, ticket #1307] + +tools/compat/getmode.c1.8 + + include unistd.h where getmode is traditionally declared. + Fix build on OS X 10.6. + [snj, ticket #1308] +
CVS commit: src/libexec/lfs_cleanerd
Module Name:src
Committed By: mlelstv
Date: Tue Feb 16 23:13:13 UTC 2010
Modified Files:
src/libexec/lfs_cleanerd: lfs_cleanerd.c
Log Message:
Read the padded superblocks to avoid problems with disks that have
larger sectors than 512 Bytes.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/libexec/lfs_cleanerd/lfs_cleanerd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/lfs_cleanerd/lfs_cleanerd.c
diff -u src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.22 src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.23
--- src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.22 Fri Oct 9 16:35:17 2009
+++ src/libexec/lfs_cleanerd/lfs_cleanerd.c Tue Feb 16 23:13:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.22 2009/10/09 16:35:17 pooka Exp $ */
+/* $NetBSD: lfs_cleanerd.c,v 1.23 2010/02/16 23:13:13 mlelstv Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -203,6 +203,7 @@
struct statvfs sf;
int rootfd;
int i;
+ void *sbuf;
/*
* Get the raw device from the block device.
@@ -233,10 +234,20 @@
return -4;
kops.ko_close(rootfd);
+ sbuf = malloc(LFS_SBPAD);
+ if (sbuf == NULL) {
+ syslog(LOG_ERR, couldn't malloc superblock buffer);
+ return -1;
+ }
+
/* Load in the superblock */
- if (kops.ko_pread(fs-clfs_devfd, (fs-lfs_dlfs), sizeof(struct dlfs),
- LFS_LABELPAD) 0)
+ if (kops.ko_pread(fs-clfs_devfd, sbuf, LFS_SBPAD, LFS_LABELPAD) 0) {
+ free(sbuf);
return -1;
+ }
+
+ memcpy((fs-lfs_dlfs), sbuf, sizeof(struct dlfs));
+ free(sbuf);
/* If this is not a version 2 filesystem, complain and exit */
if (fs-lfs_version != 2) {
CVS commit: src
Module Name:src
Committed By: mlelstv
Date: Tue Feb 16 23:20:31 UTC 2010
Modified Files:
src/sbin/fsck_lfs: dir.c inode.c kernelops.h lfs.c pass1.c pass4.c
pass6.c segwrite.c segwrite.h setup.c vars.c vnode.c
src/sbin/newfs_lfs: make_lfs.c newfs.c
src/sys/ufs/lfs: lfs.h lfs_balloc.c lfs_bio.c lfs_inode.c lfs_segment.c
lfs_subr.c lfs_syscalls.c lfs_vfsops.c
Log Message:
Three changes in a single commit.
- drop the notion of frags (LFS fragments) vs fsb (FFS fragments)
The code uses a complicated unity function that just makes the
code difficult to understand.
- support larger sector sizes. Fix disk address computations
to use DEV_BSIZE in the kernel as required by device drivers
and to use sector sizes in userland.
- Fix several locking bugs in lfs_bio.c and lfs_subr.c.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sbin/fsck_lfs/dir.c
cvs rdiff -u -r1.41 -r1.42 src/sbin/fsck_lfs/inode.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/fsck_lfs/kernelops.h
cvs rdiff -u -r1.31 -r1.32 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.29 -r1.30 src/sbin/fsck_lfs/pass1.c
cvs rdiff -u -r1.16 -r1.17 src/sbin/fsck_lfs/pass4.c
cvs rdiff -u -r1.22 -r1.23 src/sbin/fsck_lfs/pass6.c
cvs rdiff -u -r1.19 -r1.20 src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/fsck_lfs/segwrite.h
cvs rdiff -u -r1.36 -r1.37 src/sbin/fsck_lfs/setup.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/fsck_lfs/vars.c
cvs rdiff -u -r1.10 -r1.11 src/sbin/fsck_lfs/vnode.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/newfs_lfs/make_lfs.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/newfs_lfs/newfs.c
cvs rdiff -u -r1.132 -r1.133 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.68 -r1.69 src/sys/ufs/lfs/lfs_balloc.c
cvs rdiff -u -r1.116 -r1.117 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.121 -r1.122 src/sys/ufs/lfs/lfs_inode.c
cvs rdiff -u -r1.214 -r1.215 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.73 -r1.74 src/sys/ufs/lfs/lfs_subr.c
cvs rdiff -u -r1.135 -r1.136 src/sys/ufs/lfs/lfs_syscalls.c
cvs rdiff -u -r1.282 -r1.283 src/sys/ufs/lfs/lfs_vfsops.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_lfs/dir.c
diff -u src/sbin/fsck_lfs/dir.c:1.24 src/sbin/fsck_lfs/dir.c:1.25
--- src/sbin/fsck_lfs/dir.c:1.24 Fri May 16 09:21:59 2008
+++ src/sbin/fsck_lfs/dir.c Tue Feb 16 23:20:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.24 2008/05/16 09:21:59 hannken Exp $ */
+/* $NetBSD: dir.c,v 1.25 2010/02/16 23:20:30 mlelstv Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -144,7 +144,7 @@
(idesc-id_filesize (DIRBLKSIZ - 1)) != 0)
idesc-id_filesize = roundup(idesc-id_filesize, DIRBLKSIZ);
blksiz = idesc-id_numfrags * fs-lfs_fsize;
- if (chkrange(idesc-id_blkno, fragstofsb(fs, idesc-id_numfrags))) {
+ if (chkrange(idesc-id_blkno, idesc-id_numfrags)) {
idesc-id_filesize -= blksiz;
return (SKIP);
}
Index: src/sbin/fsck_lfs/inode.c
diff -u src/sbin/fsck_lfs/inode.c:1.41 src/sbin/fsck_lfs/inode.c:1.42
--- src/sbin/fsck_lfs/inode.c:1.41 Thu Feb 4 23:55:43 2010
+++ src/sbin/fsck_lfs/inode.c Tue Feb 16 23:20:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.41 2010/02/04 23:55:43 christos Exp $ */
+/* $NetBSD: inode.c,v 1.42 2010/02/16 23:20:30 mlelstv Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -242,7 +242,7 @@
return (n);
} else
func = dirscan;
- if (chkrange(idesc-id_blkno, fragstofsb(fs, idesc-id_numfrags)))
+ if (chkrange(idesc-id_blkno, idesc-id_numfrags))
return (SKIP);
devvp = fs-lfs_devvp;
Index: src/sbin/fsck_lfs/kernelops.h
diff -u src/sbin/fsck_lfs/kernelops.h:1.3 src/sbin/fsck_lfs/kernelops.h:1.4
--- src/sbin/fsck_lfs/kernelops.h:1.3 Tue Oct 13 22:04:31 2009
+++ src/sbin/fsck_lfs/kernelops.h Tue Feb 16 23:20:30 2010
@@ -19,4 +19,6 @@
};
extern const struct kernelops kops;
+extern long dev_bsize;
+
#endif /* _LFS_KERNEL_OPS_H_ */
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.31 src/sbin/fsck_lfs/lfs.c:1.32
--- src/sbin/fsck_lfs/lfs.c:1.31 Thu Aug 6 00:51:55 2009
+++ src/sbin/fsck_lfs/lfs.c Tue Feb 16 23:20:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.31 2009/08/06 00:51:55 pooka Exp $ */
+/* $NetBSD: lfs.c,v 1.32 2010/02/16 23:20:30 mlelstv Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -102,6 +102,8 @@
extern struct uvnodelst getvnodelist[VNODE_HASH_MAX];
extern int nvnodes;
+long dev_bsize;
+
static int
lfs_fragextend(struct uvnode *, int, int, daddr_t, struct ubuf **);
@@ -119,12 +121,12 @@
if (bp-b_flags B_READ) {
count = kops.ko_pread(bp-b_vp-v_fd, bp-b_data, bp-b_bcount,
- dbtob(bp-b_blkno));
+ bp-b_blkno * dev_bsize);
if (count == bp-b_bcount)
bp-b_flags |= B_DONE;
} else {
count = kops.ko_pwrite(bp-b_vp-v_fd, bp-b_data, bp-b_bcount,
- dbtob(bp-b_blkno));
+ bp-b_blkno * dev_bsize);
if (count == 0) {
CVS commit: src/sys/kern
Module Name:src Committed By: dyoung Date: Wed Feb 17 00:15:24 UTC 2010 Modified Files: src/sys/kern: kern_pmf.c Log Message: Initialize the temporary pmf_qual_t in pmf_device_subtree_release() to avoid a failed ds != NULL assertion, later. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/kern/kern_pmf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_pmf.c diff -u src/sys/kern/kern_pmf.c:1.31 src/sys/kern/kern_pmf.c:1.32 --- src/sys/kern/kern_pmf.c:1.31 Fri Jan 8 20:07:14 2010 +++ src/sys/kern/kern_pmf.c Wed Feb 17 00:15:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_pmf.c,v 1.31 2010/01/08 20:07:14 dyoung Exp $ */ +/* $NetBSD: kern_pmf.c,v 1.32 2010/02/17 00:15:24 dyoung Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_pmf.c,v 1.31 2010/01/08 20:07:14 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_pmf.c,v 1.32 2010/02/17 00:15:24 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -861,6 +861,8 @@ device_pmf_remove_suspensor(dv, qual); + pmf_qual_recursive_copy(pq, qual); + return pmf_device_descendants_release(dv, pq); }
CVS commit: src/share/man/man8
Module Name:src Committed By: snj Date: Wed Feb 17 00:49:21 UTC 2010 Modified Files: src/share/man/man8: afterboot.8 Log Message: Fix punctuation and update SEE ALSO section. From Bug Hunting in PR misc/40293. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/share/man/man8/afterboot.8 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/man8/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.45 src/share/man/man8/afterboot.8:1.46 --- src/share/man/man8/afterboot.8:1.45 Wed Feb 10 07:38:09 2010 +++ src/share/man/man8/afterboot.8 Wed Feb 17 00:49:21 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: afterboot.8,v 1.45 2010/02/10 07:38:09 wiz Exp $ +.\ $NetBSD: afterboot.8,v 1.46 2010/02/17 00:49:21 snj Exp $ .\ $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\ .\ Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -594,7 +594,7 @@ To add new users and groups, there are .Xr useradd 8 and -.Xr groupadd 8 , +.Xr groupadd 8 ; see also .Xr user 8 for further programs for user and group manipulation. @@ -1002,46 +1002,70 @@ .Xr date 1 , .Xr df 1 , .Xr domainname 1 , +.Xr fstat 1 , .Xr hostname 1 , .Xr make 1 , .Xr man 1 , .Xr netstat 1 , .Xr newaliases 1 , .Xr passwd 1 , +.Xr pkg_add 1 , +.Xr ps 1 , +.Xr ssh 1 , .Xr su 1 , +.Xr systat 1 , +.Xr top 1 , +.Xr xdm 1 , .Xr ccd 4 , .Xr aliases 5 , .Xr crontab 5 , +.Xr dhclient.conf 5 , .Xr exports 5 , .Xr fstab 5 , .Xr group 5 , +.Xr ifconfig.if 5 , .Xr mailer.conf 5 , +.Xr nsswitch.conf 5 , .Xr passwd 5 , +.Xr printcap 5 , .Xr rc.conf 5 , .Xr resolv.conf 5 , +.Xr sshd_config 5 , +.Xr wscons.conf 5 , .Xr hier 7 , .Xr hostname 7 , .Xr pkgsrc 7 , .Xr amd 8 , .Xr ccdconfig 8 , .Xr chown 8 , +.Xr dhclient 8 , .Xr dhcpd 8 , +.Xr dmesg 8 , +.Xr groupadd 8 , .Xr ifconfig 8 , .Xr inetd 8 , .Xr kerberos 8 , +.Xr lpd 8 , .Xr mount 8 , .Xr mrouted 8 , .Xr mtree 8 , .Xr named 8 , .Xr nis 8 , +.Xr ntpd 8 , +.Xr ntpdate 8 , .Xr rbootd 8 , .Xr rc 8 , +.Xr rdate 8 , .Xr rmt 8 , .Xr route 8 , .Xr rpc.bootparamd 8 , +.Xr rpcbind 8 , +.Xr sshd 8 , +.Xr timed 8 , .Xr umount 8 , .Xr useradd 8 , .Xr vipw 8 , +.Xr yp 8 , .Xr ypbind 8 .Sh HISTORY This document first appeared in
CVS commit: src/dist/dhcp/client
Module Name:src Committed By: snj Date: Wed Feb 17 01:17:37 UTC 2010 Modified Files: src/dist/dhcp/client: dhclient.conf.5 Log Message: Fix a thinko: the DHCP _client_ is doing the requesting. Reported by Anonymous in PR misc/39162. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/dist/dhcp/client/dhclient.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/dhcp/client/dhclient.conf.5 diff -u src/dist/dhcp/client/dhclient.conf.5:1.8 src/dist/dhcp/client/dhclient.conf.5:1.9 --- src/dist/dhcp/client/dhclient.conf.5:1.8 Thu Aug 11 17:13:21 2005 +++ src/dist/dhcp/client/dhclient.conf.5 Wed Feb 17 01:17:36 2010 @@ -1,4 +1,4 @@ -.\ $Id: dhclient.conf.5,v 1.8 2005/08/11 17:13:21 drochner Exp $ +.\ $Id: dhclient.conf.5,v 1.9 2010/02/17 01:17:36 snj Exp $ .\ .\ Copyright (c) 2004 by Internet Systems Consortium, Inc. (ISC) .\ Copyright (c) 1996-2003 by Internet Software Consortium @@ -183,7 +183,7 @@ The request statement causes the client to request that any server responding to the client send the client its values for the specified options. Only the option names should be specified in the request -statement - not option parameters. By default, the DHCP server +statement - not option parameters. By default, the DHCP client requests the subnet-mask, broadcast-address, time-offset, routers, domain-name, domain-name-servers and host-name options. .PP
CVS commit: src/sys/arch/ia64/include
Module Name:src
Committed By: kiyohara
Date: Wed Feb 17 06:06:50 UTC 2010
Modified Files:
src/sys/arch/ia64/include: proc.h
Log Message:
Fix type missmatch.
forgot to commit since change ia64/syscall.c,1.5.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/include/proc.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/ia64/include/proc.h
diff -u src/sys/arch/ia64/include/proc.h:1.4 src/sys/arch/ia64/include/proc.h:1.5
--- src/sys/arch/ia64/include/proc.h:1.4 Sat Nov 21 15:36:34 2009
+++ src/sys/arch/ia64/include/proc.h Wed Feb 17 06:06:50 2010
@@ -21,7 +21,7 @@
struct mdproc {
/* XXX: Todo */
- void (*md_syscall)(struct trapframe *);
+ void (*md_syscall)(struct lwp *, u_int64_t, struct trapframe *);
/* Syscall handling function */
};
