Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 16 Sep 2019 14:34:11 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r352398 - stable/12/sys/arm64/arm64
Message-ID:  <201909161434.x8GEYBiL030906@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: andrew
Date: Mon Sep 16 14:34:10 2019
New Revision: 352398
URL: https://svnweb.freebsd.org/changeset/base/352398

Log:
  MFC r339944:
  
  Fix some style(9) issues in the arm64 pmap_mapbios/unmapbios. Split lines
  when they are too long.

Modified:
  stable/12/sys/arm64/arm64/pmap.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm64/arm64/pmap.c
==============================================================================
--- stable/12/sys/arm64/arm64/pmap.c	Mon Sep 16 14:25:51 2019	(r352397)
+++ stable/12/sys/arm64/arm64/pmap.c	Mon Sep 16 14:34:10 2019	(r352398)
@@ -4810,8 +4810,9 @@ pmap_mapbios(vm_paddr_t pa, vm_size_t size)
 		 if (size == 0)
 			 return (NULL);
 
-		 /* Calculate how many full L2 blocks are needed for the mapping */
-		l2_blocks = (roundup2(pa + size, L2_SIZE) - rounddown2(pa, L2_SIZE)) >> L2_SHIFT;
+		 /* Calculate how many L2 blocks are needed for the mapping */
+		l2_blocks = (roundup2(pa + size, L2_SIZE) -
+		    rounddown2(pa, L2_SIZE)) >> L2_SHIFT;
 
 		offset = pa & L2_OFFSET;
 
@@ -4858,8 +4859,10 @@ pmap_mapbios(vm_paddr_t pa, vm_size_t size)
 		for (i = 0; i < l2_blocks; i++) {
 			pde = pmap_pde(kernel_pmap, va, &lvl);
 			KASSERT(pde != NULL,
-			    ("pmap_mapbios: Invalid page entry, va: 0x%lx", va));
-			KASSERT(lvl == 1, ("pmap_mapbios: Invalid level %d", lvl));
+			    ("pmap_mapbios: Invalid page entry, va: 0x%lx",
+			    va));
+			KASSERT(lvl == 1,
+			    ("pmap_mapbios: Invalid level %d", lvl));
 
 			/* Insert L2_BLOCK */
 			l2 = pmap_l1_to_l2(pde, va);
@@ -4904,7 +4907,8 @@ pmap_unmapbios(vm_offset_t va, vm_size_t size)
 	pt_entry_t *l2;
 	int i, lvl, l2_blocks, block;
 
-	l2_blocks = (roundup2(va + size, L2_SIZE) - rounddown2(va, L2_SIZE)) >> L2_SHIFT;
+	l2_blocks =
+	   (roundup2(va + size, L2_SIZE) - rounddown2(va, L2_SIZE)) >> L2_SHIFT;
 	KASSERT(l2_blocks > 0, ("pmap_unmapbios: invalid size %lx", size));
 
 	/* Remove preinit mapping */
@@ -4912,7 +4916,8 @@ pmap_unmapbios(vm_offset_t va, vm_size_t size)
 	for (i = 0; i < PMAP_PREINIT_MAPPING_COUNT; i++) {
 		ppim = pmap_preinit_mapping + i;
 		if (ppim->va == va) {
-			KASSERT(ppim->size == size, ("pmap_unmapbios: size mismatch"));
+			KASSERT(ppim->size == size,
+			    ("pmap_unmapbios: size mismatch"));
 			ppim->va = 0;
 			ppim->pa = 0;
 			ppim->size = 0;
@@ -4922,10 +4927,12 @@ pmap_unmapbios(vm_offset_t va, vm_size_t size)
 			/* Remove L2_BLOCK */
 			pde = pmap_pde(kernel_pmap, va_trunc, &lvl);
 			KASSERT(pde != NULL,
-			    ("pmap_unmapbios: Invalid page entry, va: 0x%lx", va_trunc));
+			    ("pmap_unmapbios: Invalid page entry, va: 0x%lx",
+			    va_trunc));
 			l2 = pmap_l1_to_l2(pde, va_trunc);
 			pmap_clear(l2);
-			pmap_invalidate_range(kernel_pmap, va_trunc, va_trunc + L2_SIZE);
+			pmap_invalidate_range(kernel_pmap, va_trunc,
+			    va_trunc + L2_SIZE);
 
 			if (block == (l2_blocks - 1))
 				return;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909161434.x8GEYBiL030906>