CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Thu Sep 17 07:40:45 UTC 2009 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi Log Message: add hdaudio files. To generate a diff of this commit: cvs rdiff -u -r1.829 -r1.830 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1310 -r1.1311 src/distrib/sets/lists/comp/mi 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.829 src/distrib/sets/lists/base/mi:1.830 --- src/distrib/sets/lists/base/mi:1.829 Tue Sep 8 07:08:01 2009 +++ src/distrib/sets/lists/base/mi Thu Sep 17 07:40:44 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.829 2009/09/08 07:08:01 skrll Exp $ +# $NetBSD: mi,v 1.830 2009/09/17 07:40:44 mrg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -731,6 +731,7 @@ ./usr/include/g++/tr1base-cxx-usr ./usr/include/gssapibase-c-usr ./usr/include/gssapi/rpc base-obsolete obsolete +./usr/include/dev/pci/hdaudio base-c-usr ./usr/include/isofsbase-c-usr ./usr/include/isofs/cd9660 base-c-usr ./usr/include/kadm5base-c-usr Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1310 src/distrib/sets/lists/comp/mi:1.1311 --- src/distrib/sets/lists/comp/mi:1.1310 Wed Sep 16 22:52:40 2009 +++ src/distrib/sets/lists/comp/mi Thu Sep 17 07:40:45 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1310 2009/09/16 22:52:40 dyoung Exp $ +# $NetBSD: mi,v 1.1311 2009/09/17 07:40:45 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1275,6 +1275,8 @@ ./usr/include/gssapi/gssapi_krb5.h comp-krb5-include kerberos ./usr/include/gssapi/gssapi_spnego.h comp-krb5-include kerberos ./usr/include/hesiod.hcomp-c-include +./usr/include/dev/pci/hdaudio/hdaudioio.h comp-c-include +./usr/include/dev/pci/hdaudio/hdaudioreg.h comp-c-include ./usr/include/histedit.h comp-c-include ./usr/include/history.hcomp-obsolete obsolete ./usr/include/iconv.hcomp-c-include
CVS commit: src/usr.sbin/paxctl
Module Name:src Committed By: plunky Date: Thu Sep 17 08:07:17 UTC 2009 Modified Files: src/usr.sbin/paxctl: paxctl.8 Log Message: offer some actual information about what PaX might be, and provide tips for further reading. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/paxctl/paxctl.8 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/paxctl/paxctl.8 diff -u src/usr.sbin/paxctl/paxctl.8:1.10 src/usr.sbin/paxctl/paxctl.8:1.11 --- src/usr.sbin/paxctl/paxctl.8:1.10 Mon Aug 11 10:58:02 2008 +++ src/usr.sbin/paxctl/paxctl.8 Thu Sep 17 08:07:17 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: paxctl.8,v 1.10 2008/08/11 10:58:02 christos Exp $ +.\ $NetBSD: paxctl.8,v 1.11 2009/09/17 08:07:17 plunky Exp $ .\ .\ Copyright 2006 Elad Efrat e...@netbsd.org .\ Copyright 2008 Christos Zoulas chris...@netbsd.org @@ -23,7 +23,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 11, 2008 +.Dd September 17, 2009 .Dt PAXCTL 8 .Os .Sh NAME @@ -38,6 +38,11 @@ .Nm utility is used to list and manipulate PaX flags associated with an ELF program. +The PaX flags signify to the loader the privilege protections to be applied +to mapped memory pages, and fuller explanations of the specific protections +can be found in the +.Xr security 8 +manpage. .Pp Each flag can be prefixed either with a .Dq + @@ -48,7 +53,7 @@ The following flags are available: .Bl -tag -width flag .It a -Explicitly disable PaX ASLR for +Explicitly disable PaX ASLR (Address Space Layout Randomization) for .Ar program . .It A Explicitly enable PaX ASLR for @@ -79,10 +84,13 @@ .Nm without any flags. .Sh SEE ALSO +.Xr mprotect 2 , .Xr sysctl 3 , .Xr options 4 , +.Xr elf 5 , .Xr security 8 , -.Xr sysctl 8 +.Xr sysctl 8 , +.Xr fileassoc 9 .Sh HISTORY The .Nm
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Thu Sep 17 08:09:49 UTC 2009
Modified Files:
src/sys/kern: uipc_accf.c
Log Message:
Can't use CTLFLAG_PERMANENT here without providing a rollback log,
since accept filters aren't (necessarily) added during kernel boot
phase.
pointed out tested by Geoff Wing
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/kern/uipc_accf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_accf.c
diff -u src/sys/kern/uipc_accf.c:1.9 src/sys/kern/uipc_accf.c:1.10
--- src/sys/kern/uipc_accf.c:1.9 Wed Sep 16 15:23:04 2009
+++ src/sys/kern/uipc_accf.c Thu Sep 17 08:09:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_accf.c,v 1.9 2009/09/16 15:23:04 pooka Exp $ */
+/* $NetBSD: uipc_accf.c,v 1.10 2009/09/17 08:09:49 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_accf.c,v 1.9 2009/09/16 15:23:04 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_accf.c,v 1.10 2009/09/17 08:09:49 pooka Exp $);
#define ACCEPT_FILTER_MOD
@@ -87,21 +87,22 @@
/*
* Names of Accept filter sysctl objects
*/
+static struct sysctllog *ctllog;
static void
-sysctl_net_inet_accf_setup(struct sysctllog **clog)
+sysctl_net_inet_accf_setup(void)
{
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(ctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, net, NULL,
NULL, 0, NULL, 0,
CTL_NET, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(ctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, inet, NULL,
NULL, 0, NULL, 0,
CTL_NET, PF_INET, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(ctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, accf,
SYSCTL_DESCR(Accept filters),
@@ -185,7 +186,7 @@
{
rw_init(accept_filter_lock);
- sysctl_net_inet_accf_setup(NULL);
+ sysctl_net_inet_accf_setup();
return 0;
}
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: sborrill Date: Thu Sep 17 08:55:19 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add hdaudio headers To generate a diff of this commit: cvs rdiff -u -r1.1311 -r1.1312 src/distrib/sets/lists/comp/mi 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.1311 src/distrib/sets/lists/comp/mi:1.1312 --- src/distrib/sets/lists/comp/mi:1.1311 Thu Sep 17 07:40:45 2009 +++ src/distrib/sets/lists/comp/mi Thu Sep 17 08:55:19 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1311 2009/09/17 07:40:45 mrg Exp $ +# $NetBSD: mi,v 1.1312 2009/09/17 08:55:19 sborrill Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -469,6 +469,8 @@ ./usr/include/dev/ofw/openfirmio.h comp-c-include ./usr/include/dev/pci/amrio.h comp-c-include ./usr/include/dev/pci/amrreg.h comp-c-include +./usr/include/dev/pci/hdaudio/hdaudioio.h comp-c-include +./usr/include/dev/pci/hdaudio/hdaudioreg.h comp-c-include ./usr/include/dev/pci/if_devar.h comp-obsolete obsolete ./usr/include/dev/pci/if_fxpreg.h comp-obsolete obsolete ./usr/include/dev/pci/if_fxpvar.h comp-obsolete obsolete
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Thu Sep 17 09:54:27 UTC 2009
Modified Files:
src/sys/kern: subr_bufq.c
Log Message:
Provide unwind log for bufq sysctls, since (theoretically) bufq might
not be initialized during kernel bootstrap and therefore permanent
nodes can be created only with an unwind log.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/kern/subr_bufq.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/subr_bufq.c
diff -u src/sys/kern/subr_bufq.c:1.19 src/sys/kern/subr_bufq.c:1.20
--- src/sys/kern/subr_bufq.c:1.19 Wed Sep 16 15:23:04 2009
+++ src/sys/kern/subr_bufq.c Thu Sep 17 09:54:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_bufq.c,v 1.19 2009/09/16 15:23:04 pooka Exp $ */
+/* $NetBSD: subr_bufq.c,v 1.20 2009/09/17 09:54:27 pooka Exp $ */
/* NetBSD: subr_disk.c,v 1.70 2005/08/20 12:00:01 yamt Exp $ */
/*-
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_bufq.c,v 1.19 2009/09/16 15:23:04 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_bufq.c,v 1.20 2009/09/17 09:54:27 pooka Exp $);
#include sys/param.h
#include sys/systm.h
@@ -86,11 +86,12 @@
static int bufq_init(void);
static void sysctl_kern_bufq_strategies_setup(struct sysctllog **);
+static struct sysctllog *sysctllog;
static int
bufq_init(void)
{
- sysctl_kern_bufq_strategies_setup(NULL);
+ sysctl_kern_bufq_strategies_setup(sysctllog);
return 0;
}
CVS commit: src/sbin/newfs_udf
Module Name:src Committed By: reinoud Date: Thu Sep 17 10:37:29 UTC 2009 Modified Files: src/sbin/newfs_udf: newfs_udf.c Log Message: Update TODO message; we can format with meta data partitions, only not yet for BD-R, i.e. UDF 2.60. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sbin/newfs_udf/newfs_udf.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/newfs_udf/newfs_udf.c diff -u src/sbin/newfs_udf/newfs_udf.c:1.7 src/sbin/newfs_udf/newfs_udf.c:1.8 --- src/sbin/newfs_udf/newfs_udf.c:1.7 Sun Jan 18 00:21:09 2009 +++ src/sbin/newfs_udf/newfs_udf.c Thu Sep 17 10:37:28 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: newfs_udf.c,v 1.7 2009/01/18 00:21:09 lukem Exp $ */ +/* $NetBSD: newfs_udf.c,v 1.8 2009/09/17 10:37:28 reinoud Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -28,7 +28,7 @@ /* * TODO - * - implement meta data partition formatting. + * - implement metadata formatting for BD-R * - implement support for a read-only companion partition? */
CVS commit: src/etc/mtree
Module Name:src Committed By: tron Date: Thu Sep 17 11:52:03 UTC 2009 Modified Files: src/etc/mtree: special Log Message: Remove /etc/postfix/postfix-script as the file was obsolete by the upgrade to Postfix 2.6.x. To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.129 src/etc/mtree/special:1.130 --- src/etc/mtree/special:1.129 Sat Jul 25 16:20:10 2009 +++ src/etc/mtree/special Thu Sep 17 11:52:02 2009 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.129 2009/07/25 16:20:10 mbalmer Exp $ +# $NetBSD: special,v 1.130 2009/09/17 11:52:02 tron Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -152,7 +152,6 @@ ./etc/postfix type=dir mode=0755 optional ./etc/postfix/main.cf type=file mode=0644 optional ./etc/postfix/master.cf type=file mode=0644 optional -./etc/postfix/postfix-script type=file mode=0555 optional ./etc/powerd type=dir mode=0755 optional ./etc/powerd/scripts type=dir mode=0755 optional ./etc/powerd/scripts/acadapter type=file mode=0555 optional
CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: tsutsui
Date: Thu Sep 17 12:38:11 UTC 2009
Modified Files:
src/sys/arch/sparc/dev: audioamd.c
Log Message:
Use device_t, cfdriver_t, device_private(), device_xname(),
and appropriate types and variables for device_t/softc.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc/dev/audioamd.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/sparc/dev/audioamd.c
diff -u src/sys/arch/sparc/dev/audioamd.c:1.23 src/sys/arch/sparc/dev/audioamd.c:1.24
--- src/sys/arch/sparc/dev/audioamd.c:1.23 Mon Dec 3 15:34:20 2007
+++ src/sys/arch/sparc/dev/audioamd.c Thu Sep 17 12:38:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: audioamd.c,v 1.23 2007/12/03 15:34:20 ad Exp $ */
+/* $NetBSD: audioamd.c,v 1.24 2009/09/17 12:38:11 tsutsui Exp $ */
/* NetBSD: am7930_sparc.c,v 1.44 1999/03/14 22:29:00 jonathan Exp */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: audioamd.c,v 1.23 2007/12/03 15:34:20 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: audioamd.c,v 1.24 2009/09/17 12:38:11 tsutsui Exp $);
#include audio.h
#if NAUDIO 0
@@ -100,12 +100,12 @@
kmutex_t sc_lock;
};
-void audioamd_mainbus_attach(struct device *, struct device *, void *);
-int audioamd_mainbus_match(struct device *, struct cfdata *, void *);
-void audioamd_obio_attach(struct device *, struct device *, void *);
-int audioamd_obio_match(struct device *, struct cfdata *, void *);
-void audioamd_sbus_attach(struct device *, struct device *, void *);
-int audioamd_sbus_match(struct device *, struct cfdata *, void *);
+int audioamd_mainbus_match(device_t, cfdata_t, void *);
+void audioamd_mainbus_attach(device_t, device_t, void *);
+int audioamd_obio_match(device_t, cfdata_t, void *);
+void audioamd_obio_attach(device_t, device_t, void *);
+int audioamd_sbus_match(device_t, cfdata_t, void *);
+void audioamd_sbus_attach(device_t, device_t, void *);
void audioamd_attach(struct audioamd_softc *, int);
CFATTACH_DECL(audioamd_mainbus, sizeof(struct audioamd_softc),
@@ -187,7 +187,7 @@
int
-audioamd_mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+audioamd_mainbus_match(device_t parent, cfdata_t cf, void *aux)
{
struct mainbus_attach_args *ma;
@@ -198,7 +198,7 @@
}
int
-audioamd_obio_match(struct device *parent, struct cfdata *cf, void *aux)
+audioamd_obio_match(device_t parent, cfdata_t cf, void *aux)
{
union obio_attach_args *uoba;
@@ -210,7 +210,7 @@
}
int
-audioamd_sbus_match(struct device *parent, struct cfdata *cf, void *aux)
+audioamd_sbus_match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa;
@@ -219,14 +219,14 @@
}
void
-audioamd_mainbus_attach(struct device *parent, struct device *self, void *aux)
+audioamd_mainbus_attach(device_t parent, device_t self, void *aux)
{
struct mainbus_attach_args *ma;
struct audioamd_softc *sc;
bus_space_handle_t bh;
ma = aux;
- sc = (struct audioamd_softc *)self;
+ sc = device_private(self);
sc-sc_bt = ma-ma_bustag;
if (bus_space_map(
@@ -235,7 +235,7 @@
AM7930_DREG_SIZE,
BUS_SPACE_MAP_LINEAR,
bh) != 0) {
- printf(%s: cannot map registers\n, self-dv_xname);
+ printf(%s: cannot map registers\n, device_xname(self));
return;
}
sc-sc_bh = bh;
@@ -243,7 +243,7 @@
}
void
-audioamd_obio_attach(struct device *parent, struct device *self, void *aux)
+audioamd_obio_attach(device_t parent, device_t self, void *aux)
{
union obio_attach_args *uoba;
struct sbus_attach_args *sa;
@@ -252,14 +252,14 @@
uoba = aux;
sa = uoba-uoba_sbus;
- sc = (struct audioamd_softc *)self;
+ sc = device_private(self);
sc-sc_bt = sa-sa_bustag;
if (sbus_bus_map(sa-sa_bustag,
sa-sa_slot, sa-sa_offset,
AM7930_DREG_SIZE,
0, bh) != 0) {
- printf(%s: cannot map registers\n, self-dv_xname);
+ printf(%s: cannot map registers\n, device_xname(self));
return;
}
sc-sc_bh = bh;
@@ -267,21 +267,21 @@
}
void
-audioamd_sbus_attach(struct device *parent, struct device *self, void *aux)
+audioamd_sbus_attach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa;
struct audioamd_softc *sc;
bus_space_handle_t bh;
sa = aux;
- sc = (struct audioamd_softc *)self;
+ sc = device_private(self);
sc-sc_bt = sa-sa_bustag;
if (sbus_bus_map(sa-sa_bustag,
sa-sa_slot, sa-sa_offset,
AM7930_DREG_SIZE,
0, bh) != 0) {
- printf(%s: cannot map registers\n, self-dv_xname);
+ printf(%s: cannot map registers\n, device_xname(self));
return;
}
sc-sc_bh = bh;
@@ -291,10 +291,12 @@
void
audioamd_attach(struct audioamd_softc *sc, int pri)
{
+ device_t self;
/*
* Set up glue for MI code early; we use some of it here.
*/
+ self = sc-sc_am7930.sc_dev;
sc-sc_am7930.sc_glue = audioamd_glue;
mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_HIGH);
@@ -311,7 +313,7 @@
CVS commit: src/tests/fs/ffs
Module Name:src
Committed By: pooka
Date: Thu Sep 17 13:12:51 UTC 2009
Modified Files:
src/tests/fs/ffs: t_renamerace.c
Log Message:
Set timeout to 20 because for some reason this test hangs in qemu.
(Well, it *still* hangs even after the timeout has passed, but at
least there's multiple problems to debug now)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/ffs/t_renamerace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/ffs/t_renamerace.c
diff -u src/tests/fs/ffs/t_renamerace.c:1.7 src/tests/fs/ffs/t_renamerace.c:1.8
--- src/tests/fs/ffs/t_renamerace.c:1.7 Mon Aug 3 14:25:24 2009
+++ src/tests/fs/ffs/t_renamerace.c Thu Sep 17 13:12:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: t_renamerace.c,v 1.7 2009/08/03 14:25:24 pooka Exp $ */
+/* $NetBSD: t_renamerace.c,v 1.8 2009/09/17 13:12:51 pooka Exp $ */
/*
* Modified for rump and atf from a program supplied
@@ -29,9 +29,11 @@
{
atf_tc_set_md_var(tc, descr, rename(2) race against files
unlinked mid-operation, kern/40948);
+ /* XXX: test hangs in qemu for unknown reasons */
+ atf_tc_set_md_var(tc, timeout, 20);
}
-int quit;
+volatile int quit;
static void *
w1(void *arg)
CVS commit: src/sys/arch/arm/imx
Module Name:src Committed By: bsh Date: Thu Sep 17 16:13:32 UTC 2009 Modified Files: src/sys/arch/arm/imx: imxuartreg.h Log Message: fix a typo of register bit name. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imxuartreg.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/arm/imx/imxuartreg.h diff -u src/sys/arch/arm/imx/imxuartreg.h:1.2 src/sys/arch/arm/imx/imxuartreg.h:1.3 --- src/sys/arch/arm/imx/imxuartreg.h:1.2 Sun Apr 27 18:58:44 2008 +++ src/sys/arch/arm/imx/imxuartreg.h Thu Sep 17 16:13:32 2009 @@ -1,4 +1,4 @@ -/* $Id: imxuartreg.h,v 1.2 2008/04/27 18:58:44 matt Exp $ */ +/* $Id: imxuartreg.h,v 1.3 2009/09/17 16:13:32 bsh Exp $ */ /* * register definitions for Freescale i.MX31 and i.MX31L UARTs * @@ -108,7 +108,7 @@ #define IMX_UCR2_RTSEN BIT(4) /* rw */ #define IMX_UCR2_WS BIT(5) /* rw */ #define IMX_UCR2_STPB BIT(6) /* rw */ -#define IMX_UCR2_PRDE BIT(7) /* rw */ +#define IMX_UCR2_PROE BIT(7) /* rw */ #define IMX_UCR2_PREN BIT(8) /* rw */ #define IMX_UCR2_RTEC BITS(10,9) /* rw */ #define IMX_UCR2_ESCEN BIT(11) /* rw */
CVS commit: src/doc
Module Name:src Committed By: cube Date: Thu Sep 17 16:42:50 UTC 2009 Modified Files: src/doc: BRANCHES Log Message: Reflect actual status of cube-autoconf. To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.284 src/doc/BRANCHES:1.285 --- src/doc/BRANCHES:1.284 Mon Aug 10 21:27:46 2009 +++ src/doc/BRANCHES Thu Sep 17 16:42:50 2009 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.284 2009/08/10 21:27:46 matt Exp $ +# $NetBSD: BRANCHES,v 1.285 2009/09/17 16:42:50 cube Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -297,16 +297,6 @@ routines, and allow improvements to be shared across all arm based hardware. -Branch: cube-autoconf -Description: Renovate autoconf(9) API -Status: Active -Start Date: 11 Dec 2007 -End Date: -Base Tag: cube-autoconf-base -Maintainer: Quentin Garnier c...@netbsd.org -Scope: kernel usr.bin/config (and some other userland bits) -Notes: Address a number of issues the current autoconf(9) API has. - Branch: gmcgarry_ctxsw Description: Separate scheduler from context-switch code Status: Dormant @@ -797,6 +787,16 @@ Scope: Entire tree. Notes: +Branch: cube-autoconf +Description: Renovate autoconf(9) API +Status: Terminated; abandoned +Start Date: 11 Dec 2007 +End Date: +Base Tag: cube-autoconf-base +Maintainer: Quentin Garnier c...@netbsd.org +Scope: kernel usr.bin/config (and some other userland bits) +Notes: Address a number of issues the current autoconf(9) API has. + Branch: eeh-paddr_t Description: use separate types for virtual vs. physical addresses Status: Terminated; merged to -current
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: tsutsui
Date: Thu Sep 17 17:51:53 UTC 2009
Modified Files:
src/sys/dev/sbus: lebuffer.c lebuffervar.h
Log Message:
Split device_t/softc.
Tested on:
lebuffer0 at sbus0 slot 3 offset 0x4: 128K memory
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/sbus/lebuffer.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/sbus/lebuffervar.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/sbus/lebuffer.c
diff -u src/sys/dev/sbus/lebuffer.c:1.34 src/sys/dev/sbus/lebuffer.c:1.35
--- src/sys/dev/sbus/lebuffer.c:1.34 Thu Sep 17 16:28:12 2009
+++ src/sys/dev/sbus/lebuffer.c Thu Sep 17 17:51:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.34 2009/09/17 16:28:12 tsutsui Exp $ */
+/* $NetBSD: lebuffer.c,v 1.35 2009/09/17 17:51:52 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lebuffer.c,v 1.34 2009/09/17 16:28:12 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: lebuffer.c,v 1.35 2009/09/17 17:51:52 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -50,7 +50,7 @@
int lebufmatch(device_t, cfdata_t, void *);
void lebufattach(device_t, device_t, void *);
-CFATTACH_DECL(lebuffer, sizeof(struct lebuf_softc),
+CFATTACH_DECL_NEW(lebuffer, sizeof(struct lebuf_softc),
lebufmatch, lebufattach, NULL, NULL);
int
@@ -76,7 +76,7 @@
lebufattach(device_t parent, device_t self, void *aux)
{
struct sbus_attach_args *sa = aux;
- struct lebuf_softc *sc = (void *)self;
+ struct lebuf_softc *sc = device_private(self);
struct sbus_softc *sbsc = device_private(parent);
int node;
int sbusburst;
@@ -84,6 +84,8 @@
bus_dma_tag_t dt = sa-sa_dmatag;
bus_space_handle_t bh;
+ sc-sc_dev = self;
+
if (sbus_bus_map(bt, sa-sa_slot, sa-sa_offset, sa-sa_size,
BUS_SPACE_MAP_LINEAR, bh) != 0) {
aprint_error_dev(self, attach: cannot map registers\n);
@@ -122,7 +124,7 @@
struct sbus_attach_args sax;
sbus_setup_attach_args(sbsc,
bt, dt, node, sax);
- (void)config_found(sc-sc_dev, (void *)sax, lebufprint);
+ (void)config_found(self, (void *)sax, lebufprint);
sbus_destroy_attach_args(sax);
}
}
Index: src/sys/dev/sbus/lebuffervar.h
diff -u src/sys/dev/sbus/lebuffervar.h:1.7 src/sys/dev/sbus/lebuffervar.h:1.8
--- src/sys/dev/sbus/lebuffervar.h:1.7 Thu Sep 17 16:28:12 2009
+++ src/sys/dev/sbus/lebuffervar.h Thu Sep 17 17:51:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffervar.h,v 1.7 2009/09/17 16:28:12 tsutsui Exp $ */
+/* $NetBSD: lebuffervar.h,v 1.8 2009/09/17 17:51:52 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
struct lebuf_softc {
- struct device sc_dev; /* us as a device */
+ device_t sc_dev; /* us as a device */
u_int sc_rev; /* revision */
int sc_node; /* PROM node ID */
int sc_burst; /* DVMA burst size in effect */
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: tsutsui
Date: Thu Sep 17 17:53:35 UTC 2009
Modified Files:
src/sys/dev/sbus: lebuffer.c
Log Message:
Fix a message format in error path.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sbus/lebuffer.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/sbus/lebuffer.c
diff -u src/sys/dev/sbus/lebuffer.c:1.35 src/sys/dev/sbus/lebuffer.c:1.36
--- src/sys/dev/sbus/lebuffer.c:1.35 Thu Sep 17 17:51:52 2009
+++ src/sys/dev/sbus/lebuffer.c Thu Sep 17 17:53:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.35 2009/09/17 17:51:52 tsutsui Exp $ */
+/* $NetBSD: lebuffer.c,v 1.36 2009/09/17 17:53:35 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lebuffer.c,v 1.35 2009/09/17 17:51:52 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: lebuffer.c,v 1.36 2009/09/17 17:53:35 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -88,7 +88,7 @@
if (sbus_bus_map(bt, sa-sa_slot, sa-sa_offset, sa-sa_size,
BUS_SPACE_MAP_LINEAR, bh) != 0) {
- aprint_error_dev(self, attach: cannot map registers\n);
+ aprint_error(: cannot map registers\n);
return;
}
CVS commit: src/sys/dev/isapnp
Module Name:src
Committed By: tsutsui
Date: Thu Sep 17 18:09:51 UTC 2009
Modified Files:
src/sys/dev/isapnp: i82365_isapnp.c
Log Message:
Use proper types or variables for device_t and softc.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/isapnp/i82365_isapnp.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/isapnp/i82365_isapnp.c
diff -u src/sys/dev/isapnp/i82365_isapnp.c:1.28 src/sys/dev/isapnp/i82365_isapnp.c:1.29
--- src/sys/dev/isapnp/i82365_isapnp.c:1.28 Tue May 12 10:16:35 2009
+++ src/sys/dev/isapnp/i82365_isapnp.c Thu Sep 17 18:09:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isapnp.c,v 1.28 2009/05/12 10:16:35 cegger Exp $ */
+/* $NetBSD: i82365_isapnp.c,v 1.29 2009/09/17 18:09:51 tsutsui Exp $ */
/*
* Copyright (c) 1998 Bill Sommerfeld. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: i82365_isapnp.c,v 1.28 2009/05/12 10:16:35 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: i82365_isapnp.c,v 1.29 2009/09/17 18:09:51 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -105,8 +105,8 @@
void
pcic_isapnp_attach(device_t parent, device_t self, void *aux)
{
- struct pcic_softc *sc = device_private(self);
struct pcic_isa_softc *isc = device_private(self);
+ struct pcic_softc *sc = isc-sc_pcic;
struct isapnp_attach_args *ipa = aux;
isa_chipset_tag_t ic = ipa-ipa_ic;
bus_space_tag_t iot = ipa-ipa_iot;
@@ -120,16 +120,17 @@
printf(\n);
if (isapnp_config(iot, memt, ipa)) {
- aprint_error_dev(sc-dev, error in region allocation\n);
+ aprint_error_dev(self, error in region allocation\n);
return;
}
- printf(%s: %s %s, device_xname(sc-dev), ipa-ipa_devident,
+ printf(%s: %s %s, device_xname(self), ipa-ipa_devident,
ipa-ipa_devclass);
/* sanity check that we get at least one hunk of IO space.. */
if (ipa-ipa_nio 1) {
- aprint_error_dev(sc-dev, failed to get one chunk of i/o space\n);
+ aprint_error_dev(self,
+ failed to get one chunk of i/o space\n);
return;
}
CVS commit: src/sys/dev
Module Name:src
Committed By: tsutsui
Date: Thu Sep 17 18:14:41 UTC 2009
Modified Files:
src/sys/dev/ic: i82365.c i82365var.h
src/sys/dev/isa: i82365_isa.c i82365_isasubr.c i82365_isavar.h
src/sys/dev/isapnp: i82365_isapnp.c
src/sys/dev/pci: i82365_pci.c i82365_pcivar.h
Log Message:
Misc KNF and cosmetics, and remove unnecessary casts etc.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/ic/i82365.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/i82365var.h
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/isa/i82365_isa.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/isa/i82365_isasubr.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/isa/i82365_isavar.h
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/isapnp/i82365_isapnp.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/i82365_pci.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/i82365_pcivar.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/ic/i82365.c
diff -u src/sys/dev/ic/i82365.c:1.110 src/sys/dev/ic/i82365.c:1.111
--- src/sys/dev/ic/i82365.c:1.110 Mon Sep 14 13:41:15 2009
+++ src/sys/dev/ic/i82365.c Thu Sep 17 18:14:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365.c,v 1.110 2009/09/14 13:41:15 tsutsui Exp $ */
+/* $NetBSD: i82365.c,v 1.111 2009/09/17 18:14:41 tsutsui Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: i82365.c,v 1.110 2009/09/14 13:41:15 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: i82365.c,v 1.111 2009/09/17 18:14:41 tsutsui Exp $);
#define PCICDEBUG
@@ -114,23 +114,24 @@
int
pcic_ident_ok(int ident)
{
+
/* this is very empirical and heuristic */
if ((ident == 0) || (ident == 0xff) || (ident PCIC_IDENT_ZERO))
- return (0);
+ return 0;
if ((ident PCIC_IDENT_REV_MASK) == 0)
- return (0);
+ return 0;
if ((ident PCIC_IDENT_IFTYPE_MASK) != PCIC_IDENT_IFTYPE_MEM_AND_IO) {
#ifdef DIAGNOSTIC
printf(pcic: does not support memory and I/O cards,
ignored (ident=%0x)\n, ident);
#endif
- return (0);
+ return 0;
}
- return (1);
+ return 1;
}
int
@@ -142,12 +143,12 @@
reg = pcic_read(h, PCIC_IDENT);
if ((reg PCIC_IDENT_REV_MASK) == 0)
- return (PCIC_VENDOR_NONE);
+ return PCIC_VENDOR_NONE;
switch (reg) {
case 0x00:
case 0xff:
- return (PCIC_VENDOR_NONE);
+ return PCIC_VENDOR_NONE;
case PCIC_IDENT_ID_INTEL0:
vendor = PCIC_VENDOR_I82365SLR0;
break;
@@ -182,7 +183,7 @@
PCIC_CIRRUS_CHIP_INFO_CHIP_ID) {
reg = pcic_read(h, -1);
if ((reg PCIC_CIRRUS_CHIP_INFO_CHIP_ID) == 0)
-return (PCIC_VENDOR_CIRRUS_PD67XX);
+return PCIC_VENDOR_CIRRUS_PD67XX;
}
/*
@@ -191,38 +192,39 @@
reg = pcic_read(h, PCIC_RICOH_REG_CHIP_ID);
switch (reg) {
case PCIC_RICOH_CHIP_ID_5C296:
- return (PCIC_VENDOR_RICOH_5C296);
+ return PCIC_VENDOR_RICOH_5C296;
case PCIC_RICOH_CHIP_ID_5C396:
- return (PCIC_VENDOR_RICOH_5C396);
+ return PCIC_VENDOR_RICOH_5C396;
}
}
- return (vendor);
+ return vendor;
}
const char *
pcic_vendor_to_string(int vendor)
{
+
switch (vendor) {
case PCIC_VENDOR_I82365SLR0:
- return (Intel 82365SL Revision 0);
+ return Intel 82365SL Revision 0;
case PCIC_VENDOR_I82365SLR1:
- return (Intel 82365SL Revision 1);
+ return Intel 82365SL Revision 1;
case PCIC_VENDOR_CIRRUS_PD67XX:
- return (Cirrus PD6710/2X);
+ return Cirrus PD6710/2X;
case PCIC_VENDOR_I82365SL_DF:
- return (Intel 82365SL-DF);
+ return Intel 82365SL-DF;
case PCIC_VENDOR_RICOH_5C296:
- return (Ricoh RF5C296);
+ return Ricoh RF5C296;
case PCIC_VENDOR_RICOH_5C396:
- return (Ricoh RF5C396);
+ return Ricoh RF5C396;
case PCIC_VENDOR_IBM:
- return (IBM PCIC);
+ return IBM PCIC;
case PCIC_VENDOR_IBM_KING:
- return (IBM KING);
+ return IBM KING;
}
- return (Unknown controller);
+ return Unknown controller;
}
void
@@ -259,7 +261,7 @@
if (socket == 0) {
h-vendor = pcic_vendor(h);
if (i __arraycount(sc-handle) - 1)
-(h+1)-vendor = h-vendor;
+(h + 1)-vendor = h-vendor;
}
switch (h-vendor) {
@@ -321,11 +323,11 @@
chip, pcic_vendor_to_string(sc-handle[i].vendor));
if ((h-flags PCIC_FLAG_SOCKETP)
- ((h+1)-flags PCIC_FLAG_SOCKETP))
+ ((h + 1)-flags PCIC_FLAG_SOCKETP))
aprint_normal(sockets A and B\n);
else if (h-flags PCIC_FLAG_SOCKETP)
aprint_normal(socket A only\n);
- else if ((h+1)-flags PCIC_FLAG_SOCKETP)
+ else if ((h + 1)-flags PCIC_FLAG_SOCKETP)
aprint_normal(socket B only\n);
else
aprint_normal(no sockets\n);
@@ -348,7 +350,7 @@
void
pcic_power(int why, void *arg)
{
- struct pcic_handle *h = (struct pcic_handle *)arg;
+ struct pcic_handle *h = arg;
struct pcic_softc *sc = device_private(h-ph_parent);
int reg;
@@ -475,8 +477,8 @@
/* clear possible card detect interrupt */
(void) pcic_read(h, PCIC_CSC);
- DPRINTF((%s:
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Thu Sep 17 18:21:38 UTC 2009
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Move alpha to binutils 2.19.
To generate a diff of this commit:
cvs rdiff -u -r1.575 -r1.576 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.575 src/share/mk/bsd.own.mk:1.576
--- src/share/mk/bsd.own.mk:1.575 Wed Sep 16 06:10:52 2009
+++ src/share/mk/bsd.own.mk Thu Sep 17 18:21:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.575 2009/09/16 06:10:52 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.576 2009/09/17 18:21:38 skrll Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -50,6 +50,7 @@
# default to binutils 2.16
.if \
+${MACHINE_ARCH} == alpha || \
${MACHINE_ARCH} == hppa || \
${MACHINE_ARCH} == i386
HAVE_BINUTILS?= 219
CVS commit: src/sys/dev/pci/hdaudio
Module Name:src
Committed By: apb
Date: Thu Sep 17 18:48:47 UTC 2009
Modified Files:
src/sys/dev/pci/hdaudio: hdaudio_afg.c
Log Message:
Change a few hda_error to hda_debug. Fixes WARNING: 4 errors while
detecting hardware; check system log. when I boot.
OK jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/hdaudio/hdaudio_afg.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/hdaudio/hdaudio_afg.c
diff -u src/sys/dev/pci/hdaudio/hdaudio_afg.c:1.10 src/sys/dev/pci/hdaudio/hdaudio_afg.c:1.11
--- src/sys/dev/pci/hdaudio/hdaudio_afg.c:1.10 Wed Sep 9 11:47:24 2009
+++ src/sys/dev/pci/hdaudio/hdaudio_afg.c Thu Sep 17 18:48:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_afg.c,v 1.10 2009/09/09 11:47:24 drochner Exp $ */
+/* $NetBSD: hdaudio_afg.c,v 1.11 2009/09/17 18:48:47 apb Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio_afg.c,v 1.10 2009/09/09 11:47:24 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio_afg.c,v 1.11 2009/09/17 18:48:47 apb Exp $);
#include sys/types.h
#include sys/param.h
@@ -396,7 +396,7 @@
return NULL;
}
if (nid sc-sc_startnode || nid = sc-sc_endnode) {
- hda_error(sc, nid %02X out of range (%02X-%02X)\n,
+ hda_debug(sc, nid %02X out of range (%02X-%02X)\n,
nid, sc-sc_startnode, sc-sc_endnode);
return NULL;
}
@@ -471,7 +471,7 @@
}
}
if (cnid sc-sc_startnode || cnid = sc-sc_endnode)
-hda_error(sc, ghost nid=%02X\n, cnid);
+hda_debug(sc, ghost nid=%02X\n, cnid);
if (CONN_RANGE(res, entnum, j) == 0)
addcnid = cnid;
else if (prevcnid == 0 || prevcnid = cnid) {
@@ -1543,18 +1543,18 @@
goto retry;
}
if (!res) {
- hda_error(sc, disable assoc %d (%d) [trace failed]\n,
+ hda_debug(sc, disable assoc %d (%d) [trace failed]\n,
j, as[j].as_index);
for (i = 0; i HDAUDIO_MAXPINS; i++) {
if (as[j].as_pins[i] == 0)
continue;
-hda_error(sc, assoc %d pin%d: %02X\n, j, i,
+hda_debug(sc, assoc %d pin%d: %02X\n, j, i,
as[j].as_pins[i]);
}
for (i = 0; i HDAUDIO_MAXPINS; i++) {
if (as[j].as_dacs[i] == 0)
continue;
-hda_error(sc, assoc %d dac%d: %02X\n, j, i,
+hda_debug(sc, assoc %d dac%d: %02X\n, j, i,
as[j].as_dacs[i]);
}
CVS commit: src/sys/arch/i386/pci
Module Name:src Committed By: dyoung Date: Thu Sep 17 20:21:54 UTC 2009 Modified Files: src/sys/arch/i386/pci: elan520.c Log Message: As Jonathan Kollasch points out, elansc_attach() does not actually use gba after filling it out. Delete it. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/pci/elan520.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/pci/elan520.c diff -u src/sys/arch/i386/pci/elan520.c:1.42 src/sys/arch/i386/pci/elan520.c:1.43 --- src/sys/arch/i386/pci/elan520.c:1.42 Wed Apr 29 23:50:53 2009 +++ src/sys/arch/i386/pci/elan520.c Thu Sep 17 20:21:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: elan520.c,v 1.42 2009/04/29 23:50:53 dyoung Exp $ */ +/* $NetBSD: elan520.c,v 1.43 2009/09/17 20:21:54 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: elan520.c,v 1.42 2009/04/29 23:50:53 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: elan520.c,v 1.43 2009/09/17 20:21:54 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -1262,7 +1262,6 @@ uint16_t rev; uint8_t cpuctl, picicr, ressta; #if NGPIO 0 - struct gpiobus_attach_args gba; int pin, reg, shift; uint16_t data; #endif @@ -1387,10 +1386,6 @@ sc-sc_gpio_gc.gp_pin_write = elansc_gpio_pin_write; sc-sc_gpio_gc.gp_pin_ctl = elansc_gpio_pin_ctl; - gba.gba_gc = sc-sc_gpio_gc; - gba.gba_pins = sc-sc_gpio_pins; - gba.gba_npins = ELANSC_PIO_NPINS; - #endif /* NGPIO */ elansc_rescan(sc-sc_dev, elanparbus, NULL);
CVS commit: src/sys/modules
Module Name:src
Committed By: jnemeth
Date: Thu Sep 17 23:07:13 UTC 2009
Modified Files:
src/sys/modules/exec_elf32: Makefile
src/sys/modules/exec_elf64: Makefile
Log Message:
Not all platforms can do PaX stuff. The list was derived in private
conversation with several developers. The change was tested on
sparc64.
NetBSD ultra.example.ca 5.99.17 NetBSD 5.99.17 (MODULAR) #0: Tue Sep 15
19:08:02 PDT 2009
jnem...@ultra.example.ca:/usr/local/current/objdir/sys/arch/sparc64/compile/MODULAR
sparc64
NAMECLASS SOURCE REFSSIZEREQUIRES
...
exec_elf64 miscfilesys 0 6981coredump
...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/exec_elf32/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/exec_elf64/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/modules/exec_elf32/Makefile
diff -u src/sys/modules/exec_elf32/Makefile:1.1 src/sys/modules/exec_elf32/Makefile:1.2
--- src/sys/modules/exec_elf32/Makefile:1.1 Wed Nov 19 18:36:08 2008
+++ src/sys/modules/exec_elf32/Makefile Thu Sep 17 23:07:12 2009
@@ -1,10 +1,20 @@
-# $NetBSD: Makefile,v 1.1 2008/11/19 18:36:08 ad Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/17 23:07:12 jnemeth Exp $
.include ../Makefile.inc
KMOD= exec_elf32
-CPPFLAGS+= -DEXEC_ELF32 -DPAX_ASLR -DCOREDUMP
+CPPFLAGS+= -DEXEC_ELF32 -DCOREDUMP
+.if ${MACHINE_ARCH} != arm \
+${MACHINE_ARCH} != armeb \
+${MACHINE_ARCH} != m68000 \
+${MACHINE_ARCH} != m68k \
+${MACHINE_ARCH} != powerpc \
+${MACHINE_ARCH} != powerpc64 \
+${MACHINE_ARCH} != sparc \
+${MACHINE_ARCH} != sparc64
+CPPFLAGS+= -DPAX_ASLR
+.endif
.PATH: ${S}/kern
SRCS= exec_elf32.c core_elf32.c
Index: src/sys/modules/exec_elf64/Makefile
diff -u src/sys/modules/exec_elf64/Makefile:1.1 src/sys/modules/exec_elf64/Makefile:1.2
--- src/sys/modules/exec_elf64/Makefile:1.1 Wed Nov 19 18:36:08 2008
+++ src/sys/modules/exec_elf64/Makefile Thu Sep 17 23:07:12 2009
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2008/11/19 18:36:08 ad Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/17 23:07:12 jnemeth Exp $
.include ../Makefile.inc
KMOD= exec_elf64
-CPPFLAGS+= -DEXEC_ELF64 -DPAX_ASLR -DCOREDUMP
+CPPFLAGS+= -DEXEC_ELF64 -DCOREDUMP
+.if ${MACHINE_ARCH} != powerpc64 \
+${MACHINE_ARCH} != sparc64
+CPPFLAGS+= -DPAX_ASLR
+.endif
.PATH: ${S}/kern
SRCS= exec_elf64.c core_elf64.c
CVS commit: [netbsd-5] src/etc/mtree
Module Name:src Committed By: snj Date: Fri Sep 18 02:01:38 UTC 2009 Modified Files: src/etc/mtree [netbsd-5]: special Log Message: Pull up following revision(s) (requested by tron in ticket #1012): etc/mtree/special: revision 1.130 Remove /etc/postfix/postfix-script as the file was obsoleted by the upgrade to Postfix 2.6.x. To generate a diff of this commit: cvs rdiff -u -r1.121.2.2 -r1.121.2.3 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.121.2.2 src/etc/mtree/special:1.121.2.3 --- src/etc/mtree/special:1.121.2.2 Fri Feb 6 00:55:31 2009 +++ src/etc/mtree/special Fri Sep 18 02:01:38 2009 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.121.2.2 2009/02/06 00:55:31 snj Exp $ +# $NetBSD: special,v 1.121.2.3 2009/09/18 02:01:38 snj Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -152,7 +152,6 @@ ./etc/postfix type=dir mode=0755 optional ./etc/postfix/main.cf type=file mode=0644 optional ./etc/postfix/master.cf type=file mode=0644 optional -./etc/postfix/postfix-script type=file mode=0555 optional ./etc/powerd type=dir mode=0755 optional ./etc/powerd/scripts type=dir mode=0755 optional ./etc/powerd/scripts/acadapter type=file mode=0555 optional
CVS commit: [netbsd-5] src
Module Name:src
Committed By: snj
Date: Fri Sep 18 02:03:35 UTC 2009
Modified Files:
src/distrib/sets/lists/xserver [netbsd-5]: md.sparc64
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader [netbsd-5]:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos [netbsd-5]:
Makefile
Log Message:
Apply patch (requested by mrg in ticket #958):
Missed a few bits in sparc64 xserver setlist and reachover Makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.26.2.3 -r1.26.2.4 src/distrib/sets/lists/xserver/md.sparc64
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
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/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.26.2.3 src/distrib/sets/lists/xserver/md.sparc64:1.26.2.4
--- src/distrib/sets/lists/xserver/md.sparc64:1.26.2.3 Thu Sep 17 04:24:28 2009
+++ src/distrib/sets/lists/xserver/md.sparc64 Fri Sep 18 02:03:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.26.2.3 2009/09/17 04:24:28 snj Exp $ x11
+# $NetBSD: md.sparc64,v 1.26.2.4 2009/09/18 02:03:35 snj Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -302,6 +302,8 @@
./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ag10e_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg
@@ -409,11 +411,6 @@
./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg
-./usr/X11R7/lib/modules/libint10.a -unknown- xorg
-./usr/X11R7/lib/modules/libint10.so -unknown- xorg
-./usr/X11R7/lib/modules/libint10.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/libint10_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/modules/libint10_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libpcidata.a -unknown- obsolete
./usr/X11R7/lib/modules/libpcidata.so -unknown- obsolete
./usr/X11R7/lib/modules/libpcidata.so.0 -unknown- obsolete
@@ -470,6 +467,7 @@
./usr/X11R7/man/cat1/pcitweak.0-unknown- obsolete
./usr/X11R7/man/cat1/scanpci.0-unknown- obsolete
./usr/X11R7/man/cat1/xorgconfig.0 -unknown- obsolete
+./usr/X11R7/man/cat4/ag10e.0-unknown- .cat,xorg
./usr/X11R7/man/cat4/ati.0-unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0-unknown- .cat,xorg
./usr/X11R7/man/cat4/glint.0-unknown- .cat,xorg
@@ -506,6 +504,7 @@
./usr/X11R7/man/man1/pcitweak.1-unknown- obsolete
./usr/X11R7/man/man1/scanpci.1-unknown- obsolete
./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete
+./usr/X11R7/man/man4/ag10e.4-unknown- .man,xorg
./usr/X11R7/man/man4/ati.4-unknown- .man,xorg
./usr/X11R7/man/man4/exa.4-unknown- .man,xorg
./usr/X11R7/man/man4/glint.4-unknown- .man,xorg
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.3.8.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.3.8.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.3.8.1 Thu Sep 17 04:24:40 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Fri Sep 18 02:03:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.8.1 2009/09/17 04:24:40 snj Exp $
+# $NetBSD: Makefile,v 1.3.8.2 2009/09/18 02:03:35 snj Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -10,7 +10,7 @@
extsym.c misym.c xf86sym.c
.if ${MACHINE_ARCH} == sparc || ${MACHINE_ARCH} == sparc64
-SRCS+= SparcMulDiv.S
+#SRCS+= SparcMulDiv.S
.endif
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.10.2.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.10.2.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.10.2.2 Thu Sep 17 04:24:41 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Fri Sep 18 02:03:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10.2.2 2009/09/17 04:24:41 snj Exp $
+# $NetBSD: Makefile,v 1.10.2.3 2009/09/18 02:03:35 snj Exp $
.include ../../../Makefile.serverlib
.include
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Fri Sep 18 02:08:17 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1012. To generate a diff of this commit: cvs rdiff -u -r1.1.2.73 -r1.1.2.74 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.73 src/doc/CHANGES-5.1:1.1.2.74 --- src/doc/CHANGES-5.1:1.1.2.73 Thu Sep 17 05:56:13 2009 +++ src/doc/CHANGES-5.1 Fri Sep 18 02:08:16 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.73 2009/09/17 05:56:13 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.74 2009/09/18 02:08:16 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -13321,3 +13321,9 @@ Update X.Org. [mrg, ticket #958] +etc/mtree/special1.130 + + Remove /etc/postfix/postfix-script as the file was obsoleted + by the upgrade to Postfix 2.6.x. + [tron, ticket #1012] +
