diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-23 13:25:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-23 13:25:27 -0700 |
| commit | f2fea6a31b09a12fe4d9e9e3f9a8e2be017ad611 (patch) | |
| tree | c16afc7b5e4b92cb361c6d2b3ec6f0e9a780a476 /xen-disable-clock-timer-when-shutting-down.patch | |
| parent | e930b8544abee8d7894d5f55af16cb5e7be25f9f (diff) | |
| download | patches-f2fea6a31b09a12fe4d9e9e3f9a8e2be017ad611.tar.gz | |
updates
Diffstat (limited to 'xen-disable-clock-timer-when-shutting-down.patch')
| -rw-r--r-- | xen-disable-clock-timer-when-shutting-down.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/xen-disable-clock-timer-when-shutting-down.patch b/xen-disable-clock-timer-when-shutting-down.patch new file mode 100644 index 00000000000000..c1c59384769016 --- /dev/null +++ b/xen-disable-clock-timer-when-shutting-down.patch @@ -0,0 +1,30 @@ +From: Daniel Kiper <dkiper@net-space.pl> +Subject: xen: disable clock timer when shutting down. + +This is needed as some Amazon EC2 machines can't restart the timer +properly in the kexec-ed kernel, as jiffies are not being incremented. + +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + arch/x86/xen/time.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/x86/xen/time.c ++++ b/arch/x86/xen/time.c +@@ -289,7 +289,15 @@ static void xen_timerop_set_mode(enum cl + + case CLOCK_EVT_MODE_UNUSED: + case CLOCK_EVT_MODE_SHUTDOWN: ++#if 0 ++ /* ++ * Disabled due to some Amazon EC2 machines are not able to ++ * restart timer properly in crash kernel. If this happens then ++ * it hangs in loop in calibrate_delay_direct() because jiffies ++ * are not incremented. ++ */ + HYPERVISOR_set_timer_op(0); /* cancel timeout */ ++#endif + break; + } + } |