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.

4 files changed, 53 insertions, 23 deletions

diff --git a/Documentation/powerpc/00-INDEX b/Documentation/powerpc/00-INDEX
index 9e553e6c8..6cd33d720 100644
--- a/Documentation/powerpc/00-INDEX
+++ b/Documentation/powerpc/00-INDEX
@@ -1,5 +1,5 @@
 Index of files in Documentation/powerpc.  If you think something about
-Linux/PPC needs an entry here, needs correction of you've written one
+Linux/PPC needs an entry here, needs correction or you've written one
 please mail me.
                                         Cort Dougan (cort@cs.nmt.edu)
 
diff --git a/Documentation/powerpc/ppc_htab.txt b/Documentation/powerpc/ppc_htab.txt
index fab9f3aae..28555686d 100644
--- a/Documentation/powerpc/ppc_htab.txt
+++ b/Documentation/powerpc/ppc_htab.txt
@@ -4,6 +4,8 @@
 This document and the related code was written by me (Cort Dougan), please
 email me (cort@cs.nmt.edu) if you have questions, comments or corrections.
 
+Last Change: 2.16.98
+
 This entry in the proc directory is readable by all users but only
 writable by root.
 
diff --git a/Documentation/powerpc/smp.txt b/Documentation/powerpc/smp.txt
index 932170f74..d65dfae19 100644
--- a/Documentation/powerpc/smp.txt
+++ b/Documentation/powerpc/smp.txt
@@ -1,8 +1,11 @@
                  Information about Linux/PPC SMP mode
 =====================================================================
 
-This document and the related code was written by me (Cort Dougan), please
-email me (cort@cs.nmt.edu) if you have questions, comments or corrections.
+This document and the related code was written by me
+(Cort Dougan, cort@cs.nmt.edu) please email me if you have questions,
+comments or corrections.
+
+Last Change: 4.1.98
 
 SMP support for Linux/PPC is still in its early stages and likely to
 be buggy for a while.  If you want to help by writing code or testing
@@ -10,11 +13,17 @@ different hardware please email me!
 
 1. State of Supported Hardware
 
-  UMAX s900
+  PowerSurge Architecture - UMAX s900, Apple 9500/9600/8500/8600/7500/7600
     The second processor on this machine boots up just fine and
     enters its idle loop.  Hopefully a completely working SMP kernel
     on this machine will be done shortly.
 
+    The code makes the assumption of only two processors.  The changes
+    necessary to work with any number would not be overly difficult but
+    I don't have any machines with >2 processors so it's not high on my
+    list of priorities.  If anyone else would like do to the work email
+    me and I can point out the places that need changed.
+
   BeBox
     BeBox support hasn't been added to the 2.1.X kernels from 2.0.X
     but work is being done and SMP support for BeBox is in the works.
diff --git a/Documentation/powerpc/sound.txt b/Documentation/powerpc/sound.txt
index c0acf6a7b..8f4a44034 100644
--- a/Documentation/powerpc/sound.txt
+++ b/Documentation/powerpc/sound.txt
@@ -4,26 +4,31 @@
 Please mail me me (Cort Dougan, cort@cs.nmt.edu) if you have questions,
 comments or corrections.
 
-This just covers sound on the PReP systems for now, and later will
-contain information on the PowerMac's.
+Last Change: 3.24.98
 
-Sound has been tested and is working with the PowerStack and IBM Power
-Series onboard sound systems which are based on the cs4231(2) chip.
-The sound options when doing the make config are a bit different from the
-default, though.
+This just covers sound on the PReP and CHRP systems for now and later
+will contain information on the PowerMac's.
+
+Sound on PReP has been tested and is working with the PowerStack and IBM
+Power Series onboard sound systems which are based on the cs4231(2) chip.
+The sound options when doing the make config are a bit different from
+the default, though.
 
 The I/O base, irq and dma lines that you enter during the make config
 are ignored and are set when booting according to the machine type.
 This is so that one binary can be used for Motorola and IBM machines
-which use different values and isn't allowed by the driver, so things are
-hacked together in such a way as to allow this information to be set
-automatically on boot.
+which use different values and isn't allowed by the driver, so things
+are hacked together in such a way as to allow this information to be
+set automatically on boot.
+
+1. Motorola PowerStack PReP machines
 
-1. PowerStack
+  Enable support for "Crystal CS4232 based (PnP) cards" and for the
+  Microsoft Sound System.  The MSS isn't used, but some of the routines
+  that the CS4232 driver uses are in it.
 
-  Enable support for "Crystal CS4232 based (PnP) cards".  Although the
-  options you set are ignored and determined automatically on boot these
-  are included for information only:
+  Although the options you set are ignored and determined automatically
+  on boot these are included for information only:
 
   (830) CS4232 audio I/O base 530, 604, E80 or F40
   (10) CS4232 audio IRQ 5, 7, 9, 11, 12 or 15
@@ -33,16 +38,31 @@ automatically on boot.
   This will allow simultaneous record and playback, as 2 different dma
   channels are used.
 
+  The sound will be all left channel and very low volume since the
+  auxiliary input isn't muted by default.  I had the changes necessary
+  for this in the kernel but the sound driver maintainer didn't want
+  to include them since it wasn't common in other machines.  To fix this
+  you need to mute it using a mixer utility of some sort (if you find one
+  please let me know) or by patching the driver yourself and recompiling.
+
+  There is a problem on the PowerStack 2's (PowerStack Pro's) using a
+  different irq/drq than the kernel expects.  Unfortunately, I don't know
+  which irq/drq it is so if anyone knows please email me.
+
   Midi is not supported since the cs4232 driver doesn't support midi yet.
 
-2. IBM machines
+2. IBM PowerPersonal PReP machines and IBM LongTrail CHRP
 
   I've only tested sound on the Power Personal Series of IBM workstations
-  so if you try it on others please let me know the result.
+  so if you try it on others please let me know the result.  I'm especially
+  interested in the 43p's sound system, which I know nothing about.
+
+  Enable support for "Crystal CS4232 based (PnP) cards" and for the
+  Microsoft Sound System.  The MSS isn't used, but some of the routines
+  that the CS4232 driver uses are in it.
 
-  Enable support for "Crystal CS4232 based (PnP) cards".  Although the
-  options you set are ignored and determined automatically on boot these
-  are included for information only:
+  Although the options you set are ignored and determined automatically
+  on boot these are included for information only:
 
   (530) CS4232 audio I/O base 530, 604, E80 or F40
   (5) CS4232 audio IRQ 5, 7, 9, 11, 12 or 15
@@ -54,4 +74,3 @@ automatically on boot.
   This setup does _NOT_ allow for recording yet.
 
   Midi is not supported since the cs4232 driver doesn't support midi yet.
-