Changeset f56e897f in mainline for kernel/arch/amd64/include/mm/as.h

Timestamp:

2010-06-29T17:43:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6473d41

Parents:

e4a4b44 (diff), 793cf029 (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 mainlnie changes.

File:

• kernel/arch/amd64/include/mm/as.h (modified) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup amd64mm 
+/** @addtogroup amd64mm
  * @{
  */
@@ -36 +36 @@
 #define KERN_amd64_AS_H_
 
-#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      0
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH         (unsigned long) 0xffff800000000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH           (unsigned long) 0xffffffff80000000
-#define USER_ADDRESS_SPACE_START_ARCH           (unsigned long) 0x0000000000000000
-#define USER_ADDRESS_SPACE_END_ARCH             (unsigned long) 0x00007fffffffffff
+#define KERNEL_ADDRESS_SPACE_START_ARCH  (unsigned long) 0xffff800000000000
+#define KERNEL_ADDRESS_SPACE_END_ARCH    (unsigned long) 0xffffffffffffffff
 
-#define USTACK_ADDRESS_ARCH     (USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
+#define USER_ADDRESS_SPACE_START_ARCH    (unsigned long) 0x0000000000000000
+#define USER_ADDRESS_SPACE_END_ARCH      (unsigned long) 0x00007fffffffffff
 
-#define as_constructor_arch(as, flags)          (as != as)
-#define as_destructor_arch(as)                  (as != as)
-#define as_create_arch(as, flags)               (as != as)
+#define USTACK_ADDRESS_ARCH  (USER_ADDRESS_SPACE_END_ARCH - (PAGE_SIZE - 1))
+
+#define as_constructor_arch(as, flags)  (as != as)
+#define as_destructor_arch(as)          (as != as)
+#define as_create_arch(as, flags)       (as != as)
+
 #define as_install_arch(as)
 #define as_deinstall_arch(as)