Changeset 5fceec7 in mainline

Timestamp:

2006-03-17T00:40:01Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

9f52563

Parents:

93165be

Message:

Cleanup of amd64 code.

Location:

arch/amd64

Files:

• include/mm/page.h (modified) (1 diff)
• src/mm/page.c (modified) (2 diffs)

arch/amd64/include/mm/page.h

@@ -62 +62 @@
                 return x - 0xffff800000000000;
 }
-/* Linker symbol */
-extern int ktext_start;
-extern int kdata_end;
-static inline __address pa2ka(__address x)
-{
-        if (x >= ka2pa((__address)(&kdata_end)) || \
-            x <= ka2pa((__address)&ktext_start))
-                return x + 0xffff800000000000;
-        else 
-                return x + 0xffffffff80000000;
-}
 # define KA2PA(x)      ka2pa((__address)x)
-# define PA2KA(x)      pa2ka((__address)x)
-# define PA2KA_IDENT(x)      (((__address) (x)) + 0xffff800000000000)
 # define PA2KA_CODE(x)      (((__address) (x)) + 0xffffffff80000000)
+# define PA2KA(x)      (((__address) (x)) + 0xffff800000000000)
 #else
 # define KA2PA(x)      ((x) - 0xffffffff80000000)
 # define PA2KA(x)      ((x) + 0xffffffff80000000)
-# define PA2KA_DATA(x)      ((x) + 0xffff800000000000)
 #endif
 

arch/amd64/src/mm/page.c

@@ -86 +86 @@
                 for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
                         /* Standard identity mapping */
-                        page_mapping_insert(AS_KERNEL, PA2KA_IDENT(cur), cur, identity_flags);
+                        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, identity_flags);
                 }
                 /* Upper kernel mapping
@@ -129 +129 @@
 
                 SET_FRAME_FLAGS_ARCH(aptl_3, PTL3_INDEX_ARCH(oldpage), PAGE_NOT_PRESENT);
-                if (aptl_3 == helper_ptl3)
+                if (KA2PA(aptl_3) == KA2PA(helper_ptl3))
                         SET_PTL3_FLAGS_ARCH(aptl_2, PTL2_INDEX_ARCH(oldpage), PAGE_NOT_PRESENT);
-                if (aptl_2 == helper_ptl2)
+                if (KA2PA(aptl_2) == KA2PA(helper_ptl2))
                         SET_PTL2_FLAGS_ARCH(aptl_1, PTL1_INDEX_ARCH(oldpage), PAGE_NOT_PRESENT);
-                if (aptl_1 == helper_ptl1)
+                if (KA2PA(aptl_1) == KA2PA(helper_ptl1))
                         SET_PTL1_FLAGS_ARCH(&ptl_0, PTL0_INDEX_ARCH(oldpage), PAGE_NOT_PRESENT);
         }