xnu-1228.tar.gz

[apple/xnu.git] / osfmk / mach / i386 / vm_param.h

diff --git a/osfmk/mach/i386/vm_param.h b/osfmk/mach/i386/vm_param.h
index b7d6931ab7ffce5fe6cc05698137c93da2bac4fe..f16790f1ba27104482acfff947394db87d0f43ba 100644 (file)
--- a/osfmk/mach/i386/vm_param.h
+++ b/osfmk/mach/i386/vm_param.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -139,7 +139,6 @@
 #define VM_MAX_USER_PAGE_ADDRESS ((user_addr_t)0x00007FFFFFFFF000ULL)
 
 
-
 /* system-wide values */
 #define MACH_VM_MIN_ADDRESS            ((mach_vm_offset_t) 0)
 #define MACH_VM_MAX_ADDRESS            ((mach_vm_offset_t) VM_MAX_PAGE_ADDRESS)
@@ -150,8 +149,6 @@
 #define VM_MAX_ADDRESS         ((vm_offset_t) 0xFFE00000)
 
 
-
-
 #ifdef KERNEL_PRIVATE 
 
 /* Kernel-wide values */
@@ -164,7 +161,7 @@
  * We can't let VM allocate memory from there.
  */
 
-#define VM_MAX_KERNEL_ADDRESS  ((vm_offset_t) 0xFE7FFFFF)
+#define VM_MAX_KERNEL_ADDRESS  ((vm_offset_t) 0xFE7FFFFFU)
 #define KERNEL_STACK_SIZE              (I386_PGBYTES*4)
 
 #define VM_MAP_MIN_ADDRESS     MACH_VM_MIN_ADDRESS
@@ -185,7 +182,7 @@
 #define VM_MIN_KERNEL_LOADED_ADDRESS   ((vm_offset_t) 0x00000000U)
 #define VM_MAX_KERNEL_LOADED_ADDRESS   ((vm_offset_t) 0x1fffffffU)
 
-#define NCOPY_WINDOWS  4
+#define NCOPY_WINDOWS 4
 
 /*
  *     Conversion between 80386 pages and VM pages
@@ -199,8 +196,7 @@
        MACRO_BEGIN                                     \
        pmap_t __pmap = (pmap);                         \
        vm_page_t __page = (page);                      \
-       vm_prot_t __prot__ =                            \
-               (protection) & ~(page)->page_lock;      \
+       vm_prot_t __prot__ =  (protection);             \
                                                        \
        if (__pmap == kernel_pmap) {                    \
                __prot__ |= VM_PROT_WRITE;              \