diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-10-13 09:28:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-10-13 09:28:42 -0700 |
| commit | a6805352ac064bcdca2b90aaa78efe6df2243b47 (patch) | |
| tree | 4c385f016c82c0d19d451e4b1547caab7f258027 /kernel | |
| parent | f10972bec12a21510c21371ef66270844a164964 (diff) | |
| parent | 71660e156c8516c75e63d40d9f6c19af82340071 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/ksyms.c | 16 | ||||
| -rw-r--r-- | kernel/sysctl.c | 7 |
2 files changed, 7 insertions, 16 deletions
diff --git a/kernel/ksyms.c b/kernel/ksyms.c index 9beb67e2a999..4b3e40b10a76 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -33,7 +33,6 @@ #include <linux/swap.h> #include <linux/ctype.h> #include <linux/file.h> -#include <linux/iobuf.h> #include <linux/console.h> #include <linux/poll.h> #include <linux/mmzone.h> @@ -103,6 +102,8 @@ EXPORT_SYMBOL(kmem_cache_shrink); EXPORT_SYMBOL(kmem_cache_alloc); EXPORT_SYMBOL(kmem_cache_free); EXPORT_SYMBOL(kmem_cache_size); +EXPORT_SYMBOL(set_shrinker); +EXPORT_SYMBOL(remove_shrinker); EXPORT_SYMBOL(kmalloc); EXPORT_SYMBOL(kfree); EXPORT_SYMBOL(vfree); @@ -246,7 +247,6 @@ EXPORT_SYMBOL(dput); EXPORT_SYMBOL(have_submounts); EXPORT_SYMBOL(d_find_alias); EXPORT_SYMBOL(d_prune_aliases); -EXPORT_SYMBOL(prune_dcache); EXPORT_SYMBOL(shrink_dcache_sb); EXPORT_SYMBOL(shrink_dcache_parent); EXPORT_SYMBOL(shrink_dcache_anon); @@ -438,18 +438,6 @@ EXPORT_SYMBOL(__br_write_lock); EXPORT_SYMBOL(__br_write_unlock); #endif -/* Kiobufs */ -EXPORT_SYMBOL(alloc_kiovec); -EXPORT_SYMBOL(free_kiovec); -EXPORT_SYMBOL(expand_kiobuf); - -EXPORT_SYMBOL(map_user_kiobuf); -EXPORT_SYMBOL(unmap_kiobuf); -EXPORT_SYMBOL(lock_kiovec); -EXPORT_SYMBOL(unlock_kiovec); -EXPORT_SYMBOL(brw_kiovec); -EXPORT_SYMBOL(kiobuf_wait_for_io); - #ifdef HAVE_DISABLE_HLT EXPORT_SYMBOL(disable_hlt); EXPORT_SYMBOL(enable_hlt); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 53d13c96fbf2..0317dd749b2b 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -286,8 +286,8 @@ static ctl_table vm_table[] = { &dirty_background_ratio, sizeof(dirty_background_ratio), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec, NULL, &zero, &one_hundred }, - {VM_DIRTY_ASYNC, "dirty_async_ratio", &dirty_async_ratio, - sizeof(dirty_async_ratio), 0644, NULL, &proc_dointvec_minmax, + {VM_DIRTY_RATIO, "dirty_ratio", &vm_dirty_ratio, + sizeof(vm_dirty_ratio), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec, NULL, &zero, &one_hundred }, {VM_DIRTY_WB_CS, "dirty_writeback_centisecs", &dirty_writeback_centisecs, sizeof(dirty_writeback_centisecs), 0644, @@ -311,6 +311,9 @@ static ctl_table vm_table[] = { { VM_NR_PDFLUSH_THREADS, "nr_pdflush_threads", &nr_pdflush_threads, sizeof nr_pdflush_threads, 0444 /* read-only*/, NULL, &proc_dointvec}, + {VM_SWAPPINESS, "swappiness", &vm_swappiness, sizeof(vm_swappiness), + 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec, NULL, &zero, + &one_hundred }, #ifdef CONFIG_HUGETLB_PAGE {VM_HUGETLB_PAGES, "nr_hugepages", &htlbpage_max, sizeof(int), 0644, NULL, &proc_dointvec}, |