Changes in kernel/arch/arm32/include/mm/page.h [28a6190:5d9e36b] in mainline

File:

• kernel/arch/arm32/include/mm/page.h (modified) (2 diffs)

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

@@ -46 +46 @@
 #define PAGE_SIZE       FRAME_SIZE
 
-#if (defined MACHINE_beagleboardxm) || (defined MACHINE_beaglebone)
+#ifdef MACHINE_beagleboardxm
 #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