diff options
| author | Kyle McMartin <kyle@redhat.com> | 2013-07-16 22:56:52 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2013-07-16 22:56:52 -0400 |
| commit | de50edbb210a0436977ad88d286bd0388043a63e (patch) | |
| tree | 00b48d293ca0abe00e9678eada546ce6428f0931 /nowatchdog-on-virt.patch | |
| parent | 41d47623508729bbd51136cf8824636fe80e0b9a (diff) | |
| download | kernel-de50edbb210a0436977ad88d286bd0388043a63e.tar.gz kernel-de50edbb210a0436977ad88d286bd0388043a63e.tar.xz kernel-de50edbb210a0436977ad88d286bd0388043a63e.zip | |
Linux v3.11-rc1
- Disable debugging options.
- Fix %kernel_modules warning.
Diffstat (limited to 'nowatchdog-on-virt.patch')
| -rw-r--r-- | nowatchdog-on-virt.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nowatchdog-on-virt.patch b/nowatchdog-on-virt.patch index b20642204..87ab11a0f 100644 --- a/nowatchdog-on-virt.patch +++ b/nowatchdog-on-virt.patch @@ -12,7 +12,7 @@ Just disable the detector on VMs. Signed-off-by: Dave Jones <davej@redhat.com> diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index 05039e3..a28aab9 100644 +index 1241d8c..b2dc4e4 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -24,6 +24,7 @@ @@ -30,7 +30,7 @@ index 05039e3..a28aab9 100644 +static int disable_watchdog(const struct dmi_system_id *d) +{ + printk(KERN_INFO "watchdog: disabled (inside virtual machine)\n"); -+ watchdog_enabled = 0; ++ watchdog_user_enabled = 0; + return 0; +} + @@ -56,12 +56,12 @@ index 05039e3..a28aab9 100644 /* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally -@@ -543,6 +570,8 @@ static struct smp_hotplug_thread watchdog_threads = { +@@ -551,6 +578,8 @@ int proc_dowatchdog(struct ctl_table *table, int write, void __init lockup_detector_init(void) { + dmi_check_system(watchdog_virt_dmi_table); + set_sample_period(); - if (smpboot_register_percpu_thread(&watchdog_threads)) { - pr_err("Failed to create watchdog threads, disabled\n"); + + #ifdef CONFIG_NO_HZ_FULL |