Changeset 53ad43c in mainline for kernel/arch/arm32/include/arch/mm/page.h

Timestamp:

2018-03-08T18:54:30Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

5ef16903

Parents:

e0a4686

Message:

Replace ASM macro with the standard ASSEMBLER.

At least, GCC claims it to be a standard predefined macro. I was unable
to find the relevant standard, but it's defined in both gcc and clang.

File:

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

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

@@ -48 +48 @@
 
 #if (defined MACHINE_beagleboardxm) || (defined MACHINE_beaglebone)
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #       define KA2PA(x) ((uintptr_t) (x))
 #       define PA2KA(x) ((uintptr_t) (x))
@@ -56 +56 @@
 #endif
 #else
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #       define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
 #       define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)