Changeset f56e897f in mainline for kernel/generic/src/mm

Timestamp:

2010-06-29T17:43:38Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6473d41

Parents:

e4a4b44 (diff), 793cf029 (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.

Message:

Merge mainlnie changes.

Location:

kernel/generic/src/mm

Files:

• frame.c (modified) (2 diffs)
• tlb.c (modified) (4 diffs)

kernel/generic/src/mm/frame.c

@@ -1234 +1234 @@
 {
 #ifdef __32_BITS__
-        printf("[nr] [base addr ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
+        printf("[nr] [base addr] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
 
 #ifdef __64_BITS__
-        printf("[nr] [base address      ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
+        printf("[nr] [base address    ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
         
@@ -1274 +1274 @@
                 
 #ifdef __32_BITS__
-                printf("   %10p", base);
+                printf("  %10p", base);
 #endif
                 
 #ifdef __64_BITS__
-                printf("   %18p", base);
+                printf(" %18p", base);
 #endif
                 

kernel/generic/src/mm/tlb.c

@@ -73 +73 @@
  * to all other processors.
  *
- * @param type          Type describing scope of shootdown.
- * @param asid          Address space, if required by type.
- * @param page          Virtual page address, if required by type.
- * @param count         Number of pages, if required by type.
+ * @param type  Type describing scope of shootdown.
+ * @param asid  Address space, if required by type.
+ * @param page  Virtual page address, if required by type.
+ * @param count Number of pages, if required by type.
  *
  * @return The interrupt priority level as it existed prior to this call.
+ *
  */
 ipl_t tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid,
     uintptr_t page, size_t count)
 {
-        ipl_t ipl;
-
-        ipl = interrupts_disable();
+        ipl_t ipl = interrupts_disable();
         CPU->tlb_active = false;
         irq_spinlock_lock(&tlblock, false);
@@ -91 +90 @@
         size_t i;
         for (i = 0; i < config.cpu_count; i++) {
-                cpu_t *cpu;
-                
                 if (i == CPU->id)
                         continue;
                 
-                cpu = &cpus[i];
+                cpu_t *cpu = &cpus[i];
+                
                 irq_spinlock_lock(&cpu->lock, false);
                 if (cpu->tlb_messages_count == TLB_MESSAGE_QUEUE_LEN) {
@@ -124 +122 @@
         
 busy_wait:
-        for (i = 0; i < config.cpu_count; i++)
+        for (i = 0; i < config.cpu_count; i++) {
                 if (cpus[i].tlb_active)
                         goto busy_wait;
-
+        }
+        
         return ipl;
 }
@@ -133 +132 @@
 /** Finish TLB shootdown sequence.
  *
- * @param ipl           Previous interrupt priority level.
+ * @param ipl Previous interrupt priority level.
+ *
  */
 void tlb_shootdown_finalize(ipl_t ipl)