o Merge with Linux 2.1.99.

 o Fix ancient bug in the ELF loader making ldd crash.
 o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.

3 files changed, 23 insertions, 43 deletions

diff --git a/Documentation/sysctl/README b/Documentation/sysctl/README
index 02100863a..be6a09704 100644
--- a/Documentation/sysctl/README
+++ b/Documentation/sysctl/README
@@ -1,6 +1,6 @@
 
 Documentation for /proc/sys/*/*		version 0.1
-	(c) 1998, Rik van Riel <H.H.vanRiel@fys.ruu.nl>
+	(c) 1998, Rik van Riel <H.H.vanRiel@phys.uu.nl>
 
 'Why', I hear you ask, 'would anyone even _want_ documentation
 for them sysctl files? If anybody really needs it, it's all in
@@ -32,7 +32,7 @@ it. Not only to have a great laugh, but also to make sure that
 you're the last RTFMing person to screw up.
 
 In short, e-mail your suggestions, corrections and / or horror
-stories to: <H.H.vanRiel@fys.ruu.nl>
+stories to: <H.H.vanRiel@phys.uu.nl>
 
 Rik van Riel.
 
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index baf3f0700..b935b4ca9 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -1,6 +1,6 @@
 
 Documentation for /proc/sys/kernel/*	version 0.1
-	(c) 1998, Rik van Riel <H.H.vanRiel@fys.ruu.nl>
+	(c) 1998, Rik van Riel <H.H.vanRiel@phys.uu.nl>
 
 For general info and legal blurb, please look in README.
 
@@ -25,7 +25,6 @@ Currently, these files are in /proc/sys/kernel:
 - inode-max
 - inode-nr
 - inode-state
-- kmod_unload_delay           ==> Documentation/kmod.txt
 - modprobe                    ==> Documentation/kmod.txt
 - osrelease
 - ostype
@@ -44,7 +43,7 @@ When the value in this file is 0, ctrl-alt-del is trapped and
 sent to the init(1) program to handle a graceful restart.
 When, however, the value is > 0, Linux's reaction to a Vulcan
 Nerve Pinch (tm) will be an immediate reboot, without even
-syncing it's dirty buffers.
+syncing its dirty buffers.
 
 Note: when a program (like dosemu) has the keyboard in 'raw'
 mode, the ctrl-alt-del is intercepted by the program before it
@@ -69,7 +68,7 @@ struct {
 Dentries are dynamically allocated and deallocated, and
 nr_dentry seems to be 0 all the time. Hence it's safe to
 assume that only nr_unused, age_limit and want_pages are
-used. Nr_unused seems to be exactly what it's name says.
+used. Nr_unused seems to be exactly what its name says.
 Age_limit is the age in seconds after which dcache entries
 can be reclaimed when memory is short and want_pages is
 nonzero when shrink_dcache_pages() has been called and the
@@ -102,7 +101,7 @@ The three values in file-nr denote the number of allocated
 file handles, the number of used file handles and the maximum
 number of file handles. When the allocated filehandles come
 close to the maximum, but the number of actually used ones is
-far behind, you've encountered a peek in your filehandle usage
+far behind, you've encountered a peak in your filehandle usage
 and you don't need to increase the maximum.
 
 ==============================================================
@@ -113,7 +112,7 @@ As with filehandles, the kernel allocates the inode structures
 dynamically, but can't free them yet...
 
 The value in inode-max denotes the maximum number of inode
-handlers. This value should be 3-4 times larger as the value
+handlers. This value should be 3-4 times larger than the value
 in file-max, since stdin, stdout and network sockets also
 need an inode struct to handle them. When you regularly run
 out of inodes, you need to increase this value.
@@ -127,7 +126,7 @@ nr_free_inodes and preshrink.
 
 Nr_inodes stands for the number of inodes the system has
 allocated, this can be slightly more than inode-max because
-Linux allocates them one pagefull at a time.
+Linux allocates them one pageful at a time.
 
 Nr_free_inodes represents the number of free inodes (?) and
 preshrink is nonzero when the nr_inodes > inode-max and the
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index f2ef26fff..774da3d5f 100644
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -1,6 +1,6 @@
 
 Documentation for /proc/sys/vm/*	version 0.1
-	(c) 1998, Rik van Riel <H.H.vanRiel@fys.ruu.nl>
+	(c) 1998, Rik van Riel <H.H.vanRiel@phys.uu.nl>
 
 For general info and legal blurb, please look in README.
 
@@ -62,7 +62,7 @@ of the buffer still have to be written to disk (as opposed
 to a clean buffer, which can just be forgotten about).
 Setting this to a high value means that Linux can delay disk
 writes for a long time, but it also means that it will have
-to do a lot I/O at once when memory becomes short. A low
+to do a lot of I/O at once when memory becomes short. A low
 value will spread out disk I/O more evenly.
 
 The second parameter (ndirty) gives the maximum number of
@@ -94,7 +94,8 @@ buffermem:
 
 The three values in this file correspond to the values in
 the struct buffer_mem. It controls how much memory should
-be used for buffer memory.
+be used for buffer memory. The percentage is calculated
+as a percentage of total system memory.
 
 The values are:
 min_percent	-- this is the minumum percentage of memory
@@ -111,29 +112,9 @@ freepages:
 This file contains the values in the struct freepages. That
 struct contains three members: min, low and high.
 
-These numbers are used by the VM subsystem to keep a reasonable
-number of pages on the free page list, so that programs can
-allocate new pages without having to wait for the system to
-free used pages first. The actual freeing of pages is done
-by kswapd, a kernel daemon.
-
-min  -- when the number of free pages reaches this
-        level, only the kernel can allocate memory
-        for _critical_ tasks only
-low  -- when the number of free pages drops below
-        this level, kswapd is woken up immediately
-high -- this is kswapd's target, when more than <high>
-        pages are free, kswapd will stop swapping.
-
-When the number of free pages is between low and high,
-and kswapd hasn't run for swapout_interval jiffies, then
-kswapd is woken up too. See swapout_interval for more info.
-
-When free memory is always low on your system, and kswapd has
-trouble keeping up with allocations, you might want to
-increase these values, especially high and perhaps low.
-I've found that a 1:2:4 relation for these values tend to work
-rather well in a heavily loaded system.
+These variables are currently unused (?), but they're
+very likely to be abused for something else in the near
+future, so don't yet remove it from the source...
 
 ==============================================================
 
@@ -209,23 +190,23 @@ typedef struct swap_control_v5
 } swap_control_v5;
 --------------------------------------------------------------
 
-The first four variables are used to keep track of Linux'
+The first four variables are used to keep track of Linux's
 page aging. Page aging is a bookkeeping method to keep track
 of which pages of memory are used often, and which pages can
 be swapped out without consequences.
 
 When a page is swapped in, it starts at sc_page_initial_age
-(default 3) and when the page is scanned by kswapd, it's age
+(default 3) and when the page is scanned by kswapd, its age
 is adjusted according to the following scheme:
-- if the page was used since the last time we scanned, it's
-  age is increased sc_page_advance (default 3) up to a maximum
+- if the page was used since the last time we scanned, its
+  age is increased by sc_page_advance (default 3) up to a maximum
   of sc_max_page_age (default 20)
-- else (it wasn't used) it's age is decreased sc_page_decline
+- else (it wasn't used) its age is decreased by sc_page_decline
   (default 1)
 And when a page reaches age 0, it's ready to be swapped out.
 
 The next four variables can be used to control kswapd's
-agressiveness in swapping out pages.
+aggressiveness in swapping out pages.
 
 sc_age_cluster_fract is used to calculate how many pages from
 a process are to be scanned by kswapd. The formula used is
@@ -236,10 +217,10 @@ represented by sc_age_cluster_min, this is done so kswapd will
 also scan small processes.
 
 The values of sc_pageout_weight and sc_bufferout_weight are
-used to control the how many tries kswapd will do in order
+used to control how many tries kswapd will make in order
 to swapout one page / buffer. These values can be used to
 finetune the ratio between user pages and buffer/cache memory.
-When you find that your Linux system is swapping out too much
+When you find that your Linux system is swapping out too many
 process pages in order to satisfy buffer memory demands, you
 might want to either increase sc_bufferout_weight, or decrease
 the value of sc_pageout_weight.