[src/trunk]: src/sys/arch/sparc/sparc Avoid shadow warnings, const and __UNVO...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fe161337f311
branches:  trunk
changeset: 582109:fe161337f311
user:      hannken <hannken%NetBSD.org@localhost>
date:      Fri Jun 17 09:13:56 2005 +0000

description:
Avoid shadow warnings, const and __UNVOLATILE().
Kernel sparc/GENERIC.MP builds again.

diffstat:

 sys/arch/sparc/sparc/db_interface.c |  8 ++++----
 sys/arch/sparc/sparc/trap.c         |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r e3d6f8a9985f -r fe161337f311 sys/arch/sparc/sparc/db_interface.c
--- a/sys/arch/sparc/sparc/db_interface.c       Fri Jun 17 02:10:45 2005 +0000
+++ b/sys/arch/sparc/sparc/db_interface.c       Fri Jun 17 09:13:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.63 2005/06/16 04:17:49 briggs Exp $ */
+/*     $NetBSD: db_interface.c,v 1.64 2005/06/17 09:13:56 hannken Exp $ */
 
 /*
  * Mach Operating System
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.63 2005/06/16 04:17:49 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.64 2005/06/17 09:13:56 hannken Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -525,7 +525,7 @@
        db_expr_t       addr;
        int             have_addr;
        db_expr_t       count;
-       char *          modif;
+       const char *    modif;
 {
        struct cpu_info *ci;
        if (!have_addr) {
@@ -553,7 +553,7 @@
                return;
        }
        db_printf("using CPU %ld", addr);
-       ddb_regp = (void *)ci->ci_ddb_regs;
+       ddb_regp = __UNVOLATILE(ci->ci_ddb_regs);
        ddb_cpuinfo = ci;
 }
 
diff -r e3d6f8a9985f -r fe161337f311 sys/arch/sparc/sparc/trap.c
--- a/sys/arch/sparc/sparc/trap.c       Fri Jun 17 02:10:45 2005 +0000
+++ b/sys/arch/sparc/sparc/trap.c       Fri Jun 17 09:13:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.156 2005/02/03 16:15:06 chs Exp $ */
+/*     $NetBSD: trap.c,v 1.157 2005/06/17 09:13:56 hannken Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.156 2005/02/03 16:15:06 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.157 2005/06/17 09:13:56 hannken Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
@@ -361,7 +361,7 @@
 #if defined(MULTIPROCESSOR)
                if (type == T_DBPAUSE) {
                        /* XXX - deal with kgdb too */
-                       extern void ddb_suspend(struct trapframe *tf);
+                       extern void ddb_suspend(struct trapframe *);
                        write_all_windows();
                        ddb_suspend(tf);
                        ADVANCE;