X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/316670eb35587141e969394ae8537d66b9211e80..c7d2c2c6ee645e10cbccdd01c6191873ec77239d:/osfmk/kern/stack.c?ds=sidebyside

diff --git a/osfmk/kern/stack.c b/osfmk/kern/stack.c
index 9906b8b3a..400cedcf9 100644
--- a/osfmk/kern/stack.c
+++ b/osfmk/kern/stack.c
@@ -75,10 +75,10 @@ static unsigned int		stack_new_count;						/* total new stack allocations */
 
 static vm_offset_t		stack_addr_mask;
 
-unsigned int			kernel_stack_pages = KERNEL_STACK_SIZE / PAGE_SIZE;
-vm_offset_t			kernel_stack_size = KERNEL_STACK_SIZE;
-vm_offset_t			kernel_stack_mask = -KERNEL_STACK_SIZE;
-vm_offset_t			kernel_stack_depth_max = 0;
+unsigned int			kernel_stack_pages;
+vm_offset_t			kernel_stack_size;
+vm_offset_t			kernel_stack_mask;
+vm_offset_t			kernel_stack_depth_max;
 
 static inline void
 STACK_ZINFO_PALLOC(thread_t thread)
@@ -158,6 +158,11 @@ stack_init(void)
 {
 	simple_lock_init(&stack_lock_data, 0);
 	
+	kernel_stack_pages = KERNEL_STACK_SIZE / PAGE_SIZE;
+	kernel_stack_size = KERNEL_STACK_SIZE;
+	kernel_stack_mask = -KERNEL_STACK_SIZE;
+	kernel_stack_depth_max = 0;
+
 	if (PE_parse_boot_argn("kernel_stack_pages",
 			       &kernel_stack_pages,
 			       sizeof (kernel_stack_pages))) {
@@ -217,7 +222,8 @@ stack_alloc_internal(void)
 		if (kernel_memory_allocate(kernel_map, &stack,
 					   kernel_stack_size + (2*PAGE_SIZE),
 					   stack_addr_mask,
-					   KMA_KSTACK | KMA_KOBJECT | guard_flags)
+					   KMA_KSTACK | KMA_KOBJECT | guard_flags,
+					   VM_KERN_MEMORY_STACK)
 		    != KERN_SUCCESS)
 			panic("stack_alloc: kernel_memory_allocate");
 
@@ -386,7 +392,9 @@ stack_collect(void)
 			 * back in stack_alloc().
 			 */
 
-			stack = (vm_offset_t)vm_map_trunc_page(stack);
+			stack = (vm_offset_t)vm_map_trunc_page(
+				stack,
+				VM_MAP_PAGE_MASK(kernel_map));
 			stack -= PAGE_SIZE;
 			if (vm_map_remove(
 				    kernel_map,
@@ -551,9 +559,9 @@ processor_set_stack_usage(
 
 	/* OK, have memory and list is locked */
 	thread_list = (thread_t *) addr;
-	for (i = 0, thread = (thread_t) queue_first(&threads);
+	for (i = 0, thread = (thread_t)(void *) queue_first(&threads);
 					!queue_end(&threads, (queue_entry_t) thread);
-					thread = (thread_t) queue_next(&thread->threads)) {
+					thread = (thread_t)(void *) queue_next(&thread->threads)) {
 		thread_reference_internal(thread);
 		thread_list[i++] = thread;
 	}