Changeset 8fc0d455 in mainline for arch/amd64/include/mm

Timestamp:

2005-08-30T17:50:07Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

9c0a9b3

Parents:

b45aa23

Message:

Code cleanup.

Location:

arch/amd64/include/mm

Files:

• frame.h (modified) (1 diff)
• page.h (modified) (2 diffs)
• ptl.h (modified) (1 diff)

arch/amd64/include/mm/frame.h

@@ -32 +32 @@
 #define FRAME_SIZE              4096
 
+#ifndef __ASM__
 extern void frame_arch_init(void);
+#endif
 
 #endif

arch/amd64/include/mm/page.h

@@ -30 +30 @@
 #define __amd64_PAGE_H__
 
-#include <mm/page.h>
-#include <arch/mm/frame.h>
-#include <arch/types.h>
-#include <arch/mm/ptl.h>
+#ifndef __ASM__
+#  include <mm/page.h>
+#  include <arch/mm/frame.h>
+#  include <arch/types.h>
+#endif
 
 #define PAGE_SIZE       FRAME_SIZE
+
+#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
 
 #define PTL0_INDEX_ARCH(vaddr)          0
@@ -65 +74 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)
 
+#ifndef __ASM__
 extern void page_arch_init(void);
 
-typedef __u32 pte_t;
+typedef __u64 pte_t;
+#endif
 
 #endif

arch/amd64/include/mm/ptl.h

@@ -40 +40 @@
 #define PTL_2MB_PAGE      (1<<7)
 
-#define KA2PA(x)        (((__address) (x)) + 0x80000000)
-#define PA2KA(x)        (((__address) (x)) - 0x80000000)
-
 
 #endif