Fri Mar 12 18:10:00 2021 UTC ()
Fix paste-o in last.


(thorpej)
diff -r1.104 -r1.105 src/sys/arch/powerpc/oea/pmap.c
cvs diff -r1.104 -r1.105 src/sys/arch/powerpc/oea/pmap.c (expand / switch to unified diff)

--- src/sys/arch/powerpc/oea/pmap.c 2021/03/12 04:57:42 1.104
+++ src/sys/arch/powerpc/oea/pmap.c 2021/03/12 18:10:00 1.105
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pmap.c,v 1.104 2021/03/12 04:57:42 thorpej Exp $ */ 1/* $NetBSD: pmap.c,v 1.105 2021/03/12 18:10:00 thorpej Exp $ */
2/*- 2/*-
3 * Copyright (c) 2001 The NetBSD Foundation, Inc. 3 * Copyright (c) 2001 The NetBSD Foundation, Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This code is derived from software contributed to The NetBSD Foundation 6 * This code is derived from software contributed to The NetBSD Foundation
7 * by Matt Thomas <matt@3am-software.com> of Allegro Networks, Inc. 7 * by Matt Thomas <matt@3am-software.com> of Allegro Networks, Inc.
8 * 8 *
9 * Support for PPC64 Bridge mode added by Sanjay Lal <sanjayl@kymasys.com> 9 * Support for PPC64 Bridge mode added by Sanjay Lal <sanjayl@kymasys.com>
10 * of Kyma Systems LLC. 10 * of Kyma Systems LLC.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -53,27 +53,27 @@ @@ -53,27 +53,27 @@
53 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR 53 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
54 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 54 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
55 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 55 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
56 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 56 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
57 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 57 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
58 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 58 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
59 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 59 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
60 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 60 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
61 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 61 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
62 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 62 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
63 */ 63 */
64 64
65#include <sys/cdefs.h> 65#include <sys/cdefs.h>
66__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.104 2021/03/12 04:57:42 thorpej Exp $"); 66__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.105 2021/03/12 18:10:00 thorpej Exp $");
67 67
68#define PMAP_NOOPNAMES 68#define PMAP_NOOPNAMES
69 69
70#ifdef _KERNEL_OPT 70#ifdef _KERNEL_OPT
71#include "opt_altivec.h" 71#include "opt_altivec.h"
72#include "opt_multiprocessor.h" 72#include "opt_multiprocessor.h"
73#include "opt_pmap.h" 73#include "opt_pmap.h"
74#include "opt_ppcarch.h" 74#include "opt_ppcarch.h"
75#endif 75#endif
76 76
77#include <sys/param.h> 77#include <sys/param.h>
78#include <sys/proc.h> 78#include <sys/proc.h>
79#include <sys/pool.h> 79#include <sys/pool.h>
@@ -3422,27 +3422,27 @@ pmap_bootstrap1(paddr_t kernelstart, pad @@ -3422,27 +3422,27 @@ pmap_bootstrap1(paddr_t kernelstart, pad
3422#if defined(PMAP_OEA) || defined(PMAP_OEA64_BRIDGE) 3422#if defined(PMAP_OEA) || defined(PMAP_OEA64_BRIDGE)
3423 for (i = 0; i < 16; i++) { 3423 for (i = 0; i < 16; i++) {
3424 pmap_kernel()->pm_sr[i] = KERNELN_SEGMENT(i)|SR_PRKEY; 3424 pmap_kernel()->pm_sr[i] = KERNELN_SEGMENT(i)|SR_PRKEY;
3425 } 3425 }
3426 pmap_kernel()->pm_vsid = KERNEL_VSIDBITS; 3426 pmap_kernel()->pm_vsid = KERNEL_VSIDBITS;
3427 3427
3428 pmap_kernel()->pm_sr[KERNEL_SR] = KERNEL_SEGMENT|SR_SUKEY|SR_PRKEY; 3428 pmap_kernel()->pm_sr[KERNEL_SR] = KERNEL_SEGMENT|SR_SUKEY|SR_PRKEY;
3429#ifdef KERNEL2_SR 3429#ifdef KERNEL2_SR
3430 pmap_kernel()->pm_sr[KERNEL2_SR] = KERNEL2_SEGMENT|SR_SUKEY|SR_PRKEY; 3430 pmap_kernel()->pm_sr[KERNEL2_SR] = KERNEL2_SEGMENT|SR_SUKEY|SR_PRKEY;
3431#endif 3431#endif
3432#endif /* PMAP_OEA || PMAP_OEA64_BRIDGE */ 3432#endif /* PMAP_OEA || PMAP_OEA64_BRIDGE */
3433 3433
3434#if defined(PMAP_OEA) && defined(PPC_OEA601) 3434#if defined(PMAP_OEA) && defined(PPC_OEA601)
3435 if ((MFPVR() >> 16) == MPC601)) { 3435 if ((MFPVR() >> 16) == MPC601) {
3436 for (i = 0; i < 16; i++) { 3436 for (i = 0; i < 16; i++) {
3437 if (iosrtable[i] & SR601_T) { 3437 if (iosrtable[i] & SR601_T) {
3438 pmap_kernel()->pm_sr[i] = iosrtable[i]; 3438 pmap_kernel()->pm_sr[i] = iosrtable[i];
3439 } 3439 }
3440 } 3440 }
3441 } 3441 }
3442#endif /* PMAP_OEA && PPC_OEA601 */ 3442#endif /* PMAP_OEA && PPC_OEA601 */
3443 3443
3444#ifdef ALTIVEC 3444#ifdef ALTIVEC
3445 pmap_use_altivec = cpu_altivec; 3445 pmap_use_altivec = cpu_altivec;
3446#endif 3446#endif
3447 3447
3448#ifdef DEBUG 3448#ifdef DEBUG