aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/pci-error-recovery.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 19:35:11 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 19:35:11 -0400
commit708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch)
treefe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/pci-error-recovery.txt
parentf3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff)
parenta847825970e741e20a09c659978baa34016b63bc (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits) Add missing maintainer countries in CREDITS Fix bytes <-> kilobytes typo in Kconfig for ramdisk fix a typo in Documentation/pi-futex.txt BUG_ON conversion for fs/xfs/ BUG_ON() conversion in fs/nfsd/ BUG_ON conversion for fs/reiserfs BUG_ON cleanups in arch/i386 BUG_ON cleanup in drivers/net/tokenring/ BUG_ON cleanup for drivers/md/ kerneldoc-typo in led-class.c debugfs: spelling fix rcutorture: Fix incorrect description of default for nreaders parameter parport: Remove space in function calls Michal Wronski: update contact info Spelling fix: "control" instead of "cotrol" reboot parameter in Documentation/kernel-parameters.txt Fix copy&waste bug in comment in scripts/kernel-doc remove duplicate "until" from kernel/workqueue.c ite_gpio fix tabbage fix file specification in comments ... Fixed trivial path conflicts due to removed files: arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/pci-error-recovery.txt')
-rw-r--r--Documentation/pci-error-recovery.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pci-error-recovery.txt b/Documentation/pci-error-recovery.txt
index 634d3e5b5756..6650af432523 100644
--- a/Documentation/pci-error-recovery.txt
+++ b/Documentation/pci-error-recovery.txt
@@ -172,7 +172,7 @@ is STEP 6 (Permanent Failure).
172>>> a value of 0xff on read, and writes will be dropped. If the device 172>>> a value of 0xff on read, and writes will be dropped. If the device
173>>> driver attempts more than 10K I/O's to a frozen adapter, it will 173>>> driver attempts more than 10K I/O's to a frozen adapter, it will
174>>> assume that the device driver has gone into an infinite loop, and 174>>> assume that the device driver has gone into an infinite loop, and
175>>> it will panic the the kernel. There doesn't seem to be any other 175>>> it will panic the kernel. There doesn't seem to be any other
176>>> way of stopping a device driver that insists on spinning on I/O. 176>>> way of stopping a device driver that insists on spinning on I/O.
177 177
178STEP 2: MMIO Enabled 178STEP 2: MMIO Enabled