Changeset f6b5593 in mainline for kernel/arch/ia64/src/mm/vhpt.c

Timestamp:

2009-09-21T11:53:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4098e38

Parents:

2f636b6 (diff), c1618ed (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 mainline changes.

File:

• kernel/arch/ia64/src/mm/vhpt.c (modified) (4 diffs)

kernel/arch/ia64/src/mm/vhpt.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ia64mm  
+/** @addtogroup ia64mm
  * @{
  */
@@ -44 +44 @@
         vhpt_base = frame_alloc(VHPT_WIDTH - FRAME_WIDTH,
             FRAME_KA | FRAME_ATOMIC);
-        if (!vhpt_base) 
+        if (!vhpt_base)
                 panic("Kernel configured with VHPT but no memory for table.");
         vhpt_invalidate_all();
@@ -53 +53 @@
 void vhpt_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry)
 {
-        region_register rr_save, rr;
+        region_register_t rr_save, rr;
         size_t vrn;
         rid_t rid;
         uint64_t tag;
-
+        
         vhpt_entry_t *ventry;
-
-
+        
         vrn = va >> VRN_SHIFT;
         rid = ASID2RID(asid, vrn);
-                                                                                                                                                                                                                                
+        
         rr_save.word = rr_read(vrn);
         rr.word = rr_save.word;
@@ -75 +74 @@
         srlz_i();
         srlz_d();
-
+        
         ventry->word[0] = entry.word[0];
         ventry->word[1] = entry.word[1];