Changeset 0c2d9bb in mainline for kernel/arch/arm32/include/arch/mm/page_armv6.h

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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 mainline changes

File:

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

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

@@ -48 +48 @@
         (((pte_t *) (pte))->l0.descriptor_type != 0)
 #define PTE_GET_FRAME_ARCH(pte) \
-        (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH)
+        (((uintptr_t) ((pte_t *) (pte))->l1.frame_base_addr) << FRAME_WIDTH)
 #define PTE_WRITABLE_ARCH(pte) \
         (((pte_t *) (pte))->l1.access_permission_1 != PTE_AP1_RO)