1 files changed, 2 insertions, 29 deletions
diff --git a/Documentation/memory.txt b/Documentation/memory.txt
index 2b3dedd39538..802efe58647c 100644
--- a/Documentation/memory.txt
+++ b/Documentation/memory.txt
@@ -1,18 +1,7 @@
 There are several classic problems related to memory on Linux
 systems.
-        1) There are some buggy motherboards which cannot properly 
+        1) There are some motherboards that will not cache above
-           deal with the memory above 16MB.  Consider exchanging
-           your motherboard.
-        2) You cannot do DMA on the ISA bus to addresses above
-           16M.  Most device drivers under Linux allow the use
-           of bounce buffers which work around this problem.  Drivers
-           that don't use bounce buffers will be unstable with
-           more than 16M installed.  Drivers that use bounce buffers
-           will be OK, but may have slightly higher overhead.
-        
-        3) There are some motherboards that will not cache above
           a certain quantity of memory.  If you have one of these
           motherboards, your system will be SLOWER, not faster
           as you add more memory.  Consider exchanging your 
@@ -24,7 +13,7 @@ It can also tell Linux to use less memory than is actually installed.
 If you use "mem=" on a machine with PCI, consider using "memmap=" to avoid
 physical address space collisions.
-See the documentation of your boot loader (LILO, loadlin, etc.) about
+See the documentation of your boot loader (LILO, grub, loadlin, etc.) about
 how to pass options to the kernel.
 There are other memory problems which Linux cannot deal with.  Random
@@ -42,19 +31,3 @@ Try:
          with the vendor. Consider testing it with memtest86 yourself.
        
        * Exchanging your CPU, cache, or motherboard for one that works.
-        * Disabling the cache from the BIOS.
-        * Try passing the "mem=4M" option to the kernel to limit
-          Linux to using a very small amount of memory. Use "memmap="-option
-          together with "mem=" on systems with PCI to avoid physical address
-          space collisions.
-Other tricks:
-        * Try passing the "no-387" option to the kernel to ignore
-          a buggy FPU.
-        * Try passing the "no-hlt" option to disable the potentially
-          buggy HLT instruction in your CPU.

diff --git a/Documentation/memory.txt b/Documentation/memory.txt index 2b3dedd39538..802efe58647c 100644 --- a/Documentation/memory.txt +++ b/Documentation/memory.txt
@@ -1,18 +1,7 @@
1	There are several classic problems related to memory on Linux	1	There are several classic problems related to memory on Linux
2	systems.	2	systems.
3		3
4	1) There are some buggy motherboards which cannot properly	4	1) There are some motherboards that will not cache above
5	deal with the memory above 16MB. Consider exchanging
6	your motherboard.
7
8	2) You cannot do DMA on the ISA bus to addresses above
9	16M. Most device drivers under Linux allow the use
10	of bounce buffers which work around this problem. Drivers
11	that don't use bounce buffers will be unstable with
12	more than 16M installed. Drivers that use bounce buffers
13	will be OK, but may have slightly higher overhead.
14
15	3) There are some motherboards that will not cache above
16	a certain quantity of memory. If you have one of these	5	a certain quantity of memory. If you have one of these
17	motherboards, your system will be SLOWER, not faster	6	motherboards, your system will be SLOWER, not faster
18	as you add more memory. Consider exchanging your	7	as you add more memory. Consider exchanging your
@@ -24,7 +13,7 @@ It can also tell Linux to use less memory than is actually installed.
24	If you use "mem=" on a machine with PCI, consider using "memmap=" to avoid	13	If you use "mem=" on a machine with PCI, consider using "memmap=" to avoid
25	physical address space collisions.	14	physical address space collisions.
26		15
27	See the documentation of your boot loader (LILO, loadlin, etc.) about	16	See the documentation of your boot loader (LILO, grub, loadlin, etc.) about
28	how to pass options to the kernel.	17	how to pass options to the kernel.
29		18
30	There are other memory problems which Linux cannot deal with. Random	19	There are other memory problems which Linux cannot deal with. Random
@@ -42,19 +31,3 @@ Try:
42	with the vendor. Consider testing it with memtest86 yourself.	31	with the vendor. Consider testing it with memtest86 yourself.
43		32
44	* Exchanging your CPU, cache, or motherboard for one that works.	33	* Exchanging your CPU, cache, or motherboard for one that works.
45
46	* Disabling the cache from the BIOS.
47
48	* Try passing the "mem=4M" option to the kernel to limit
49	Linux to using a very small amount of memory. Use "memmap="-option
50	together with "mem=" on systems with PCI to avoid physical address
51	space collisions.
52
53
54	Other tricks:
55
56	* Try passing the "no-387" option to the kernel to ignore
57	a buggy FPU.
58
59	* Try passing the "no-hlt" option to disable the potentially
60	buggy HLT instruction in your CPU.