diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-03-27 15:22:54 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-03-27 15:22:54 +0200 |
| commit | eca1bfec46214a902f24bce2b44c96ae364f1219 (patch) | |
| tree | 94cf15bbbc8d05eb6c1cab2f78776874edccfd2c /xen/arch/x86/hpet.c | |
| parent | a5e1cb8704755905940c7242f62c5e9d85957d65 (diff) | |
| download | xen-eca1bfec46214a902f24bce2b44c96ae364f1219.tar.gz xen-eca1bfec46214a902f24bce2b44c96ae364f1219.tar.bz2 xen-eca1bfec46214a902f24bce2b44c96ae364f1219.zip | |
x86/hpet: replace disabling of legacy broadcast
... by the call to hpet_disable() added in the immediately preceding
patch.
In order to retain the behavior intended by c/s 23776:0ddb4481f883,
implement one of the alternative options pointed out there: remove CPUs
from the online map in __stop_this_cpu() (and hence doing so in
stop_this_cpu() is no longer needed).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/hpet.c')
| -rw-r--r-- | xen/arch/x86/hpet.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index b5ef54f90a..71f0b815f4 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -779,7 +779,11 @@ void hpet_disable(void) u32 id; if ( !hpet_boot_cfg ) + { + if ( hpet_broadcast_is_available() ) + hpet_disable_legacy_broadcast(); return; + } hpet_write32(*hpet_boot_cfg & ~HPET_CFG_ENABLE, HPET_CFG); |