Changeset 53ad43c in mainline for kernel/arch/amd64/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/amd64/include/arch/mm/page.h (modified) (4 diffs)

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

@@ -44 +44 @@
 #ifdef MEMORY_MODEL_kernel
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffffffff80000000))
 #define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffffffff80000000))
 
-#else /* __ASM__ */
+#else /* __ASSEMBLER__ */
 
 #define KA2PA(x)  ((x) - 0xffffffff80000000)
 #define PA2KA(x)  ((x) + 0xffffffff80000000)
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif /* MEMORY_MODEL_kernel */
@@ -60 +60 @@
 #ifdef MEMORY_MODEL_large
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
 #define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
 
-#else /* __ASM__ */
+#else /* __ASSEMBLER__ */
 
 #define KA2PA(x)  ((x) - 0xffff800000000000)
 #define PA2KA(x)  ((x) + 0xffff800000000000)
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif /* MEMORY_MODEL_large */
@@ -162 +162 @@
         ((p)->no_execute == 0)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <mm/mm.h>
@@ -255 +255 @@
 extern void page_fault(unsigned int, istate_t *);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif