Module Name: src
Committed By: skrll
Date: Wed Feb 10 20:54:47 UTC 2010
Modified Files:
src/sys/arch/hppa/hppa: trap.c
src/sys/dev/wscons: wsemul_vt100.c
Log Message:
Oops. Whitespace in previous.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/hppa/hppa/trap.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/wscons/wsemul_vt100.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/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.75 src/sys/arch/hppa/hppa/trap.c:1.76
--- src/sys/arch/hppa/hppa/trap.c:1.75 Wed Feb 10 20:52:35 2010
+++ src/sys/arch/hppa/hppa/trap.c Wed Feb 10 20:54:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.75 2010/02/10 20:52:35 skrll Exp $ */
+/* $NetBSD: trap.c,v 1.76 2010/02/10 20:54:46 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.75 2010/02/10 20:52:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.76 2010/02/10 20:54:46 skrll Exp $");
/* #define INTRDEBUG */
/* #define TRAPDEBUG */
@@ -505,7 +505,6 @@
int trapnum;
#ifdef DIAGNOSTIC
extern int emergency_stack_start, emergency_stack_end;
-
int oldcpl = cpl;
#endif
Index: src/sys/dev/wscons/wsemul_vt100.c
diff -u src/sys/dev/wscons/wsemul_vt100.c:1.32 src/sys/dev/wscons/wsemul_vt100.c:1.33
--- src/sys/dev/wscons/wsemul_vt100.c:1.32 Wed Feb 10 19:39:39 2010
+++ src/sys/dev/wscons/wsemul_vt100.c Wed Feb 10 20:54:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.32 2010/02/10 19:39:39 drochner Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.33 2010/02/10 20:54:46 skrll Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.32 2010/02/10 19:39:39 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.33 2010/02/10 20:54:46 skrll Exp $");
#include "opt_wsmsgattrs.h"
@@ -1009,6 +1009,7 @@
wsemul_vt100_getmsgattrs(void *cookie, struct wsdisplay_msgattrs *ma)
{
struct wsemul_vt100_emuldata *edp = cookie;
+ struct vt100base_data *vd = &edp->bd;
*ma = vd->msgattrs;
}
@@ -1020,6 +1021,7 @@
int error;
long tmp;
struct wsemul_vt100_emuldata *edp = cookie;
+ struct vt100base_data *vd = &edp->bd;
vd->msgattrs = *ma;
if (type->capabilities & WSSCREEN_WSCOLORS) {
