Changeset 0e78394 in mainline for kernel/arch/sparc64/src/mm/sun4u/tlb.c

Timestamp:

2011-12-11T17:32:19Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

464a52f

Parents:

1f5714e

Message:

sparc64: Make sure to use AS_KERNEL when handling kernel non-identity.

File:

• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (5 diffs)

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -247 +247 @@
         size_t index;
         pte_t *t;
+        as_t *as = AS;
 
         page_8k = (uint64_t) tag.vpn << MMU_PAGE_WIDTH;
@@ -258 +259 @@
                             "Dereferencing NULL pointer.");
                 } else if (page_8k >= end_of_identity) {
-                        /* Kernel non-identity, fall through. */
+                        /* Kernel non-identity. */
+                        as = AS_KERNEL;
                 } else {
                         do_fast_data_access_mmu_miss_fault(istate, tag,
@@ -265 +267 @@
         }
 
-        t = page_mapping_find(AS, page_16k, true);
+        t = page_mapping_find(as, page_16k, true);
         if (t) {
                 /*
@@ -280 +282 @@
                  * Forward the page fault to the address space page fault
                  * handler.
-                 */             
+                 */
                 if (as_page_fault(page_16k, PF_ACCESS_READ, istate) ==
                     AS_PF_FAULT) {
@@ -302 +304 @@
         size_t index;
         pte_t *t;
+        as_t *as = AS;
 
         page_16k = ALIGN_DOWN((uint64_t) tag.vpn << MMU_PAGE_WIDTH, PAGE_SIZE);
         index = tag.vpn % MMU_PAGES_PER_PAGE;   /* 16K-page emulation */
 
-        t = page_mapping_find(AS, page_16k, true);
+        if (tag.context == ASID_KERNEL)
+                as = AS_KERNEL;
+
+        t = page_mapping_find(as, page_16k, true);
         if (t && PTE_WRITABLE(t)) {
                 /*