diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 15:13:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 15:13:31 +1000 |
| commit | c4e6ee06d278f3e6240af6c38700ff1f33b7fdfa (patch) | |
| tree | 6f66e26890baa5878113c4d3ec1098dea7691c98 /Documentation | |
| parent | 9326201c5da757f50125c6077730ec662c7ad1fa (diff) | |
| parent | 9cfe46a0547b6a1481e773785bceb6a319963b49 (diff) | |
Merge branch 'quilt/ide'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ioctl/hdio.txt | 7 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/ioctl/hdio.txt b/Documentation/ioctl/hdio.txt index c19efdeace2c..91a6ecbae0bb 100644 --- a/Documentation/ioctl/hdio.txt +++ b/Documentation/ioctl/hdio.txt @@ -508,12 +508,13 @@ HDIO_DRIVE_RESET execute a device reset error returns: EACCES Access denied: requires CAP_SYS_ADMIN + ENXIO No such device: phy dead or ctl_addr == 0 + EIO I/O error: reset timed out or hardware error notes: - Abort any current command, prevent anything else from being - queued, execute a reset on the device, and issue BLKRRPART - ioctl on the block device. + Execute a reset on the device as soon as the current IO + operation has completed. Executes an ATAPI soft reset if applicable, otherwise executes an ATA soft reset on the controller. diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 9becb290c1e4..f600d9df8fcc 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -749,9 +749,6 @@ and is between 256 and 4096 characters. It is defined in the file hd= [EIDE] (E)IDE hard drive subsystem geometry Format: <cyl>,<head>,<sect> - hd?= [HW] (E)IDE subsystem - hd?lun= See Documentation/ide/ide.txt. - highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact size of <nn>. This works even on boxes that have no highmem otherwise. This also works to reduce highmem |