diff options
| author | Andrew Cooper <andrew.cooper3@citrix.com> | 2012-03-08 09:23:27 +0000 |
|---|---|---|
| committer | Andrew Cooper <andrew.cooper3@citrix.com> | 2012-03-08 09:23:27 +0000 |
| commit | d4faf5a948c03ffe61b4bfd1ebcdc93343727ca4 (patch) | |
| tree | fa8363186763e4dd9707edf3bdb9171bf3bd23d9 /xen/arch/x86/setup.c | |
| parent | 338db98dd8d2cf1a639951597880d7a2e7f3b3d6 (diff) | |
| download | xen-d4faf5a948c03ffe61b4bfd1ebcdc93343727ca4.tar.gz xen-d4faf5a948c03ffe61b4bfd1ebcdc93343727ca4.tar.bz2 xen-d4faf5a948c03ffe61b4bfd1ebcdc93343727ca4.zip | |
NMI: Command line parameter for watchdog timeout
Introduce a command parameter to set the watchtog timeout. Manually
specifying "watchdog_timeout=<seconds>" on the command line will also
turn the watchdog on. For consistency, move opt_watchdog into nmi.c
along with opt_watchdog_timeout.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/setup.c')
| -rw-r--r-- | xen/arch/x86/setup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index ae236c94c3..b9da9851c9 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -45,6 +45,7 @@ #include <asm/mach-generic/mach_apic.h> /* for generic_apic_probe */ #include <asm/setup.h> #include <xen/cpu.h> +#include <asm/nmi.h> /* opt_nosmp: If true, secondary processors are ignored. */ static bool_t __initdata opt_nosmp; @@ -54,10 +55,6 @@ boolean_param("nosmp", opt_nosmp); static unsigned int __initdata max_cpus; integer_param("maxcpus", max_cpus); -/* opt_watchdog: If true, run a watchdog NMI on each processor. */ -static bool_t __initdata opt_watchdog; -boolean_param("watchdog", opt_watchdog); - /* smep: Enable/disable Supervisor Mode Execution Protection (default on). */ static bool_t __initdata disable_smep; invbool_param("smep", disable_smep); |