Changeset 2c2d54a in mainline for kernel/arch/arm32/include/arch/mm/page_armv4.h

Timestamp:

2016-09-02T17:58:05Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c3602c4

Parents:

4bf0926e (diff), 3233adb (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:

Merge from lp:~jakub/helenos/pager

File:

• kernel/arch/arm32/include/arch/mm/page_armv4.h (modified) (1 diff)

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

@@ -44 +44 @@
 /* Macros for querying the last-level PTE entries. */
 #define PTE_VALID_ARCH(pte) \
-        (*((uint32_t *) (pte)) != 0)
+        (((pte_t *) (pte))->l0.should_be_zero != 0 || PTE_PRESENT_ARCH(pte))
 #define PTE_PRESENT_ARCH(pte) \
         (((pte_t *) (pte))->l0.descriptor_type != 0)