Changeset dad5951 in mainline

Timestamp:

2007-01-29T17:28:20Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3802fcd

Parents:

8be8cfa

Message:

avoid conflict with potential keyword

Location:

kernel/generic

Files:

• include/mm/as.h (modified) (1 diff)
• src/mm/as.c (modified) (4 diffs)

kernel/generic/include/mm/as.h

@@ -147 +147 @@
 extern as_t *as_create(int flags);
 extern void as_destroy(as_t *as);
-extern void as_switch(as_t *old, as_t *new);
+extern void as_switch(as_t *old, as_t *replace);
 extern int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate);
 

kernel/generic/src/mm/as.c

@@ -864 +864 @@
  * @param new New address space.
  */
-void as_switch(as_t *old, as_t *new)
+void as_switch(as_t *old, as_t *replace)
 {
         ipl_t ipl;
@@ -901 +901 @@
          * Second, prepare the new address space.
          */
-        mutex_lock_active(&new->lock);
-        if ((new->cpu_refcount++ == 0) && (new != AS_KERNEL)) {
-                if (new->asid != ASID_INVALID) {
-                        list_remove(&new->inactive_as_with_asid_link);
+        mutex_lock_active(&replace->lock);
+        if ((replace->cpu_refcount++ == 0) && (replace != AS_KERNEL)) {
+                if (replace->asid != ASID_INVALID) {
+                        list_remove(&replace->inactive_as_with_asid_link);
                 } else {
                         /*
-                         * Defer call to asid_get() until new->lock is released.
+                         * Defer call to asid_get() until replace->lock is released.
                          */
                         needs_asid = true;
                 }
         }
-        SET_PTL0_ADDRESS(new->page_table);
-        mutex_unlock(&new->lock);
+        SET_PTL0_ADDRESS(replace->page_table);
+        mutex_unlock(&replace->lock);
 
         if (needs_asid) {
@@ -923 +923 @@
                 
                 asid = asid_get();
-                mutex_lock_active(&new->lock);
-                new->asid = asid;
-                mutex_unlock(&new->lock);
+                mutex_lock_active(&replace->lock);
+                replace->asid = asid;
+                mutex_unlock(&replace->lock);
         }
         spinlock_unlock(&inactive_as_with_asid_lock);
@@ -934 +934 @@
          * (e.g. write ASID to hardware register etc.)
          */
-        as_install_arch(new);
-        
-        AS = new;
+        as_install_arch(replace);
+        
+        AS = replace;
 }