---

yaml --- r: 148649 b: refs/heads/master c: faafec1 h: refs/heads/master i: 148647: b839dd6 v: v3
git-mirror · Jun 12, 2009 · ddb94f1 · ddb94f1
1 parent 87b9a62
commit ddb94f1
Show file tree

Hide file tree

Showing 688 changed files with 18,087 additions and 90,074 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02a99ed6207e9a1d787bb360ef97de023c7edf4a
+refs/heads/master: faafec1e61e61d350248af2a7e5f047606adab6e
diff --git a/trunk/Documentation/ide/ide.txt b/trunk/Documentation/ide/ide.txt
@@ -216,8 +216,6 @@ Other kernel parameters for ide_core are:
 
 * "noflush=[interface_number.device_number]" to disable flush requests
 
-* "nohpa=[interface_number.device_number]" to disable Host Protected Area
-
 * "noprobe=[interface_number.device_number]" to skip probing
 
 * "nowerr=[interface_number.device_number]" to ignore the WRERR_STAT bit

diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -887,8 +887,11 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	ide-core.nodma=	[HW] (E)IDE subsystem
 			Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc
-			.vlb_clock .pci_clock .noflush .nohpa .noprobe .nowerr
-			.cdrom .chs .ignore_cable are additional options
+			.vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom
+			.chs .ignore_cable are additional options
+			See Documentation/ide/ide.txt.
+
+	idebus=		[HW] (E)IDE subsystem - VLB/PCI bus speed
 			See Documentation/ide/ide.txt.
 
 	ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem

diff --git a/trunk/Documentation/lguest/Makefile b/trunk/Documentation/lguest/Makefile
@@ -1,5 +1,6 @@
 # This creates the demonstration utility "lguest" which runs a Linux guest.
-CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE
+CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE
+LDLIBS:=-lz
 
 all: lguest