Changeset 8565a42 in mainline for kernel/arch/ia32/src/mm

Timestamp:

2018-03-02T20:34:50Z (8 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.

Location:

kernel/arch/ia32/src/mm

Files:

• frame.c (modified) (8 diffs)
• page.c (modified) (4 diffs)

kernel/arch/ia32/src/mm/frame.c

@@ -54 +54 @@
 {
         unsigned int i;
-        
+
         for (i = 0; i < e820counter; i++) {
                 uint64_t base64 = e820table[i].base_address;
                 uint64_t size64 = e820table[i].size;
-                
+
 #ifdef KARCH_ia32
                 /*
@@ -65 +65 @@
                 if (base64 >= PHYSMEM_LIMIT32)
                         continue;
-                
+
                 if (base64 + size64 > PHYSMEM_LIMIT32)
                         size64 = PHYSMEM_LIMIT32 - base64;
 #endif
-                
+
                 uintptr_t base = (uintptr_t) base64;
                 size_t size = (size_t) size64;
-                
+
                 if (!frame_adjust_zone_bounds(low, &base, &size))
                         continue;
-                
+
                 if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
                         /* To be safe, make the available zone possibly smaller */
@@ -81 +81 @@
                         uint64_t new_size = ALIGN_DOWN(size - (new_base - base),
                             FRAME_SIZE);
-                        
+
                         size_t count = SIZE2FRAMES(new_size);
                         pfn_t pfn = ADDR2PFN(new_base);
                         pfn_t conf;
-                        
+
                         if (low) {
                                 if ((minconf < pfn) || (minconf >= pfn + count))
@@ -105 +105 @@
                         uint64_t new_size = ALIGN_UP(size + (base - new_base),
                             FRAME_SIZE);
-                        
+
                         zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0,
                             ZONE_FIRMWARE);
@@ -113 +113 @@
                         uint64_t new_size = ALIGN_UP(size + (base - new_base),
                             FRAME_SIZE);
-                        
+
                         zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0,
                             ZONE_RESERVED);
@@ -133 +133 @@
         unsigned int i;
         printf("[base            ] [size            ] [name   ]\n");
-        
+
         for (i = 0; i < e820counter; i++) {
                 const char *name;
-                
+
                 if (e820table[i].type <= MEMMAP_MEMORY_UNUSABLE)
                         name = e820names[e820table[i].type];
                 else
                         name = "invalid";
-                
+
                 printf("%#018" PRIx64 " %#018" PRIx64" %s\n", e820table[i].base_address,
                     e820table[i].size, name);
@@ -150 +150 @@
 {
         pfn_t minconf;
-        
+
         if (config.cpu_active == 1) {
                 minconf = 1;
-                
+
 #ifdef CONFIG_SMP
                 minconf = max(minconf,
@@ -159 +159 @@
                     hardcoded_unmapped_kdata_size));
 #endif
-                
+
                 init_e820_memory(minconf, true);
-                
+
                 /* Reserve frame 0 (BIOS data) */
                 frame_mark_unavailable(0, 1);
-                
+
 #ifdef CONFIG_SMP
                 /* Reserve AP real mode bootstrap memory */

kernel/arch/ia32/src/mm/page.c

@@ -54 +54 @@
         uintptr_t cur;
         int flags;
-        
+
         if (config.cpu_active > 1) {
                 /* Fast path for non-boot CPUs */
@@ -63 +63 @@
 
         page_mapping_operations = &pt_mapping_operations;
-        
+
         /*
          * PA2KA(identity) mapping for all low-memory frames.
@@ -74 +74 @@
         }
         page_table_unlock(AS_KERNEL, true);
-                
+
         exc_register(VECTOR_PF, "page_fault", true, (iroutine_t) page_fault);
         write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
-        
+
         paging_on();
 }
@@ -85 +85 @@
         uintptr_t badvaddr;
         pf_access_t access;
-        
+
         badvaddr = read_cr2();
-                
+
         if (istate->error_word & PFERR_CODE_RSVD)
                 panic("Reserved bit set in page directory.");
-        
+
         if (istate->error_word & PFERR_CODE_RW)
                 access = PF_ACCESS_WRITE;
         else
                 access = PF_ACCESS_READ;
-        
+
         (void) as_page_fault(badvaddr, access, istate);
 }