Changeset 802898f in mainline for kernel/arch/arm32/include/arch/mm/page_armv4.h

Timestamp:

2013-09-02T20:14:11Z (11 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

8c95dff

Parents:

0435fe41 (diff), 61ab4a9 (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:

mainline update

File:

• kernel/arch/arm32/include/arch/mm/page_armv4.h (modified) (3 diffs)

kernel/arch/arm32/include/arch/mm/page_armv4.h

@@ -120 +120 @@
 #define PTE_DESCRIPTOR_SMALL_PAGE       2
 
-
-/** Sets the address of level 0 page table.
- *
- * @param pt Pointer to the page table to set.
- *
- */
-NO_TRACE static inline void set_ptl0_addr(pte_t *pt)
-{
-        asm volatile (
-                "mcr p15, 0, %[pt], c2, c0, 0\n"
-                :: [pt] "r" (pt)
-        );
-}
-
+#define pt_coherence_m(pt, count) \
+do { \
+        for (unsigned i = 0; i < count; ++i) \
+                DCCMVAU_write((uintptr_t)(pt + i)); \
+        read_barrier(); \
+} while (0)
 
 /** Returns level 0 page table entry flags.
@@ -223 +215 @@
         
         /* default access permission */
-        p->access_permission_0 = p->access_permission_1 = 
+        p->access_permission_0 = p->access_permission_1 =
             p->access_permission_2 = p->access_permission_3 =
             PTE_AP_USER_NO_KERNEL_RW;
@@ -229 +221 @@
         if (flags & PAGE_USER)  {
                 if (flags & PAGE_READ) {
-                        p->access_permission_0 = p->access_permission_1 = 
-                            p->access_permission_2 = p->access_permission_3 = 
+                        p->access_permission_0 = p->access_permission_1 =
+                            p->access_permission_2 = p->access_permission_3 =
                             PTE_AP_USER_RO_KERNEL_RW;
                 }
                 if (flags & PAGE_WRITE) {
-                        p->access_permission_0 = p->access_permission_1 = 
-                            p->access_permission_2 = p->access_permission_3 = 
-                            PTE_AP_USER_RW_KERNEL_RW; 
+                        p->access_permission_0 = p->access_permission_1 =
+                            p->access_permission_2 = p->access_permission_3 =
+                            PTE_AP_USER_RW_KERNEL_RW;
                 }
         }