Changeset 97c7682 in mainline for kernel/arch/arm32/include/mm/page_armv4.h

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

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

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

@@ -215 +215 @@
         pte_level1_t *p = &pt[i].l1;
         
-        if (flags & PAGE_NOT_PRESENT) {
+        if (flags & PAGE_NOT_PRESENT)
                 p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT;
-                p->access_permission_3 = 1;
-        } else {
+        else
                 p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
-                p->access_permission_3 = p->access_permission_0;
-        }
         
         p->cacheable = p->bufferable = (flags & PAGE_CACHEABLE) != 0;