Changeset 8565a42 in mainline for kernel/genarch/src/mm/page_pt.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• kernel/genarch/src/mm/page_pt.c (modified) (16 diffs)

kernel/genarch/src/mm/page_pt.c

@@ -83 +83 @@
 
         assert(page_table_locked(as));
-        
+
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
                 pte_t *newpt = (pte_t *)
@@ -100 +100 @@
                 SET_PTL1_PRESENT(ptl0, PTL0_INDEX(page));
         }
-        
+
         pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
-        
+
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
                 pte_t *newpt = (pte_t *)
@@ -117 +117 @@
                 SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page));
         }
-        
+
         pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
-        
+
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
                 pte_t *newpt = (pte_t *)
@@ -134 +134 @@
                 SET_PTL3_PRESENT(ptl2, PTL2_INDEX(page));
         }
-        
+
         pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
-        
+
         SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(page), frame);
         SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags | PAGE_NOT_PRESENT);
@@ -165 +165 @@
          * First, remove the mapping, if it exists.
          */
-        
+
         pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
                 return;
-        
+
         pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT)
                 return;
-        
+
         pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT)
                 return;
-        
+
         pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
-        
+
         /*
          * Destroy the mapping.
@@ -189 +189 @@
         SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), PAGE_NOT_PRESENT);
         memsetb(&ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0);
-        
+
         /*
          * Second, free all empty tables along the way from PTL3 down to PTL0
          * except those needed for sharing the kernel non-identity mappings.
          */
-        
+
         /* Check PTL3 */
         bool empty = true;
-        
+
         unsigned int i;
         for (i = 0; i < PTL3_ENTRIES; i++) {
@@ -205 +205 @@
                 }
         }
-        
+
         if (empty) {
                 /*
@@ -232 +232 @@
                 return;
         }
-        
+
         /* Check PTL2, empty is still true */
 #if (PTL2_ENTRIES != 0)
@@ -241 +241 @@
                 }
         }
-        
+
         if (empty) {
                 /*
@@ -267 +267 @@
         }
 #endif /* PTL2_ENTRIES != 0 */
-        
+
         /* check PTL1, empty is still true */
 #if (PTL1_ENTRIES != 0)
@@ -276 +276 @@
                 }
         }
-        
+
         if (empty) {
                 /*
@@ -301 +301 @@
 
         read_barrier();
-        
+
         pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT)
@@ -312 +312 @@
         read_barrier();
 #endif
-        
+
         pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT)
@@ -323 +323 @@
         read_barrier();
 #endif
-        
+
         pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
-        
+
         return &ptl3[PTL3_INDEX(page)];
 }
@@ -400 +400 @@
 {
         assert(size > 0);
-        
+
         uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
         uintptr_t ptl0_step = ptl0_step_get();
         size_t frames;
-        
+
 #if (PTL1_ENTRIES != 0)
         frames = PTL1_FRAMES;
@@ -412 +412 @@
         frames = PTL3_FRAMES;
 #endif
-        
+
         for (uintptr_t addr = ALIGN_DOWN(base, ptl0_step);
             addr - 1 < base + size - 1;