o Merge with Linux 2.1.100.

 o Cleanup the machine dependencies of floppy and rtc.  The driver for
   the Dallas thingy in the Indy is still missing.
 o Handle allocation of zero'd pages correct for R4000SC / R4400SC.
 o Page colouring shit to match the virtual and physical colour of all
   mapped pages.  This tends to produce extreme fragmentation problems,
   so it's deactivated for now.  Users of R4000SC / R4400SC may re-enable
   the code in arch/mips/mm/init.c by removing the definition of
   CONF_GIVE_A_SHIT_ABOUT_COLOURS.  Should get them somewhat further -
   but don't shake to hard ...
 o Fixed ptrace(2)-ing of syscalls, strace is now working again.
 o Fix the interrupt forwarding from the keyboard driver to the psaux
   driver, PS/2 mice are now working on the Indy.  The fix is somewhat
   broken as it prevents generic kernels for Indy and machines which handle
   things different.
 o Things I can't remember.

1 files changed, 8 insertions, 2 deletions

diff --git a/mm/swap.c b/mm/swap.c
index 957ad0a95..c760208da 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -44,8 +44,8 @@
  */
 freepages_t freepages = {
 	48,	/* freepages.min */
-	72,	/* freepages.low */
-	96	/* freepages.high */
+	96,	/* freepages.low */
+	144	/* freepages.high */
 };
 
 /* We track the number of pages currently being asynchronously swapped
@@ -77,3 +77,9 @@ buffer_mem_t page_cache = {
 	30,	/* borrow percent page cache */
 	75	/* maximum */
 };
+
+pager_daemon_t pager_daemon = {
+	512,	/* base number for calculating the number of tries */
+	SWAP_CLUSTER_MAX,	/* minimum number of tries */
+	SWAP_CLUSTER_MAX,	/* do swap I/O in clusters of this size */
+};