Changeset 804d9b6 in mainline

Timestamp:

2012-07-14T11:25:41Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

774c143

Parents:

97c7682

Message:

arm32: Make new present functions arch version specific.

Location:

kernel/arch/arm32/include/mm

Files:

• page.h (modified) (1 diff)
• page_armv4.h (modified) (1 diff)
• page_armv7.h (modified) (1 diff)

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

@@ -135 +135 @@
 #endif
 
-#ifndef __ASM__
-NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
-{
-        pte_level0_t *p = &pt[i].l0;
-
-        p->should_be_zero = 0;
-        write_barrier();
-        p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE;
-}
-
-
-NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
-{
-        pte_level1_t *p = &pt[i].l1;
-
-        p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
-}
-
-#endif /* __ASM__ */
-
 #endif
 

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

@@ -241 +241 @@
 }
 
+NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
+{
+        pte_level0_t *p = &pt[i].l0;
+
+        p->should_be_zero = 0;
+        write_barrier();
+        p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE;
+}
+
+
+NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
+{
+        pte_level1_t *p = &pt[i].l1;
+
+        p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
+}
+
 
 extern void page_arch_init(void);

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

@@ -258 +258 @@
 }
 
+NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
+{
+        pte_level0_t *p = &pt[i].l0;
+
+        p->should_be_zero_0 = 0;
+        p->should_be_zero_1 = 0;
+        write_barrier();
+        p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE;
+}
+
+NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
+{
+        pte_level1_t *p = &pt[i].l1;
+
+        p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
+}
+
 
 extern void page_arch_init(void);