summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2003-01-18 10:32:11 +0000
committerthorpej <thorpej@NetBSD.org>2003-01-18 10:32:11 +0000
commitc62a74e6d5cfb2fb5034e98b983da7e2fc87709d (patch)
treef1281fd7111ddb57951e4472b342b53a2f56244a /sys/dev
parentaf919042eceb8c19f42acd688efa8cf58168af5d (diff)
Merge the nathanw_sa branch.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sun/cgsix.c6
-rw-r--r--sys/dev/wscons/wsdisplay_compat_usl.c7
2 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index a9b5eba31b6..12fcb9ab4b4 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.9 2002/10/23 09:13:53 jdolecek Exp $ */
+/* $NetBSD: cgsix.c,v 1.10 2003/01/18 10:38:38 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.9 2002/10/23 09:13:53 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.10 2003/01/18 10:38:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -956,7 +956,7 @@ cgsixmmap(dev, off, prot)
#ifdef DEBUG
{
- struct proc *p = curproc; /* XXX */
+ struct proc *p = curlwp->l_proc; /* XXX */
log(LOG_NOTICE, "cgsixmmap(0x%llx) (%s[%d])\n",
(long long)off, p->p_comm, p->p_pid);
}
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index 1024eda9cb5..496fa49ffc1 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_compat_usl.c,v 1.20 2002/12/10 20:56:30 fvdl Exp $ */
+/* $NetBSD: wsdisplay_compat_usl.c,v 1.21 2003/01/18 10:38:38 thorpej Exp $ */
/*
* Copyright (c) 1998
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.20 2002/12/10 20:56:30 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.21 2003/01/18 10:38:38 thorpej Exp $");
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
@@ -408,7 +408,8 @@ wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr,
#if defined(__i386__)
#if defined(COMPAT_10) || defined(COMPAT_11) || defined(COMPAT_FREEBSD)
{
- struct trapframe *fp = (struct trapframe *)p->p_md.md_regs;
+ /* XXX NJWLWP */
+ struct trapframe *fp = (struct trapframe *)curlwp->l_md.md_regs;
if (cmd == KDENABIO)
fp->tf_eflags |= PSL_IOPL;
else