xnu-3248.30.4.tar.gz

[apple/xnu.git] / osfmk / kern / hibernate.c

diff --git a/osfmk/kern/hibernate.c b/osfmk/kern/hibernate.c
index 8d0806589b0879f78954256436c6190c7b21288c..c15eb172e1714f263d3aac0b2577110b6df98b38 100644 (file)
--- a/osfmk/kern/hibernate.c
+++ b/osfmk/kern/hibernate.c
@@ -95,17 +95,16 @@ extern int sync_internal(void);
 
 kern_return_t 
 hibernate_setup(IOHibernateImageHeader * header,
 
 kern_return_t 
 hibernate_setup(IOHibernateImageHeader * header,

-                        uint32_t  free_page_ratio,
-                        uint32_t  free_page_time,

                         boolean_t vmflush,
                         boolean_t vmflush,

-                       hibernate_page_list_t * page_list,
+                       hibernate_page_list_t * page_list __unused,

                        hibernate_page_list_t * page_list_wired __unused,
                        hibernate_page_list_t * page_list_pal __unused)
 {
                        hibernate_page_list_t * page_list_wired __unused,
                        hibernate_page_list_t * page_list_pal __unused)
 {

-    uint32_t               gobble_count;

     kern_return_t      retval = KERN_SUCCESS;
 
     hibernate_create_paddr_map();
     kern_return_t      retval = KERN_SUCCESS;
 
     hibernate_create_paddr_map();

+
+    hibernate_reset_stats();

     
     if (vmflush && (COMPRESSED_PAGER_IS_ACTIVE || dp_isssd)) {
            
     
     if (vmflush && (COMPRESSED_PAGER_IS_ACTIVE || dp_isssd)) {
            


@@ -118,17 +117,10 @@ hibernate_setup(IOHibernateImageHeader * header,
            hibernate_flush_memory();
     }
 
            hibernate_flush_memory();
     }
 

-
-    // pages we could force out to reduce hibernate image size
-    gobble_count = (uint32_t)((((uint64_t) page_list->page_count) * ((uint64_t) free_page_ratio)) / 100);
-

     // no failures hereafter
 
     hibernate_processor_setup(header);
 
     // no failures hereafter
 
     hibernate_processor_setup(header);
 

-    if (gobble_count)
-           hibernate_gobble_pages(gobble_count, free_page_time);
-

     HIBLOG("hibernate_alloc_pages act %d, inact %d, anon %d, throt %d, spec %d, wire %d, wireinit %d\n",
            vm_page_active_count, vm_page_inactive_count, 
            vm_page_anonymous_count,  vm_page_throttled_count, vm_page_speculative_count,
     HIBLOG("hibernate_alloc_pages act %d, inact %d, anon %d, throt %d, spec %d, wire %d, wireinit %d\n",
            vm_page_active_count, vm_page_inactive_count, 
            vm_page_anonymous_count,  vm_page_throttled_count, vm_page_speculative_count,


@@ -164,4 +156,3 @@ hibernate_teardown(hibernate_page_list_t * page_list,
     }
     return (KERN_SUCCESS);
 }
     }
     return (KERN_SUCCESS);
 }

-