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

Timestamp:

2014-01-19T14:37:22Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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

@@ -278 +278 @@
         }
         
+#if defined(PROCESSOR_ARCH_armv6)
+        /* FIXME: this disables caches */
+        p->shareable = 1;
+#else
         /* Shareable is ignored for devices (non-cacheable),
          * turn it off for normal memory. */
         p->shareable = 0;
+#endif
         
         p->non_global = !(flags & PAGE_GLOBAL);