Merge with 2.4.0-test5 final.

5 files changed, 49 insertions, 23 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index fddcc41f9..a5fa3b1d4 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -898,7 +898,7 @@ PROMISE PDC20246/PDC20262/PDC20267 support
 CONFIG_BLK_DEV_PDC202XX
   Promise Ultra33 or PDC20246
   Promise Ultra66 or PDC20262
-  Promise Ultra100 or PDC20267
+  Promise Ultra100 or PDC20265/PDC20267
 
   This driver adds up to 4 more EIDE devices sharing a single
   interrupt. This add-on card is a bootable PCI UDMA controller. Since
@@ -918,11 +918,11 @@ CONFIG_BLK_DEV_PDC202XX
 
 Special UDMA Feature (EXPERIMENTAL)
 CONFIG_PDC202XX_BURST
-  For PDC20246, PDC20262 and PDC20267 Ultra DMA chipsets. Designed
-  originally for PDC20246/Ultra33 that has BIOS setup failures when
-  using 3 or more cards.
+  For PDC20246, PDC20262, PDC20265 and PDC20267 Ultra DMA chipsets.
+  Designed originally for PDC20246/Ultra33 that has BIOS setup
+  failures when using 3 or more cards.
 
-  Unknown for PDC20267 Ultra DMA 100.
+  Unknown for PDC20265/PDC20267 Ultra DMA 100.
 
   Please read the comments at the top of drivers/ide/pdc202xx.c
 
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 06a613ed1..39e5f8813 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -67,6 +67,7 @@ APISOURCES :=	$(TOPDIR)/drivers/char/videodev.c \
 		$(TOPDIR)/drivers/net/8390.c \
 		$(TOPDIR)/drivers/char/serial.c \
 		$(TOPDIR)/drivers/pci/pci.c \
+		$(TOPDIR)/drivers/block/ll_rw_blk.c \
 		$(TOPDIR)/drivers/sound/sound_core.c \
 		$(TOPDIR)/drivers/sound/sound_firmware.c \
 		$(TOPDIR)/drivers/net/wan/syncppp.c \
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 268a9ddc9..c5d7ca3fc 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -125,6 +125,11 @@
 !Ekernel/pm.c
   </chapter>
 
+  <chapter id="blkdev">
+     <title>Block Devices</title>
+!Edrivers/block/ll_rw_blk.c
+  </chapter>
+
   <chapter id="miscdev">
      <title>Miscellaneous Devices</title>
 !Edrivers/char/misc.c
diff --git a/Documentation/i386/boot.txt b/Documentation/i386/boot.txt
index 1622e4af3..8b466cde2 100644
--- a/Documentation/i386/boot.txt
+++ b/Documentation/i386/boot.txt
@@ -2,7 +2,7 @@
 		     ----------------------------
 
 		    H. Peter Anvin <hpa@zytor.com>
-		 Updated as of protocol version 2.02
+			Last update 2000-07-27
 
 On the i386 platform, the Linux kernel uses a rather complicated boot
 convention.  This has evolved partially due to historical aspects, as
@@ -98,7 +98,7 @@ sectors (1K) and then examine the bootup sector size.
 The header looks like:
 
 Offset	Proto	Name		Meaning
-Size
+/Size
 
 01F1/1	ALL	setup_sects	The size of the setup in sectors
 01F2/2	ALL	root_flags	If set, the root is mounted readonly
@@ -120,7 +120,7 @@ Size
 0218/4	2.00+	ramdisk_image	initrd load address (set by boot loader)
 021C/4	2.00+	ramdisk_size	initrd size (set by boot loader)
 0220/4	2.00+	bootsect_kludge	DO NOT USE - for bootsect.S use only
-0224/4	2.01+	heap_end_ptr	Free memory after setup end
+0224/2	2.01+	heap_end_ptr	Free memory after setup end
 0226/2	N/A	pad1		Unused
 0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line
 
@@ -267,8 +267,8 @@ Such a boot loader should enter the following fields in the header:
 		}
 
 		/* It is recommended to clear memory up to the 32K mark */
-		memset(0x90000 + (setup_sects-1)*512, 0,
-		       (64-setup_sects-1)*512);
+		memset(0x90000 + (setup_sects+1)*512, 0,
+		       (64-(setup_sects+1))*512);
 	}
 
 
@@ -296,7 +296,11 @@ much a requirement for these kernels to load the real-mode part at
 If the command line provided by the boot loader is entered by the
 user, the user may expect the following command line options to work.
 They should normally not be deleted from the kernel command line even
-though not all of them are actually meaningful to the kernel.
+though not all of them are actually meaningful to the kernel.  Boot
+loader authors who need additional command line options for the boot
+loader itself should get them registered in
+linux/Documentation/kernel-parameters.txt to make sure they will not
+conflict with actual kernel options now or in the future.
 
   vga=<mode>
 	<mode> here is either an integer (in C notation, either
@@ -311,11 +315,13 @@ though not all of them are actually meaningful to the kernel.
 	or G (meaning << 10, << 20 or << 30).  This specifies to the
 	kernel the memory size.  This affects the possible placement
 	of an initrd, since an initrd should be placed near end of
-	memory.
+	memory.  Note that this is an option to *both* the kernel and
+	the bootloader!
 
   initrd=<file>
 	An initrd should be loaded.  The meaning of <file> is
-	obviously bootloader-dependent.
+	obviously bootloader-dependent, and some boot loaders
+	(e.g. LILO) do not have such a command.
 
 In addition, some boot loaders add the following options to the
 user-specified command line:
@@ -340,10 +346,14 @@ located at *segment* offset 0x20 from the start of the real mode
 kernel.  This means that if you loaded your real-mode kernel code at
 0x90000, the kernel entry point is 9020:0000.
 
-At entry, ds = es = ss = fs = gs should point to the start of the
-real-mode kernel code (0x9000 if the code is loaded at 0x90000), and
-sp should be set up properly, normally pointing to the top of the
-heap.  In our example from above, we would do:
+At entry, ds = es = ss should point to the start of the real-mode
+kernel code (0x9000 if the code is loaded at 0x90000), sp should be
+set up properly, normally pointing to the top of the heap, and
+interrupts should be disabled.  Furthermore, to guard against bugs in
+the kernel, it is recommended that the boot loader sets fs = gs = ds =
+es = ss.
+
+In our example from above, we would do:
 
 	/* Note: in the case of the "old" kernel protocol, base_ptr must
 	   be == 0x90000 at this point; see the previous sample code */
@@ -354,7 +364,7 @@ heap.  In our example from above, we would do:
 
 	/* Set up the real-mode kernel stack */
 	_SS = seg;
-	_SP = 0x9000;	/* Load SP right after loading SS! */
+	_SP = 0x9000;	/* Load SP immediately after loading SS! */
 
 	_DS = _ES = _FS = _GS = seg;
 	jmp_far(seg+0x20, 0);	/* Run the kernel */
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 86d716ed3..42f894248 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -49,6 +49,10 @@ In addition, the following text indicates that the option:
 
 	BUGS=	Relates to possible processor bugs on the said processor.
 	KNL 	Is a kernel start-up parameter.
+	BOOT	Is a boot loader parameter.
+
+Parameters denoted with BOOT are actually interpreted by the boot
+loader, and have no meaning to the kernel directly.
 
 Note that ALL kernel parameters listed below are CASE SENSITIVE, and that
 a trailing = on the name of any parameter states that that parameter will
@@ -228,6 +232,8 @@ running once the system is up.
 
 	init=		[KNL]
 
+	initrd=		[BOOT] Specify the location of the initial ramdisk. 
+
 	ip=		[PNP]
 
 	isp16=		[HW,CD]
@@ -292,11 +298,12 @@ running once the system is up.
 
 	megaraid=	[HW,SCSI]
  
-	mem=		[KNL] force use XX Mb of memory when the kernel is not
-			able to see the whole system memory or for test.
+	mem=nn[KMG]	[KNL,BOOT] force use of a specific amount of
+			memory; to be used when the kernel is not able
+			to see the whole system memory or for test.
 
 	memfrac=	[KNL]
- 
+
 	mga=		[HW,DRM]
 
 	mpu401=		[HW,SOUND]
@@ -512,8 +519,11 @@ running once the system is up.
  
 	video=		[FB] frame buffer configuration.
 
-	vga=		[KNL] on ix386, enable to choose a peculiar video mode
-			(use vga=ask for menu).
+	vga=		[BOOT] on ix386, select a particular video mode
+			(use vga=ask for menu).  This is actually a
+			boot loader parameter; the value is passed to
+			the kernel using a special protocol.  See
+			linux/Documentation/i386/boot.txt for information.
 
 	vmhalt=		[KNL,S390]