doc/x86: update file locations and 00-INDEX
PATCH 1/1 doc/x86: update file locations and 00-INDEX
From: Randy Dunlap <[email protected]>
A few Doc/x86/ files were moved, so account for that. Update Doc/x86/00-INDEX file.
Signed-off-by Randy Dunlap <[email protected]>
cc Uwe Hermann <[email protected]>
--- Documentation/kernel-parameters.txt | 4 ++-- Documentation/lguest/lguest.c | 2 +- Documentation/x86/00-INDEX | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-)
Documentation/kernel-parameters.txt +2 -2
@@ -111,7 +111,7 @@ In addition, the following text indicate Parameters denoted with BOOT are actually interpreted by the boot loader, and have no meaning to the kernel directly. Do not modify the syntax of boot loader parameters without extreme -need or coordination with <Documentation/x86/i386/boot.txt>. +need or coordination with <Documentation/x86/boot.txt>. There are also arch-specific kernel-parameters not documented here. See for example <Documentation/x86/x86_64/boot-options.txt>.
@@ -2306,7 +2306,7 @@ and is between 256 and 4096 characters. See Documentation/fb/modedb.txt. vga= [BOOT,X86-32] Select a particular video mode - See Documentation/x86/i386/boot.txt and + See Documentation/x86/boot.txt and Documentation/svga.txt. Use vga=ask for menu. This is actually a boot loader parameter; the value is
Documentation/lguest/lguest.c +1 -1
@@ -402,7 +402,7 @@ static unsigned long load_bzimage(int fdvoid *p =from_guest_phys (0x100000 );/* Go back to the start of the file and read the header. It should be -* a Linux boot header (see Documentation/x86/i386/boot.txt) */ +* a Linux boot header (see Documentation/x86/boot.txt) */ lseek (fd,0 ,SEEK_SET );read (fd, &boot,sizeof (boot));
Documentation/x86/00-INDEX +8 -0
@@ -1,4 +1,12 @@ 00-INDEX - this file +boot.txt + - the Linux/x86 boot protocol mtrr.txt - how to use x86 Memory Type Range Registers to increase performance +pat.txt + - Linux/x86 Page Attribute Table APIs and debugging +usb-legacy-support.txt + - Handling USB legacy support issues +zero-page.txt + - struct boot_params info (in page 0)
Quoted 4 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
A few Doc/x86/ files were moved, so account for that. Update Doc/x86/00-INDEX file.
we already had this patch in tip/x86/doc, and i resolved this conflict yesterday. (it was easy) Generally we'll handle all conflicts once we've picked up patches, no need to resend.
Ingo