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

kernel/arch/amd64/include/arch/pm.h

@@ -36 +36 @@
 #define KERN_amd64_PM_H_
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
         #include <typedefs.h>
         #include <arch/context.h>
@@ -88 +88 @@
 #define IO_PORTS  (64 * 1024)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 typedef struct {
@@ -180 +180 @@
 extern void tss_initialize(tss_t *t);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif