Import 2.0.37

diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle
index 3f4f09f3957901a72157823bd56146f60c968362..1690b69dd32d0f45702f25cb863aa1a00d4ef2a9 100644 (file)
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
@@ -8,7 +8,7 @@ able to maintain, and I'd prefer it for most other things too.  Please
 at least consider the points made here. 
 
 First off, I'd suggest printing out a copy of the GNU coding standards,
-and NOT read it.  Burn them, it's a great symbolic gesture. 
+and NOT reading it.  Burn them, it's a great symbolic gesture. 
 
 Anyway, here goes:
 
@@ -59,7 +59,8 @@ opening brace at the beginning of the next line, thus:
 Heretic people all over the world have claimed that this inconsistency
 is ...  well ...  inconsistent, but all right-thinking people know that
 (a) K&R are _right_ and (b) K&R are right.  Besides, functions are
-special anyway (you can't nest them in C). 
+special anyway (you can't nest them in C (well, you can in gcc, actually,
+but this is horribly nonstandard, so we will ignore it)). 
 
 Note that the closing brace is empty on a line of its own, _except_ in
 the cases where it is followed by a continuation of the same statement,

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 88e8f7df55920fb7503e7d6cdf5bf86a43c9a529..8a98910f0f5c82b406a0bf154ef7d10646dd1fc5 100644 (file)
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -58,6 +58,29 @@ CONFIG_EXPERIMENTAL
   you say Y here, you will be offered the choice of using features or
   drivers that are currently considered to be in the alpha-test phase.
 
+Symmetric Multi Processing
+CONFIG_SMP
+  This enables support for systems with more than one CPU.  If you have a
+  system with only one CPU, like most personal computers, say N.  If you
+  have a system with more than one CPU, say Y.
+
+  A non-SMP kernel will run on any machine, but will use only one CPU of
+  a multi-CPU machine.  An SMP kernel will run on many, but not all,
+  single-CPU machines.  On a single-CPU machine, a non-SMP kernel
+  will run faster than an SMP kernel.
+
+  People using multiprocessor machines should also say Y to "Enhanced
+  Real Time Clock Support", below.  The "Advanced Power Management"
+  code will be disabled in an SMP kernel.
+
+  If you don't know what to do here, say N.
+  
+  See also: Documentation/SMP.txt, Documentation/smp.tex,
+  Documentation/smp.txt, and Documentation/IO-APIC.txt.  Also see the
+  SMP-FAQ on the WWW at http://www.irisa.fr/prive/mentre/smp-faq/ (to
+  browse the WWW, you need to have access to a machine on the Internet
+  that has a program like lynx or netscape).
+  
 Kernel math emulation
 CONFIG_MATH_EMULATION
   Linux can emulate a math coprocessor (used for floating point
@@ -1007,6 +1030,7 @@ CONFIG_M386
   the other hand, if you use a compiler before gcc 2.7 (say "gcc -v"
   to find out), then you have to say "386" or "486" here even if
   running on a Pentium or PPro machine.
+
   If you don't know what to do, say "386".
 
 Compile the kernel into the ELF object format

diff --git a/Documentation/modules.txt b/Documentation/modules.txt
index 9fb147ecce7c81ec76bfaf980023131fda7101a8..3b57122e7adcae3f8e6a0ed72f3cfbf92109eae2 100644 (file)
--- a/Documentation/modules.txt
+++ b/Documentation/modules.txt
@@ -22,7 +22,7 @@ file linux/README.  It generally goes like:
        make config
        make dep
        make clean
-       make zImage or make zlilo
+       make zImage or make bzImage or make zlilo
 
 In "make config", you select what you want to include in the "resident"
 kernel and what features you want to have available as loadable modules.

diff --git a/Documentation/networking/net-modules.txt b/Documentation/networking/net-modules.txt
index 372c22ceca8a9586e157a40ee6efba02a30ddab1..13b2f735f4e8ae47a6a725e6379e2739e59ee894 100644 (file)
--- a/Documentation/networking/net-modules.txt
+++ b/Documentation/networking/net-modules.txt
@@ -15,7 +15,7 @@ Wed 2-Aug-95  <matti.aarnio@utu.fi>
        the less user needs to know, the better.  (There are things that
        driver developer can use, others should not confuse themselves.)
 
-       In many cases it is highly preferred that insmod:ing is done
+       In many cases it is highly preferred that insmoding is done
        ONLY with defining an explicit address for the card, AND BY
        NOT USING AUTO-PROBING!
 

diff --git a/Makefile b/Makefile
index 94d174739b101f3ebb88030bf3956324328cdb4d..9d0963147027b02a524896b01119e1a046be3e9f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -360,6 +360,14 @@ dep-files: scripts/mkdep archdep include/linux/version.h
        set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i fastdep; done
        mv .tmpdepend .depend
 
+# Prepare source tree for RCS version control using Emacs VC;
+# make all needed RCS directories and write-lock nearly everything.
+vc:
+       chmod a-w COPYING CREDITS MAINTAINERS Makefile README Rules.make  
+       find . -type d ! -name "*RCS" -exec mkdir {}/RCS \;
+       find . -type f \( -name *.[chS] -o -name "*Makefile" -o -name "*README*" -o -name "*Config.in" -o -name "*.txt" \) -exec chmod a-w {} \;
+       find Documentation scripts -type f -exec chmod a-w {} \;
+
 MODVERFILE :=
 
 ifdef CONFIG_MODVERSIONS

diff --git a/README b/README
index e33ff6cda7cb8fb6ee01fc0fade88582f49aac65..32f0851daef5750d9e6ba74703094685b57e96b2 100644 (file)
--- a/README
+++ b/README
@@ -47,7 +47,12 @@ INSTALLING the kernel:
                gzip -cd linux-2.0.XX.tar.gz | tar xfv -
 
    to get it all put in place. Replace "XX" with the version number of the
-   latest kernel.
+   latest kernel. If you use GNU tar, 
+
+               cd /usr/src
+               tar -xzvf linux-2.1.XX.tar.gz
+
+   is equivalent.
 
  - You can also upgrade between 2.0.xx releases by patching.  Each
    patch that is released for 2.0.xx contains only bugfixes.  No