diff options
| author | Wanlong Gao <wanlong.gao@gmail.com> | 2011-06-13 05:53:53 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-06-13 07:43:05 -0400 |
| commit | 25eb650a690b95cb0e2cf0c3b03f4900a59e0135 (patch) | |
| tree | f36036bd8ae2bb9fe4865791ffc2ba4bad31f71b /Documentation/blockdev | |
| parent | c443453c6dc88576db540acc6ef40e1d2869e394 (diff) | |
doc: fix wrong arch/i386 references
Change all "arch/i386" to "arch/x86" in Documentaion/,
since the directory has changed.
Also update the files which have changed their filename
in the meantime accordingly.
Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com>
[jkosina@suse.cz: reword changelog]
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/blockdev')
| -rw-r--r-- | Documentation/blockdev/README.DAC960 | 2 | ||||
| -rw-r--r-- | Documentation/blockdev/ramdisk.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/blockdev/README.DAC960 b/Documentation/blockdev/README.DAC960 index 0e8f618ab534..bd85fb9dc6e5 100644 --- a/Documentation/blockdev/README.DAC960 +++ b/Documentation/blockdev/README.DAC960 | |||
| @@ -214,7 +214,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree: | |||
| 214 | make config | 214 | make config |
| 215 | make bzImage (or zImage) | 215 | make bzImage (or zImage) |
| 216 | 216 | ||
| 217 | Then install "arch/i386/boot/bzImage" or "arch/i386/boot/zImage" as your | 217 | Then install "arch/x86/boot/bzImage" or "arch/x86/boot/zImage" as your |
| 218 | standard kernel, run lilo if appropriate, and reboot. | 218 | standard kernel, run lilo if appropriate, and reboot. |
| 219 | 219 | ||
| 220 | To create the necessary devices in /dev, the "make_rd" script included in | 220 | To create the necessary devices in /dev, the "make_rd" script included in |
diff --git a/Documentation/blockdev/ramdisk.txt b/Documentation/blockdev/ramdisk.txt index 6c820baa19a6..fa72e97dd669 100644 --- a/Documentation/blockdev/ramdisk.txt +++ b/Documentation/blockdev/ramdisk.txt | |||
| @@ -64,9 +64,9 @@ the RAM disk dynamically grows as data is being written into it, a size field | |||
| 64 | is not required. Bits 11 to 13 are not currently used and may as well be zero. | 64 | is not required. Bits 11 to 13 are not currently used and may as well be zero. |
| 65 | These numbers are no magical secrets, as seen below: | 65 | These numbers are no magical secrets, as seen below: |
| 66 | 66 | ||
| 67 | ./arch/i386/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK 0x07FF | 67 | ./arch/x86/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK 0x07FF |
| 68 | ./arch/i386/kernel/setup.c:#define RAMDISK_PROMPT_FLAG 0x8000 | 68 | ./arch/x86/kernel/setup.c:#define RAMDISK_PROMPT_FLAG 0x8000 |
| 69 | ./arch/i386/kernel/setup.c:#define RAMDISK_LOAD_FLAG 0x4000 | 69 | ./arch/x86/kernel/setup.c:#define RAMDISK_LOAD_FLAG 0x4000 |
| 70 | 70 | ||
| 71 | Consider a typical two floppy disk setup, where you will have the | 71 | Consider a typical two floppy disk setup, where you will have the |
| 72 | kernel on disk one, and have already put a RAM disk image onto disk #2. | 72 | kernel on disk one, and have already put a RAM disk image onto disk #2. |
| @@ -85,7 +85,7 @@ The command line equivalent is: "prompt_ramdisk=1" | |||
| 85 | Putting that together gives 2^15 + 2^14 + 0 = 49152 for an rdev word. | 85 | Putting that together gives 2^15 + 2^14 + 0 = 49152 for an rdev word. |
| 86 | So to create disk one of the set, you would do: | 86 | So to create disk one of the set, you would do: |
| 87 | 87 | ||
| 88 | /usr/src/linux# cat arch/i386/boot/zImage > /dev/fd0 | 88 | /usr/src/linux# cat arch/x86/boot/zImage > /dev/fd0 |
| 89 | /usr/src/linux# rdev /dev/fd0 /dev/fd0 | 89 | /usr/src/linux# rdev /dev/fd0 /dev/fd0 |
| 90 | /usr/src/linux# rdev -r /dev/fd0 49152 | 90 | /usr/src/linux# rdev -r /dev/fd0 49152 |
| 91 | 91 | ||