Changeset 371bd7d in mainline for kernel/arch/ia32/include/mm

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/ia32/include/mm

Files:

• asid.h (modified) (1 diff)
• frame.h (modified) (1 diff)
• page.h (modified) (1 diff)

kernel/arch/ia32/include/mm/asid.h

@@ -43 +43 @@
 #define KERN_ia32_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef int32_t asid_t;

kernel/arch/ia32/include/mm/frame.h

@@ -42 +42 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uintptr_t last_frame;

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

@@ -127 +127 @@
 #include <mm/mm.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
 #include <typedefs.h>