Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/uebayasi-xip]: src Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/b121740489fd
branches: uebayasi-xip
changeset: 751843:b121740489fd
user: uebayasi <uebayasi%NetBSD.org@localhost>
date: Tue Nov 09 06:03:26 2010 +0000
description:
Sync with HEAD.
diffstat:
share/man/man4/Makefile | 4 +-
share/man/man4/acpi.4 | 6 ++-
share/man/man4/pciide.4 | 8 +++-
share/man/man4/schide.4 | 47 +++++++++++++++++++++++++++++++
share/man/man9/uvm.9 | 6 +--
sys/arch/amd64/conf/XEN3_DOM0 | 3 +-
sys/arch/hp700/dev/dino.c | 11 +-----
sys/arch/hp700/dev/elroy.c | 14 +--------
sys/arch/hp700/hp700/machdep.c | 10 +++++-
sys/arch/i386/conf/ALL | 6 ++-
sys/arch/i386/conf/GENERIC | 5 +-
sys/arch/i386/conf/XEN3_DOM0 | 4 +-
sys/arch/i386/stand/boot/boot2.c | 6 +-
sys/arch/i386/stand/pxeboot/main.c | 6 +-
sys/arch/macppc/dev/pbms.c | 4 +-
sys/arch/mips/mips/locore_mips1.S | 8 ++--
sys/arch/powerpc/conf/files.ibm4xx | 10 +++++-
sys/arch/powerpc/ibm4xx/dev/plb.c | 8 +++-
sys/arch/powerpc/powerpc/bus_space.c | 8 +++-
sys/arch/sparc/stand/ofwboot/boot.c | 7 +++-
sys/arch/sparc64/sparc64/vm_machdep.c | 6 +-
sys/arch/x86/include/pci_machdep_common.h | 5 ++-
sys/arch/x86/pci/pciide_machdep.c | 11 +++++-
sys/arch/x86/x86/bus_dma.c | 8 +++-
sys/arch/x86/x86/cpu.c | 8 +++-
sys/arch/xen/x86/cpu.c | 8 +++-
sys/uvm/uvm_meter.c | 7 +--
27 files changed, 160 insertions(+), 74 deletions(-)
diffs (truncated from 868 to 300 lines):
diff -r 8d7ce8496bcf -r b121740489fd share/man/man4/Makefile
--- a/share/man/man4/Makefile Tue Nov 09 04:50:50 2010 +0000
+++ b/share/man/man4/Makefile Tue Nov 09 06:03:26 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.516.2.4 2010/11/06 08:05:44 uebayasi Exp $
+# $NetBSD: Makefile,v 1.516.2.5 2010/11/09 06:03:26 uebayasi Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -49,7 +49,7 @@
qe.4 qec.4 qsphy.4 \
raid.4 ral.4 ray.4 rcons.4 re.4 rgephy.4 rlphy.4 rnd.4 route.4 \
rs5c372rtc.4 rtk.4 rtw.4 rum.4 \
- satalink.4 sbus.4 scc.4 scsi.4 sd.4 se.4 seeprom.4 sem.4 \
+ satalink.4 sbus.4 scc.4 schide.4 scsi.4 sd.4 se.4 seeprom.4 sem.4 \
ses.4 sf.4 sfb.4 sgsmix.4 shb.4 \
shpcic.4 siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \
sm.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \
diff -r 8d7ce8496bcf -r b121740489fd share/man/man4/acpi.4
--- a/share/man/man4/acpi.4 Tue Nov 09 04:50:50 2010 +0000
+++ b/share/man/man4/acpi.4 Tue Nov 09 06:03:26 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: acpi.4,v 1.50.2.4 2010/11/06 08:05:44 uebayasi Exp $
+.\" $NetBSD: acpi.4,v 1.50.2.5 2010/11/09 06:03:26 uebayasi Exp $
.\"
.\" Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 24, 2010
+.Dd November 7, 2010
.Dt ACPI 4
.Os
.Sh NAME
@@ -241,6 +241,8 @@
NS8250-, NS16450-, and NS16550-based serial ports.
.It Xr fdc 4
Floppy disk controllers.
+.It Xr fujitsu 4
+Fujitsu brightness, pointer, and hotkeys.
.It Xr hpet 4
High Precision Event Timer
.Pq Tn HPET .
diff -r 8d7ce8496bcf -r b121740489fd share/man/man4/pciide.4
--- a/share/man/man4/pciide.4 Tue Nov 09 04:50:50 2010 +0000
+++ b/share/man/man4/pciide.4 Tue Nov 09 06:03:26 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pciide.4,v 1.63 2009/10/19 18:41:09 bouyer Exp $
+.\" $NetBSD: pciide.4,v 1.63.2.1 2010/11/09 06:03:26 uebayasi Exp $
.\"
.\" Copyright (c) 1998,2003 Manuel Bouyer.
.\"
@@ -22,7 +22,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 May 29, 2008
+.Dd November 7, 2010
.Dt PCIIDE 4
.Os
.Sh NAME
@@ -74,6 +74,9 @@
Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH5/ICH6) IDE Controllers:
.Xr piixide 4
.It
+Intel SCH IDE Controllers:
+.Xr schide 4
+.It
NVIDIA nForce/nForce2 IDE Controllers:
.Xr viaide 4
.It
@@ -138,6 +141,7 @@
.Xr piixide 4 ,
.Xr pnpbios 4 ,
.Xr satalink 4 ,
+.Xr schide 4 ,
.Xr siisata 4 ,
.Xr siside 4 ,
.Xr slide 4 ,
diff -r 8d7ce8496bcf -r b121740489fd share/man/man4/schide.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/schide.4 Tue Nov 09 06:03:26 2010 +0000
@@ -0,0 +1,47 @@
+.\" $NetBSD: schide.4,v 1.2.2.2 2010/11/09 06:03:26 uebayasi Exp $
+.\"
+.\" Copyright (c) 2003 Manuel Bouyer.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd November 7, 2010
+.Dt SCHIDE 4
+.Os
+.Sh NAME
+.Nm schide
+.Nd Intel SCH IDE disk controllers driver
+.Sh SYNOPSIS
+.Cd "schide* at pci? dev ? function ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the Intel SCH IDE controllers and provides the interface
+with the hardware for the
+.Xr ata 4
+driver.
+.Sh SEE ALSO
+.Xr ata 4 ,
+.Xr atapi 4 ,
+.Xr intro 4 ,
+.Xr pci 4 ,
+.Xr pciide 4 ,
+.Xr wd 4 ,
+.Xr wdc 4
diff -r 8d7ce8496bcf -r b121740489fd share/man/man9/uvm.9
--- a/share/man/man9/uvm.9 Tue Nov 09 04:50:50 2010 +0000
+++ b/share/man/man9/uvm.9 Tue Nov 09 06:03:26 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: uvm.9,v 1.102.2.3 2010/11/02 14:05:27 uebayasi Exp $
+.\" $NetBSD: uvm.9,v 1.102.2.4 2010/11/09 06:03:29 uebayasi Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Froundation, Inc.
.\" Copyright (c) 1998 Matthew R. Green
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd November 2, 2010
+.Dd November 7, 2010
.Dt UVM 9
.Os
.Sh NAME
@@ -1008,8 +1008,6 @@
/* vm_page counters */
int npages; /* number of pages we manage */
int free; /* number of free pages */
-int active; /* number of active pages */
-int inactive; /* number of pages that we free'd but may want back */
int paging; /* number of pages in the process of being paged out */
int wired; /* number of wired pages */
int reserve_pagedaemon; /* number of pages reserved for pagedaemon */
diff -r 8d7ce8496bcf -r b121740489fd sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0 Tue Nov 09 04:50:50 2010 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0 Tue Nov 09 06:03:26 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.48.2.2 2010/08/17 06:43:53 uebayasi Exp $
+# $NetBSD: XEN3_DOM0,v 1.48.2.3 2010/11/09 06:03:37 uebayasi Exp $
include "arch/amd64/conf/std.xen"
@@ -432,6 +432,7 @@
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
+siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
diff -r 8d7ce8496bcf -r b121740489fd sys/arch/hp700/dev/dino.c
--- a/sys/arch/hp700/dev/dino.c Tue Nov 09 04:50:50 2010 +0000
+++ b/sys/arch/hp700/dev/dino.c Tue Nov 09 06:03:26 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.22.2.1 2010/04/30 14:39:23 uebayasi Exp $ */
+/* $NetBSD: dino.c,v 1.22.2.2 2010/11/09 06:03:37 uebayasi Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.22.2.1 2010/04/30 14:39:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.22.2.2 2010/11/09 06:03:37 uebayasi Exp $");
/* #include "cardbus.h" */
@@ -955,7 +955,6 @@
p++;
}
- c /= 2;
while (c--)
*a++ = *p;
}
@@ -977,7 +976,6 @@
p = (volatile uint32_t *)&r->pci_io_data;
}
- c /= 4;
while (c--)
*a++ = *p;
}
@@ -1008,7 +1006,6 @@
p++;
}
- c /= 2;
while (c--)
*p = *a++;
}
@@ -1030,7 +1027,6 @@
p = (volatile uint32_t *)&r->pci_io_data;
}
- c /= 4;
while (c--)
*p = *a++;
}
@@ -1206,7 +1202,6 @@
{
volatile uint16_t *p;
- c /= 2;
h += o;
if (h & HPPA_IOSPACE) {
p = (volatile uint16_t *)h;
@@ -1232,7 +1227,6 @@
{
volatile uint32_t *p;
- c /= 4;
h += o;
if (h & HPPA_IOSPACE) {
p = (volatile uint32_t *)h;
@@ -1262,7 +1256,6 @@
{
volatile uint16_t *p;
- c /= 2;
h += o;
if (h & HPPA_IOSPACE) {
p = (volatile uint16_t *)h;
diff -r 8d7ce8496bcf -r b121740489fd sys/arch/hp700/dev/elroy.c
--- a/sys/arch/hp700/dev/elroy.c Tue Nov 09 04:50:50 2010 +0000
+++ b/sys/arch/hp700/dev/elroy.c Tue Nov 09 06:03:26 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: elroy.c,v 1.8.2.1 2010/04/30 14:39:23 uebayasi Exp $ */
+/* $NetBSD: elroy.c,v 1.8.2.2 2010/11/09 06:03:37 uebayasi Exp $ */
/* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */
@@ -706,7 +706,6 @@
h += o;
p = (volatile uint16_t *)h;
- c /= 2;
while (c--)
*q++ = *p;
}
@@ -719,7 +718,6 @@
h += o;
p = (volatile uint32_t *)h;
- c /= 4;
while (c--)
*q++ = *p;
}
@@ -732,7 +730,6 @@
h += o;
p = (volatile uint64_t *)h;
- c /= 8;
while (c--)
*q++ = *p;
}
@@ -746,7 +743,6 @@
h += o;
p = (volatile uint16_t *)h;
- c /= 2;
while (c--)
*p = *q++;
}
@@ -760,7 +756,6 @@
h += o;
p = (volatile uint32_t *)h;
- c /= 4;
while (c--)
*p = *q++;
}
@@ -774,7 +769,6 @@
Home |
Main Index |
Thread Index |
Old Index