Changeset 8f2153b in mainline for arch/ia32/include/mm/page.h

Timestamp:

2005-09-05T12:41:45Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

1b492b5

Parents:

2c55af3

Message:

Backported AMD64 linker and boot changes back to IA32.

File:

• arch/ia32/include/mm/page.h (modified) (3 diffs)

arch/ia32/include/mm/page.h

@@ -30 +30 @@
 #define __ia32_PAGE_H__
 
-#include <mm/page.h>
-#include <arch/types.h>
-#include <arch/mm/frame.h>
-#include <typedefs.h>
-
 #define PAGE_SIZE       FRAME_SIZE
 
-#define KA2PA(x)        (((__address) (x)) - 0x80000000)
-#define PA2KA(x)        (((__address) (x)) + 0x80000000)
+#ifndef __ASM__
+# define KA2PA(x)       (((__address) (x)) - 0x80000000)
+# define PA2KA(x)       (((__address) (x)) + 0x80000000)
+#else
+# define KA2PA(x)       ((x) - 0x80000000)
+# define PA2KA(x)       ((x) + 0x80000000)
+#endif
 
 /*
@@ -70 +70 @@
 #define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)        set_pt_flags((pte_t *)(ptl3), (index_t)(i), (x))
+
+#ifndef __ASM__
+
+#include <mm/page.h>
+#include <arch/types.h>
+#include <arch/mm/frame.h>
+#include <typedefs.h>
 
 struct page_specifier {
@@ -112 +119 @@
 extern void page_arch_init(void);
 
+#endif /* __ASM__ */
+
 #endif