Thu Jul 28 03:15:20 2011 UTC ()
Fix DEBUG build.


(uebayasi)
diff -r1.92 -r1.93 src/sys/arch/alpha/alpha/cpu.c
cvs diff -r1.92 -r1.93 src/sys/arch/alpha/alpha/cpu.c (expand / switch to unified diff)

--- src/sys/arch/alpha/alpha/cpu.c 2011/06/14 15:34:21 1.92
+++ src/sys/arch/alpha/alpha/cpu.c 2011/07/28 03:15:20 1.93
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu.c,v 1.92 2011/06/14 15:34:21 matt Exp $ */ 1/* $NetBSD: cpu.c,v 1.93 2011/07/28 03:15:20 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center. 9 * NASA Ames Research Center.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -49,27 +49,27 @@ @@ -49,27 +49,27 @@
49 * Carnegie Mellon requests users of this software to return to 49 * Carnegie Mellon requests users of this software to return to
50 * 50 *
51 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU 51 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
52 * School of Computer Science 52 * School of Computer Science
53 * Carnegie Mellon University 53 * Carnegie Mellon University
54 * Pittsburgh PA 15213-3890 54 * Pittsburgh PA 15213-3890
55 * 55 *
56 * any improvements or extensions that they make and grant Carnegie the 56 * any improvements or extensions that they make and grant Carnegie the
57 * rights to redistribute these changes. 57 * rights to redistribute these changes.
58 */ 58 */
59 59
60#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ 60#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
61 61
62__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.92 2011/06/14 15:34:21 matt Exp $"); 62__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.93 2011/07/28 03:15:20 uebayasi Exp $");
63 63
64#include "opt_ddb.h" 64#include "opt_ddb.h"
65#include "opt_multiprocessor.h" 65#include "opt_multiprocessor.h"
66 66
67#include <sys/param.h> 67#include <sys/param.h>
68#include <sys/systm.h> 68#include <sys/systm.h>
69#include <sys/device.h> 69#include <sys/device.h>
70#include <sys/kmem.h> 70#include <sys/kmem.h>
71#include <sys/proc.h> 71#include <sys/proc.h>
72#include <sys/atomic.h> 72#include <sys/atomic.h>
73#include <sys/cpu.h> 73#include <sys/cpu.h>
74 74
75#include <uvm/uvm_extern.h> 75#include <uvm/uvm_extern.h>
@@ -228,27 +228,27 @@ cpuattach(device_t parent, device_t self @@ -228,27 +228,27 @@ cpuattach(device_t parent, device_t self
228 228
229recognized: 229recognized:
230 aprint_naive("\n"); 230 aprint_naive("\n");
231 aprint_normal("\n"); 231 aprint_normal("\n");
232 232
233#ifdef DEBUG 233#ifdef DEBUG
234 if (p->pcs_proc_var != 0) { 234 if (p->pcs_proc_var != 0) {
235 bool needcomma = false; 235 bool needcomma = false;
236 const char *vaxfp = ""; 236 const char *vaxfp = "";
237 const char *ieeefp = ""; 237 const char *ieeefp = "";
238 const char *pe = ""; 238 const char *pe = "";
239 239
240 if (p->pcs_proc_var & PCS_VAR_VAXFP) { 240 if (p->pcs_proc_var & PCS_VAR_VAXFP) {
241 fpstr = "VAX FP support"; 241 vaxfp = "VAX FP support";
242 needcomma = true; 242 needcomma = true;
243 } 243 }
244 if (p->pcs_proc_var & PCS_VAR_IEEEFP) { 244 if (p->pcs_proc_var & PCS_VAR_IEEEFP) {
245 ieeefp = ", IEEE FP support"; 245 ieeefp = ", IEEE FP support";
246 if (!needcomma) 246 if (!needcomma)
247 ieeefp += 2; 247 ieeefp += 2;
248 needcomma = true; 248 needcomma = true;
249 } 249 }
250 if (p->pcs_proc_var & PCS_VAR_PE) { 250 if (p->pcs_proc_var & PCS_VAR_PE) {
251 pe = ", Primary Eligible"); 251 pe = ", Primary Eligible");
252 if (!needcomma) 252 if (!needcomma)
253 pe += 2; 253 pe += 2;
254 needcomma = true; 254 needcomma = true;