Sun Jul 31 10:00:52 2011 UTC ()
s/MULTIPROCESOR/MULTIPROCESSOR/.


(kiyohara)
diff -r1.59 -r1.60 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
cvs diff -r1.59 -r1.60 src/sys/arch/powerpc/powerpc/powerpc_machdep.c (expand / switch to unified diff)

--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c 2011/06/29 06:00:17 1.59
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c 2011/07/31 10:00:52 1.60
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: powerpc_machdep.c,v 1.59 2011/06/29 06:00:17 matt Exp $ */ 1/* $NetBSD: powerpc_machdep.c,v 1.60 2011/07/31 10:00:52 kiyohara Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 1995, 1996 Wolfgang Solfrank. 4 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
5 * Copyright (C) 1995, 1996 TooLs GmbH. 5 * Copyright (C) 1995, 1996 TooLs GmbH.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -22,27 +22,27 @@ @@ -22,27 +22,27 @@
22 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR 22 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
23 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 23 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
25 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 25 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 26 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
28 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 28 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
29 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 29 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
30 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 30 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
31 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.59 2011/06/29 06:00:17 matt Exp $"); 35__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.60 2011/07/31 10:00:52 kiyohara Exp $");
36 36
37#include "opt_altivec.h" 37#include "opt_altivec.h"
38#include "opt_modular.h" 38#include "opt_modular.h"
39#include "opt_multiprocessor.h" 39#include "opt_multiprocessor.h"
40#include "opt_ppcarch.h" 40#include "opt_ppcarch.h"
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/conf.h> 43#include <sys/conf.h>
44#include <sys/disklabel.h> 44#include <sys/disklabel.h>
45#include <sys/exec.h> 45#include <sys/exec.h>
46#include <sys/kauth.h> 46#include <sys/kauth.h>
47#include <sys/pool.h> 47#include <sys/pool.h>
48#include <sys/proc.h> 48#include <sys/proc.h>
@@ -59,27 +59,27 @@ __KERNEL_RCSID(0, "$NetBSD: powerpc_mach @@ -59,27 +59,27 @@ __KERNEL_RCSID(0, "$NetBSD: powerpc_mach
59#include <sys/kmem.h> 59#include <sys/kmem.h>
60#include <sys/xcall.h> 60#include <sys/xcall.h>
61 61
62#include <dev/mm.h> 62#include <dev/mm.h>
63 63
64#include <powerpc/fpu.h> 64#include <powerpc/fpu.h>
65#include <powerpc/pcb.h> 65#include <powerpc/pcb.h>
66#include <powerpc/psl.h> 66#include <powerpc/psl.h>
67#include <powerpc/userret.h> 67#include <powerpc/userret.h>
68#if defined(ALTIVEC) || defined(PPC_HAVE_SPE) 68#if defined(ALTIVEC) || defined(PPC_HAVE_SPE)
69#include <powerpc/altivec.h> 69#include <powerpc/altivec.h>
70#endif 70#endif
71 71
72#ifdef MULTIPROCESOR 72#ifdef MULTIPROCESSOR
73#include <powerpc/pic/ipivar.h> 73#include <powerpc/pic/ipivar.h>
74#endif 74#endif
75 75
76int cpu_timebase; 76int cpu_timebase;
77int cpu_printfataltraps = 1; 77int cpu_printfataltraps = 1;
78#if !defined(PPC_IBM4XX) 78#if !defined(PPC_IBM4XX)
79extern int powersave; 79extern int powersave;
80#endif 80#endif
81 81
82/* exported variable to be filled in by the bootloaders */ 82/* exported variable to be filled in by the bootloaders */
83char *booted_kernel; 83char *booted_kernel;
84 84
85const pcu_ops_t * const pcu_ops_md_defs[PCU_UNIT_COUNT] = { 85const pcu_ops_t * const pcu_ops_md_defs[PCU_UNIT_COUNT] = {