Changeset 9d47440 in mainline for kernel/generic/include/mm

Timestamp:

2011-05-21T16:23:17Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ff03f3

Parents:

8d308b9 (diff), 13f2461 (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/generic/include/mm

Files:

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

kernel/generic/include/mm/as.h

@@ -84 +84 @@
 #define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
 
-#define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#ifdef USTACK_ADDRESS_ARCH
+        #define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#else
+        #define USTACK_ADDRESS  (USER_ADDRESS_SPACE_END - (STACK_SIZE - 1))
+#endif
 
 /** Kernel address space. */

kernel/generic/include/mm/frame.h

@@ -44 +44 @@
 #include <arch/mm/page.h>
 #include <arch/mm/frame.h>
-
-#define ONE_FRAME    0
-#define TWO_FRAMES   1
-#define FOUR_FRAMES  2
-
-
-#ifdef ARCH_STACK_FRAMES
-        #define STACK_FRAMES  ARCH_STACK_FRAMES
-#else
-        #define STACK_FRAMES  ONE_FRAME
-#endif
 
 /** Maximum number of zones in the system. */

kernel/generic/include/mm/page.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <mm/as.h>
-#include <memstr.h>
+#include <arch/mm/page.h>
+
+#define P2SZ(pages) \
+        ((pages) << PAGE_WIDTH) 
 
 /** Operations to manipulate page mappings. */