diff options
| author | J. Bruce Fields | 2009-10-27 23:45:17 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2009-10-27 23:45:17 +0100 |
| commit | e343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch) | |
| tree | 92586df0daf3298262a957640e5c86679c963f41 /mm/ksm.c | |
| parent | nfsd41: use sv_max_mesg for forechannel max sizes (diff) | |
| parent | Linux 2.6.32-rc5 (diff) | |
| download | kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.gz kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.xz kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.zip | |
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'mm/ksm.c')
| -rw-r--r-- | mm/ksm.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -184,11 +184,6 @@ static DEFINE_SPINLOCK(ksm_mmlist_lock); sizeof(struct __struct), __alignof__(struct __struct),\ (__flags), NULL) -static void __init ksm_init_max_kernel_pages(void) -{ - ksm_max_kernel_pages = nr_free_buffer_pages() / 4; -} - static int __init ksm_slab_init(void) { rmap_item_cache = KSM_KMEM_CACHE(rmap_item, 0); @@ -1673,7 +1668,7 @@ static int __init ksm_init(void) struct task_struct *ksm_thread; int err; - ksm_init_max_kernel_pages(); + ksm_max_kernel_pages = totalram_pages / 4; err = ksm_slab_init(); if (err) @@ -1697,6 +1692,9 @@ static int __init ksm_init(void) kthread_stop(ksm_thread); goto out_free2; } +#else + ksm_run = KSM_RUN_MERGE; /* no way for user to start it */ + #endif /* CONFIG_SYSFS */ return 0; |