Skip to content

Commit

Permalink
watchdog: update/improve/consolidate watchdog driver
Browse files Browse the repository at this point in the history
Move the limited watchdog driver help from kernel-parameters.txt
to Documentation/watchdog/watchdog-parameters.txt and add info to it
for all watchdog drivers except the ones that have driver-specific
files already.

Correct minor comments and MODULE_PARM_DESC() text in 2 places.

Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Wim Van Sebroeck <[email protected]>
  • Loading branch information
rddunlap authored and Wim Van Sebroeck committed May 25, 2010
1 parent 8b18085 commit 4724ba5
Show file tree
Hide file tree
Showing 6 changed files with 411 additions and 17 deletions.
15 changes: 4 additions & 11 deletions Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,6 @@ and is between 256 and 4096 characters. It is defined in the file
advansys= [HW,SCSI]
See header of drivers/scsi/advansys.c.

advwdt= [HW,WDT] Advantech WDT
Format: <iostart>,<iostop>

aedsp16= [HW,OSS] Audio Excel DSP 16
Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq>
See also header of sound/oss/aedsp16.c.
Expand Down Expand Up @@ -765,9 +762,6 @@ and is between 256 and 4096 characters. It is defined in the file
This option is obsoleted by the "netdev=" option, which
has equivalent usage. See its documentation for details.

eurwdt= [HW,WDT] Eurotech CPU-1220/1410 onboard watchdog.
Format: <io>[,<irq>]

failslab=
fail_page_alloc=
fail_make_request=[KNL]
Expand Down Expand Up @@ -2267,9 +2261,6 @@ and is between 256 and 4096 characters. It is defined in the file

sched_debug [KNL] Enables verbose scheduler debug messages.

sc1200wdt= [HW,WDT] SC1200 WDT (watchdog) driver
Format: <io>[,<timeout>[,<isapnp>]]

scsi_debug_*= [SCSI]
See drivers/scsi/scsi_debug.c.

Expand Down Expand Up @@ -2858,8 +2849,10 @@ and is between 256 and 4096 characters. It is defined in the file
wd7000= [HW,SCSI]
See header of drivers/scsi/wd7000.c.

wdt= [WDT] Watchdog
See Documentation/watchdog/wdt.txt.
watchdog timers [HW,WDT] For information on watchdog timers,
see Documentation/watchdog/watchdog-parameters.txt
or other driver-specific files in the
Documentation/watchdog/ directory.

x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of
default x2apic cluster mode on platforms
Expand Down
5 changes: 5 additions & 0 deletions Documentation/watchdog/00-INDEX
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
00-INDEX
- this file.
hpwdt.txt
- information on the HP iLO2 NMI watchdog
pcwd-watchdog.txt
- documentation for Berkshire Products PC Watchdog ISA cards.
src/
- directory holding watchdog related example programs.
watchdog-api.txt
- description of the Linux Watchdog driver API.
watchdog-parameters.txt
- information on driver parameters (for drivers other than
the ones that have driver-specific files here)
wdt.txt
- description of the Watchdog Timer Interfaces for Linux.
Loading

0 comments on commit 4724ba5

Please sign in to comment.