Mon Apr 17 06:48:07 2023 UTC ()

Trailing whitespace


(skrll)

diff -r1.39 -r1.40 src/sys/arch/powerpc/booke/trap.c

--- src/sys/arch/powerpc/booke/trap.c 2022/10/26 07:35:20	1.39
+++ src/sys/arch/powerpc/booke/trap.c 2023/04/17 06:48:07	1.40

 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.39 2022/10/26 07:35:20 skrll Exp $	*/
+/*	$NetBSD: trap.c,v 1.40 2023/04/17 06:48:07 skrll Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
  * Agency and which was developed by Matt Thomas of 3am Software Foundry.
+ *
  * This material is based upon work supported by the Defense Advanced Research
  * Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
  * Contract No. N66001-09-C-2073.
  * Approved for Public Release, Distribution Unlimited
+ *
 @@ -25,27 +25,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.39 2022/10/26 07:35:20 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.40 2023/04/17 06:48:07 skrll Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altivec.h"
 #include "opt_ddb.h"
 #endif
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/kauth.h>
 #include <sys/lwp.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/ras.h>
 @@ -290,27 +290,27 @@ isi_exception(struct trapframe *tf, ksig
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(pmapexechist);
 	if ((pte & PTE_UNSYNCED) == PTE_UNSYNCED) {
 		const paddr_t pa = pte_to_paddr(pte);
 		struct vm_page * const pg = PHYS_TO_VM_PAGE(pa);
 		KASSERT(pg);
 		struct vm_page_md * const mdpg = VM_PAGE_TO_MD(pg);
 #ifdef UVMHIST
 		if (VM_PAGEMD_EXECPAGE_P(mdpg))
 			UVMHIST_LOG(pmapexechist,
 			    "srr0=%#x pg=%p (pa %#"PRIxPADDR"): "
 			    "no syncicache (already execpage)",
 			    tf->tf_srr0, (uintptr_t)pg, pa, 0);
 		else
 			UVMHIST_LOG(pmapexechist,
 			    "srr0=%#x pg=%p (pa %#"PRIxPADDR"): "
 			    "performed syncicache (now execpage)",
 			    tf->tf_srr0, (uintptr_t)pg, pa, 0);
 #endif
 		if (!VM_PAGEMD_EXECPAGE_P(mdpg)) {
 			ci->ci_softc->cpu_ev_exec_trap_sync.ev_count++;
 			dcache_wb_page(pa);
 			icache_inv_page(pa);
 			pmap_page_set_attributes(mdpg, VM_PAGEMD_EXECPAGE);
 @@ -449,27 +449,27 @@ emulate_opcode(struct trapframe *tf, ksi
+}
 static int
 pgm_exception(struct trapframe *tf, ksiginfo_t *ksi)
+{
 	struct cpu_info * const ci = curcpu();
 	int rv = EPERM;
 	if (!usertrap_p(tf))
 		return rv;
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(pmapexechist);
 	UVMHIST_LOG(pmapexechist, " srr0/1=%#x/%#x esr=%#x pte=%#x",
 	    tf->tf_srr0, tf->tf_srr1, tf->tf_esr,
 	    *trap_pte_lookup(tf, trunc_page(tf->tf_srr0), PSL_IS));
 	ci->ci_ev_pgm.ev_count++;
 	KSI_INIT_TRAP(ksi);
 	if (tf->tf_esr & ESR_PTR) {
 		struct lwp * const l = curlwp;
 		struct proc * const p = curlwp->l_proc;
 		vaddr_t va = (vaddr_t)tf->tf_srr0;
 		int error;