Changeset 2b95d13 in mainline for kernel/arch/arm32/include/arch/mm/page.h

Timestamp:

2013-03-12T21:07:15Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (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.h (moved) (moved from kernel/arch/arm32/include/mm/page.h ) (2 diffs)

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

@@ -46 +46 @@
 #define PAGE_SIZE       FRAME_SIZE
 
-#ifdef MACHINE_beagleboardxm
+#if (defined MACHINE_beagleboardxm) || (defined MACHINE_beaglebone)
 #ifndef __ASM__
 #       define KA2PA(x) ((uintptr_t) (x))
@@ -129 +129 @@
         set_pt_level1_present((pte_t *) (ptl3), (size_t) (i))
 
-#if defined(PROCESSOR_armv6) | defined(PROCESSOR_armv7_a)
+#if defined(PROCESSOR_ARCH_armv6) | defined(PROCESSOR_ARCH_armv7_a)
 #include "page_armv6.h"
-#elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
+#elif defined(PROCESSOR_ARCH_armv4) | defined(PROCESSOR_ARCH_armv5)
 #include "page_armv4.h"
 #else