From: Lamont Granquist <lamont@scriptkiddie.org>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] [2.4.20] dead code: remove /proc/sys/vm/kswapd
Date: Thu, 23 Jan 2003 16:41:20 -0800 (PST) [thread overview]
Message-ID: <20030123163816.G62371-100000@uswest-dsl-142-38.cortland.com> (raw)
In-Reply-To: <001901c2c30b$775263e0$0200a8c0@wsl3>
/proc/sys/vm/kswapd does nothing to affect kswapd behavior in 2.4.20, this
patch will remove it.
diff -urN linux-2.4.20/arch/arm/mm/init.c linux-2.4.20-modified/arch/arm/mm/init.c
--- linux-2.4.20/arch/arm/mm/init.c Thu Oct 11 09:04:57 2001
+++ linux-2.4.20-modified/arch/arm/mm/init.c Thu Jan 23 15:59:23 2003
@@ -18,7 +18,6 @@
#include <linux/mman.h>
#include <linux/mm.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/smp.h>
#include <linux/init.h>
#include <linux/bootmem.h>
diff -urN linux-2.4.20/arch/mips/mm/init.c linux-2.4.20-modified/arch/mips/mm/init.c
--- linux-2.4.20/arch/mips/mm/init.c Thu Nov 28 15:53:10 2002
+++ linux-2.4.20-modified/arch/mips/mm/init.c Thu Jan 23 15:58:59 2003
@@ -24,7 +24,6 @@
#include <linux/bootmem.h>
#include <linux/highmem.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/blk.h>
#include <asm/bootinfo.h>
diff -urN linux-2.4.20/arch/mips64/mm/init.c linux-2.4.20-modified/arch/mips64/mm/init.c
--- linux-2.4.20/arch/mips64/mm/init.c Thu Nov 28 15:53:10 2002
+++ linux-2.4.20-modified/arch/mips64/mm/init.c Thu Jan 23 15:59:32 2003
@@ -21,7 +21,6 @@
#include <linux/bootmem.h>
#include <linux/highmem.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#ifdef CONFIG_BLK_DEV_INITRD
#include <linux/blk.h>
#endif
diff -urN linux-2.4.20/arch/sparc/mm/init.c linux-2.4.20-modified/arch/sparc/mm/init.c
--- linux-2.4.20/arch/sparc/mm/init.c Thu Nov 28 15:53:12 2002
+++ linux-2.4.20-modified/arch/sparc/mm/init.c Thu Jan 23 15:58:48 2003
@@ -18,7 +18,6 @@
#include <linux/mman.h>
#include <linux/mm.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#ifdef CONFIG_BLK_DEV_INITRD
#include <linux/blk.h>
#endif
diff -urN linux-2.4.20/arch/sparc64/mm/init.c linux-2.4.20-modified/arch/sparc64/mm/init.c
--- linux-2.4.20/arch/sparc64/mm/init.c Thu Nov 28 15:53:12 2002
+++ linux-2.4.20-modified/arch/sparc64/mm/init.c Thu Jan 23 15:59:12 2003
@@ -15,7 +15,6 @@
#include <linux/slab.h>
#include <linux/blk.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/pagemap.h>
#include <linux/fs.h>
#include <linux/seq_file.h>
diff -urN linux-2.4.20/fs/buffer.c linux-2.4.20-modified/fs/buffer.c
--- linux-2.4.20/fs/buffer.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/fs/buffer.c Thu Jan 23 15:56:36 2003
@@ -35,7 +35,6 @@
#include <linux/locks.h>
#include <linux/errno.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/smp_lock.h>
#include <linux/vmalloc.h>
#include <linux/blkdev.h>
diff -urN linux-2.4.20/fs/coda/sysctl.c linux-2.4.20-modified/fs/coda/sysctl.c
--- linux-2.4.20/fs/coda/sysctl.c Fri Aug 2 17:39:45 2002
+++ linux-2.4.20-modified/fs/coda/sysctl.c Thu Jan 23 15:56:52 2003
@@ -15,7 +15,6 @@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/sysctl.h>
-#include <linux/swapctl.h>
#include <linux/proc_fs.h>
#include <linux/slab.h>
#include <linux/stat.h>
diff -urN linux-2.4.20/fs/inode.c linux-2.4.20-modified/fs/inode.c
--- linux-2.4.20/fs/inode.c Fri Aug 2 17:39:45 2002
+++ linux-2.4.20-modified/fs/inode.c Thu Jan 23 15:56:42 2003
@@ -14,7 +14,6 @@
#include <linux/slab.h>
#include <linux/cache.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/prefetch.h>
#include <linux/locks.h>
diff -urN linux-2.4.20/fs/intermezzo/sysctl.c linux-2.4.20-modified/fs/intermezzo/sysctl.c
--- linux-2.4.20/fs/intermezzo/sysctl.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/fs/intermezzo/sysctl.c Thu Jan 23 15:57:01 2003
@@ -27,7 +27,6 @@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/sysctl.h>
-#include <linux/swapctl.h>
#include <linux/proc_fs.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
diff -urN linux-2.4.20/include/linux/swapctl.h linux-2.4.20-modified/include/linux/swapctl.h
--- linux-2.4.20/include/linux/swapctl.h Mon Sep 17 16:15:02 2001
+++ linux-2.4.20-modified/include/linux/swapctl.h Wed Dec 31 16:00:00 1969
@@ -1,13 +0,0 @@
-#ifndef _LINUX_SWAPCTL_H
-#define _LINUX_SWAPCTL_H
-
-typedef struct pager_daemon_v1
-{
- unsigned int tries_base;
- unsigned int tries_min;
- unsigned int swap_cluster;
-} pager_daemon_v1;
-typedef pager_daemon_v1 pager_daemon_t;
-extern pager_daemon_t pager_daemon;
-
-#endif /* _LINUX_SWAPCTL_H */
diff -urN linux-2.4.20/include/linux/sysctl.h linux-2.4.20-modified/include/linux/sysctl.h
--- linux-2.4.20/include/linux/sysctl.h Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/include/linux/sysctl.h Thu Jan 23 15:53:21 2003
@@ -137,7 +137,6 @@
VM_OVERCOMMIT_MEMORY=5, /* Turn off the virtual memory safety limit */
VM_BUFFERMEM=6, /* struct: Set buffer memory thresholds */
VM_PAGECACHE=7, /* struct: Set cache memory thresholds */
- VM_PAGERDAEMON=8, /* struct: Control kswapd behaviour */
VM_PGT_CACHE=9, /* struct: Set page table cache parameters */
VM_PAGE_CLUSTER=10, /* int: set number of pages to swap together */
VM_MAX_MAP_COUNT=11, /* int: Maximum number of active map areas */
diff -urN linux-2.4.20/kernel/sysctl.c linux-2.4.20-modified/kernel/sysctl.c
--- linux-2.4.20/kernel/sysctl.c Fri Aug 2 17:39:46 2002
+++ linux-2.4.20-modified/kernel/sysctl.c Thu Jan 23 15:57:14 2003
@@ -21,7 +21,6 @@
#include <linux/config.h>
#include <linux/slab.h>
#include <linux/sysctl.h>
-#include <linux/swapctl.h>
#include <linux/proc_fs.h>
#include <linux/ctype.h>
#include <linux/utsname.h>
@@ -265,8 +264,6 @@
&bdflush_min, &bdflush_max},
{VM_OVERCOMMIT_MEMORY, "overcommit_memory", &sysctl_overcommit_memory,
sizeof(sysctl_overcommit_memory), 0644, NULL, &proc_dointvec},
- {VM_PAGERDAEMON, "kswapd",
- &pager_daemon, sizeof(pager_daemon_t), 0644, NULL, &proc_dointvec},
{VM_PGT_CACHE, "pagetable_cache",
&pgt_cache_water, 2*sizeof(int), 0644, NULL, &proc_dointvec},
{VM_PAGE_CLUSTER, "page-cluster",
diff -urN linux-2.4.20/mm/bootmem.c linux-2.4.20-modified/mm/bootmem.c
--- linux-2.4.20/mm/bootmem.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/bootmem.c Thu Jan 23 15:58:27 2003
@@ -12,7 +12,6 @@
#include <linux/mm.h>
#include <linux/kernel_stat.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/bootmem.h>
diff -urN linux-2.4.20/mm/filemap.c linux-2.4.20-modified/mm/filemap.c
--- linux-2.4.20/mm/filemap.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/filemap.c Thu Jan 23 15:58:21 2003
@@ -19,7 +19,6 @@
#include <linux/smp_lock.h>
#include <linux/blkdev.h>
#include <linux/file.h>
-#include <linux/swapctl.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/iobuf.h>
diff -urN linux-2.4.20/mm/memory.c linux-2.4.20-modified/mm/memory.c
--- linux-2.4.20/mm/memory.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/memory.c Thu Jan 23 15:58:14 2003
@@ -40,7 +40,6 @@
#include <linux/mman.h>
#include <linux/swap.h>
#include <linux/smp_lock.h>
-#include <linux/swapctl.h>
#include <linux/iobuf.h>
#include <linux/highmem.h>
#include <linux/pagemap.h>
diff -urN linux-2.4.20/mm/mmap.c linux-2.4.20-modified/mm/mmap.c
--- linux-2.4.20/mm/mmap.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/mmap.c Thu Jan 23 15:58:05 2003
@@ -8,7 +8,6 @@
#include <linux/mman.h>
#include <linux/pagemap.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/smp_lock.h>
#include <linux/init.h>
#include <linux/file.h>
diff -urN linux-2.4.20/mm/oom_kill.c linux-2.4.20-modified/mm/oom_kill.c
--- linux-2.4.20/mm/oom_kill.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/oom_kill.c Thu Jan 23 15:58:00 2003
@@ -18,7 +18,6 @@
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/timex.h>
/* #define DEBUG */
diff -urN linux-2.4.20/mm/page_alloc.c linux-2.4.20-modified/mm/page_alloc.c
--- linux-2.4.20/mm/page_alloc.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/page_alloc.c Thu Jan 23 15:57:54 2003
@@ -15,7 +15,6 @@
#include <linux/config.h>
#include <linux/mm.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/interrupt.h>
#include <linux/pagemap.h>
#include <linux/bootmem.h>
diff -urN linux-2.4.20/mm/page_io.c linux-2.4.20-modified/mm/page_io.c
--- linux-2.4.20/mm/page_io.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/page_io.c Thu Jan 23 15:57:47 2003
@@ -14,7 +14,6 @@
#include <linux/kernel_stat.h>
#include <linux/swap.h>
#include <linux/locks.h>
-#include <linux/swapctl.h>
#include <asm/pgtable.h>
diff -urN linux-2.4.20/mm/swap.c linux-2.4.20-modified/mm/swap.c
--- linux-2.4.20/mm/swap.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/swap.c Thu Jan 23 15:57:40 2003
@@ -16,7 +16,6 @@
#include <linux/mm.h>
#include <linux/kernel_stat.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/pagemap.h>
#include <linux/init.h>
@@ -26,12 +25,6 @@
/* How many pages do we try to swap or page in/out together? */
int page_cluster;
-
-pager_daemon_t pager_daemon = {
- 512, /* base number for calculating the number of tries */
- SWAP_CLUSTER_MAX, /* minimum number of tries */
- 8, /* do swap I/O in clusters of this size */
-};
/*
* Move an inactive page to the active list.
diff -urN linux-2.4.20/mm/swap_state.c linux-2.4.20-modified/mm/swap_state.c
--- linux-2.4.20/mm/swap_state.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/swap_state.c Thu Jan 23 15:57:32 2003
@@ -10,7 +10,6 @@
#include <linux/mm.h>
#include <linux/kernel_stat.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/init.h>
#include <linux/pagemap.h>
#include <linux/smp_lock.h>
diff -urN linux-2.4.20/mm/swapfile.c linux-2.4.20-modified/mm/swapfile.c
--- linux-2.4.20/mm/swapfile.c Fri Aug 2 17:39:46 2002
+++ linux-2.4.20-modified/mm/swapfile.c Thu Jan 23 15:58:32 2003
@@ -9,7 +9,6 @@
#include <linux/smp_lock.h>
#include <linux/kernel_stat.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/blkdev.h> /* for blk_size */
#include <linux/vmalloc.h>
#include <linux/pagemap.h>
diff -urN linux-2.4.20/mm/vmscan.c linux-2.4.20-modified/mm/vmscan.c
--- linux-2.4.20/mm/vmscan.c Thu Nov 28 15:53:15 2002
+++ linux-2.4.20-modified/mm/vmscan.c Thu Jan 23 15:57:23 2003
@@ -17,7 +17,6 @@
#include <linux/slab.h>
#include <linux/kernel_stat.h>
#include <linux/swap.h>
-#include <linux/swapctl.h>
#include <linux/smp_lock.h>
#include <linux/pagemap.h>
#include <linux/init.h>
next prev parent reply other threads:[~2003-01-24 0:32 UTC|newest]
Thread overview: 129+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-01-05 8:02 Nvidia and its choice to read the GPL "differently" Albert D. Cahalan
2003-01-06 17:13 ` Richard Stallman
2003-01-06 17:37 ` Larry McVoy
2003-01-06 19:40 ` Steven Barnhart
2003-01-06 23:33 ` Matthias Andree
2003-01-07 15:47 ` Disconnect
2003-01-07 13:40 ` Richard Stallman
2003-01-07 14:26 ` Larry McVoy
2003-01-08 8:00 ` Richard Stallman
2003-01-08 13:51 ` Larry McVoy
2003-01-09 23:14 ` Richard Stallman
2003-01-09 23:24 ` Larry McVoy
2003-01-11 0:21 ` Richard Stallman
2003-01-10 5:33 ` Oliver Xymoron
2003-01-10 6:07 ` Andre Hedrick
2003-01-10 6:31 ` Miles Bader
2003-01-10 14:17 ` Charles Cazabon
2003-01-11 1:36 ` Rob Wilkens
2003-01-11 4:06 ` John Jasen
2003-01-11 7:13 ` Andre Hedrick
2003-01-08 21:29 ` Matthias Andree
2003-01-09 2:26 ` Vlad@Vlad.geekizoid.com
2003-01-09 8:57 ` John Alvord
2003-01-09 15:18 ` What's in a name? Vlad@Vlad.geekizoid.com
2003-01-09 16:11 ` Richard B. Johnson
2003-01-09 16:51 ` venom
2003-01-09 17:48 ` Jesse Pollard
2003-01-10 9:52 ` Nvidia and its choice to read the GPL "differently" Richard Stallman
2003-01-10 16:05 ` Valdis.Kletnieks
2003-01-10 18:38 ` Names as origin component paths Mark Mielke
2003-01-10 18:41 ` Nvidia and its choice to read the GPL "differently" Rogier Wolff
2003-01-12 11:55 ` Richard Stallman
2003-01-12 12:27 ` Mark Mielke
2003-01-13 14:32 ` Richard B. Johnson
2003-01-13 17:09 ` Jesse Pollard
2003-01-13 17:22 ` Richard B. Johnson
2003-01-13 17:37 ` Jesse Pollard
2003-01-13 18:48 ` Richard B. Johnson
2003-01-14 18:55 ` Richard Stallman
2003-01-14 19:06 ` Larry McVoy
2003-01-14 19:56 ` [OFFTOPIC] RMS and reactions to him Dax Kelson
2003-01-14 20:02 ` Larry McVoy
2003-01-14 20:19 ` Olivier Galibert
2003-01-14 20:36 ` Richard B. Johnson
2003-01-14 20:45 ` Larry McVoy
2003-01-15 23:28 ` Richard Stallman
2003-01-14 21:08 ` Mark Mielke
2003-01-14 21:51 ` Chris Funderburg
2003-01-14 22:13 ` Henning P. Schmiedehausen
2003-01-14 22:27 ` Wakko Warner
2003-01-15 16:39 ` Horst von Brand
2003-01-16 23:12 ` Adrian Bunk
2003-01-15 23:28 ` Richard Stallman
2003-01-16 2:51 ` Nicolas Pitre
2003-01-18 0:47 ` Richard Stallman
2003-01-18 0:56 ` Larry McVoy
2003-01-19 1:36 ` Richard Stallman
2003-01-19 5:55 ` Matthew D. Pitts
2003-01-18 3:01 ` Nicolas Pitre
2003-01-18 14:23 ` andrea.glorioso
2003-01-20 0:50 ` Richard Stallman
2003-01-20 1:46 ` Nicolas Pitre
2003-01-21 18:17 ` Richard Stallman
2003-01-21 18:30 ` Larry McVoy
2003-01-21 18:55 ` Nicolas Pitre
2003-07-20 2:42 ` Leandro Guimarães Faria Corsetti Dutra
2003-07-20 19:30 ` Brian McGroarty
2003-07-20 22:00 ` Leandro Guimarães Faria Corsetti Dutra
2003-01-16 5:23 ` Steve Lee
2003-01-18 0:47 ` Richard Stallman
2003-01-20 13:38 ` Horst von Brand
2003-01-22 9:59 ` Richard Stallman
2003-01-22 10:19 ` Paulo Andre'
2003-01-22 11:05 ` Jamie Lokier
2003-01-22 12:56 ` Dave Jones
2003-01-22 16:21 ` Mark Mielke
2003-01-23 11:37 ` Richard Stallman
2003-01-23 13:17 ` Murray J. Root
2003-01-23 18:15 ` Vlad@Vlad.geekizoid.com
2003-01-24 0:41 ` Lamont Granquist [this message]
2003-07-20 2:27 ` Leandro Guimarães Faria Corsetti Dutra
2003-07-20 8:09 ` Florian Weimer
2003-07-20 8:49 ` Leandro Guimarães Faria Corsetti Dutra
2003-07-20 10:55 ` Wichert Akkerman
2003-07-20 21:52 ` Leandro Guimarães Faria Corsetti Dutra
2003-07-20 22:09 ` Wichert Akkerman
2003-07-20 22:38 ` David Lloyd
2003-01-22 16:44 ` John Alvord
2003-01-23 1:31 ` Nick Matteo
2003-01-20 16:52 ` Jerry Cooperstein
2003-01-22 17:14 ` Jan Harkes
2003-01-14 20:27 ` Abramo Bagnara
2003-01-14 21:51 ` Andre Hedrick
2003-01-15 8:42 ` Abramo Bagnara
2003-01-14 21:42 ` Andre Hedrick
2003-01-15 12:47 ` Gaël Le Mignot
2003-01-14 20:15 ` Abramo Bagnara
2003-01-14 21:32 ` Nvidia and its choice to read the GPL "differently" Andre Hedrick
2003-01-15 12:44 ` Gaël Le Mignot
2003-01-14 22:20 ` Tomasz Kłoczko
2003-01-13 17:51 ` Mark Mielke
2003-01-14 18:54 ` Richard Stallman
2003-01-09 23:14 ` Richard Stallman
2003-01-09 23:39 ` Larry McVoy
2003-01-10 0:01 ` Linux/Hurd vs GNU/Linux (was Re: Nvidia and its choice to read the GPL "differently") Vlad@Vlad.geekizoid.com
2003-01-07 16:18 ` Nvidia and its choice to read the GPL "differently" Dimitrie O. Paun
2003-01-08 2:29 ` Miles Bader
2003-01-09 7:20 ` "Mother" == "computer-illiterate" Val Henson
2003-01-09 8:05 ` J Sloan
2003-01-09 13:14 ` Miles Bader
2003-01-09 14:35 ` Kent Borg
2003-01-09 19:40 ` Val Henson
2003-01-09 20:21 ` jlnance
2003-01-09 20:30 ` Valdis.Kletnieks
2003-01-10 1:34 ` Andrew McGregor
2003-01-09 20:46 ` Randy.Dunlap
2003-01-09 21:12 ` Valdis.Kletnieks
2003-01-09 21:11 ` Randy.Dunlap
2003-01-12 11:56 ` Kristian Koehntopp
2003-01-09 23:11 ` Alan Cox
2003-01-09 22:41 ` John Adams
2003-01-10 1:24 ` Chris Adams
2003-01-10 2:15 ` jdow
2003-01-10 3:20 ` Val Henson
2003-01-10 4:23 ` Tom Diehl
2003-01-10 10:35 ` Henning P. Schmiedehausen
2003-01-10 7:04 ` Tim Timmerman
2003-01-09 7:28 ` Nvidia and its choice to read the GPL "differently" Richard Stallman
2003-01-09 6:44 ` Dimitrie O. Paun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030123163816.G62371-100000@uswest-dsl-142-38.cortland.com \
--to=lamont@scriptkiddie.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).