diff --git a/sys/arch/mac68k/mac68k/pram.c b/sys/arch/mac68k/mac68k/pram.c index 1bd86bddb4a0..a07999c2b33a 100644 --- a/sys/arch/mac68k/mac68k/pram.c +++ b/sys/arch/mac68k/mac68k/pram.c @@ -1,4 +1,4 @@ -/* $NetBSD: pram.c,v 1.19 2003/07/15 02:43:22 lukem Exp $ */ +/* $NetBSD: pram.c,v 1.20 2005/10/29 16:34:19 christos Exp $ */ /*- * Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo, @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pram.c,v 1.19 2003/07/15 02:43:22 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pram.c,v 1.20 2005/10/29 16:34:19 christos Exp $"); #include "opt_adb.h" @@ -52,11 +52,11 @@ __KERNEL_RCSID(0, "$NetBSD: pram.c,v 1.19 2003/07/15 02:43:22 lukem Exp $"); #endif #if DEBUG -static char *convtime(unsigned long t) +static const char *convtime(unsigned long t) { static long daypmon[] = { 31,28,31,30,31,30,31,31,30,31,30,31 }; - static char *monstr[] = {"January","February","March","April","May","June", - "July","August","September","October","November","December" }; + static const char *monstr[] = {"January","February","March","April","May", + "June","July","August","September","October","November","December" }; static char s[200]; long year,month,day,hour,minute,seconds,i,dayperyear; diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c index 1143c4e57c1c..192b02643b30 100644 --- a/sys/arch/mac68k/mac68k/trap.c +++ b/sys/arch/mac68k/mac68k/trap.c @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.114 2005/06/03 11:15:44 rjs Exp $ */ +/* $NetBSD: trap.c,v 1.115 2005/10/29 16:34:19 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.114 2005/06/03 11:15:44 rjs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.115 2005/10/29 16:34:19 christos Exp $"); #include "opt_ddb.h" #include "opt_execfmt.h" @@ -703,9 +703,9 @@ struct writebackstats { int wbsize[4]; } wbstats; -char *f7sz[] = { "longword", "byte", "word", "line" }; -char *f7tt[] = { "normal", "MOVE16", "AFC", "ACK" }; -char *f7tm[] = { "d-push", "u-data", "u-code", "M-data", +const char *f7sz[] = { "longword", "byte", "word", "line" }; +const char *f7tt[] = { "normal", "MOVE16", "AFC", "ACK" }; +const char *f7tm[] = { "d-push", "u-data", "u-code", "M-data", "M-code", "k-data", "k-code", "RES" }; char wberrstr[] = "WARNING: pid %d(%s) writeback [%s] failed, pc=%x fa=%x wba=%x wbd=%x\n";