Changeset df29f24 in mainline for kernel/arch/mips32/include/mm/as.h

Timestamp:

2011-06-01T09:04:08Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

• kernel/arch/mips32/include/mm/as.h (modified) (1 diff)

kernel/arch/mips32/include/mm/as.h

@@ -38 +38 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH         (unsigned long) 0x80000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH           (unsigned long) 0x9fffffff
-#define USER_ADDRESS_SPACE_START_ARCH           (unsigned long) 0x00000000
-#define USER_ADDRESS_SPACE_END_ARCH             (unsigned long) 0x7fffffff
-
-#define USTACK_ADDRESS_ARCH     (0x80000000 - PAGE_SIZE)
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT32_C(0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT32_C(0x9fffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT32_C(0x7fffffff)
 
 typedef struct {