[src/trunk]: src/sys/arch/powerpc Remove the hack to compile oea/pmap.c with ...

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

details:   https://anonhg.NetBSD.org/src/rev/1308b6f9689c
branches:  trunk
changeset: 581550:1308b6f9689c
user:      he <he%NetBSD.org@localhost>
date:      Thu Jun 02 14:35:08 2005 +0000

description:
Remove the hack to compile oea/pmap.c with -Wno-cast-qual, and instead
make use of the new __UNVOLATILE() macro in memset() usage.

diffstat:

 sys/arch/powerpc/conf/Makefile.powerpc |  4 +---
 sys/arch/powerpc/conf/files.powerpc    |  4 ++--
 sys/arch/powerpc/oea/pmap.c            |  7 ++++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 70e1a2f1efd9 -r 1308b6f9689c sys/arch/powerpc/conf/Makefile.powerpc
--- a/sys/arch/powerpc/conf/Makefile.powerpc    Thu Jun 02 14:32:12 2005 +0000
+++ b/sys/arch/powerpc/conf/Makefile.powerpc    Thu Jun 02 14:35:08 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.powerpc,v 1.34 2005/06/02 10:22:20 he Exp $
+#      $NetBSD: Makefile.powerpc,v 1.35 2005/06/02 14:35:08 he Exp $
 #
 # Makefile for NetBSD
 #
@@ -45,8 +45,6 @@
 CFLAGS+=       -msoft-float ${CCPUOPTS} -Wa,-maltivec
 AFLAGS+=       ${AOPTS}
 
-CC_NO_CAST_QUAL= CFLAGS="${CFLAGS} -Wno-cast-qual" ${NORMAL_C}
-
 ##
 ## (3) libkern and compat
 ##
diff -r 70e1a2f1efd9 -r 1308b6f9689c sys/arch/powerpc/conf/files.powerpc
--- a/sys/arch/powerpc/conf/files.powerpc       Thu Jun 02 14:32:12 2005 +0000
+++ b/sys/arch/powerpc/conf/files.powerpc       Thu Jun 02 14:35:08 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.powerpc,v 1.59 2005/06/02 10:22:20 he Exp $
+#      $NetBSD: files.powerpc,v 1.60 2005/06/02 14:35:08 he Exp $
 
 defflag        opt_altivec.h   ALTIVEC K_ALTIVEC
 defflag        opt_openpic.h   OPENPIC OPENPIC_SERIAL_MODE
@@ -47,7 +47,7 @@
 file   arch/powerpc/oea/altivec.c                      ppc_oea & altivec
 file   arch/powerpc/oea/cpu_subr.c                     ppc_oea
 file   arch/powerpc/oea/oea_machdep.c                  ppc_oea
-file   arch/powerpc/oea/pmap.c                         ppc_oea compile-with "${CC_NO_CAST_QUAL}"
+file   arch/powerpc/oea/pmap.c                         ppc_oea
 file   arch/powerpc/powerpc/fpu.c                      ppc_oea
 file   arch/powerpc/powerpc/trap.c                     ppc_oea
 
diff -r 70e1a2f1efd9 -r 1308b6f9689c sys/arch/powerpc/oea/pmap.c
--- a/sys/arch/powerpc/oea/pmap.c       Thu Jun 02 14:32:12 2005 +0000
+++ b/sys/arch/powerpc/oea/pmap.c       Thu Jun 02 14:35:08 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.31 2005/06/02 09:47:21 he Exp $     */
+/*     $NetBSD: pmap.c,v 1.32 2005/06/02 14:35:08 he Exp $     */
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.31 2005/06/02 09:47:21 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.32 2005/06/02 14:35:08 he Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_altivec.h"
@@ -3092,7 +3092,8 @@
                    pmap_pteg_table, size);
 #endif
 
-       memset((void *)pmap_pteg_table, 0, pmap_pteg_cnt * sizeof(struct pteg));
+       memset(__UNVOLATILE(pmap_pteg_table), 0,
+               pmap_pteg_cnt * sizeof(struct pteg));
        pmap_pteg_mask = pmap_pteg_cnt - 1;
 
        /*