Changeset f6b5593 in mainline for kernel/arch/ia64/src/mm/page.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/page.c (modified) (5 diffs)

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

@@ -63 +63 @@
 void set_environment(void)
 {
-        region_register rr;
-        pta_register pta;
+        region_register_t rr;
+        pta_register_t pta;
         int i;
 #ifdef CONFIG_VHPT
@@ -131 +131 @@
 vhpt_entry_t *vhpt_hash(uintptr_t page, asid_t asid)
 {
-        region_register rr_save, rr;
+        region_register_t rr_save, rr;
         size_t vrn;
         rid_t rid;
@@ -176 +176 @@
 bool vhpt_compare(uintptr_t page, asid_t asid, vhpt_entry_t *v)
 {
-        region_register rr_save, rr;    
+        region_register_t rr_save, rr;
         size_t vrn;
         rid_t rid;
@@ -223 +223 @@
     int flags)
 {
-        region_register rr_save, rr;    
+        region_register_t rr_save, rr;
         size_t vrn;
         rid_t rid;
@@ -257 +257 @@
         v->present.ma = (flags & PAGE_CACHEABLE) ?
             MA_WRITEBACK : MA_UNCACHEABLE;
-        v->present.a = false;   /* not accessed */
-        v->present.d = false;   /* not dirty */
+        v->present.a = false;  /* not accessed */
+        v->present.d = false;  /* not dirty */
         v->present.pl = (flags & PAGE_USER) ? PL_USER : PL_KERNEL;
         v->present.ar = (flags & PAGE_WRITE) ? AR_WRITE : AR_READ;
         v->present.ar |= (flags & PAGE_EXEC) ? AR_EXECUTE : 0; 
         v->present.ppn = frame >> PPN_SHIFT;
-        v->present.ed = false;  /* exception not deffered */
+        v->present.ed = false;  /* exception not deffered */
         v->present.ps = PAGE_WIDTH;
         v->present.key = 0;