aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/hpet.c
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2011-10-19 12:50:54 +0200
committerJan Beulich <jbeulich@suse.com>2011-10-19 12:50:54 +0200
commit047ea00c0fa2325bfbe1baeb1e74b90fb3187ddd (patch)
tree31f62f214620e26f8a7cf2078387e60cbd7a5e37 /xen/arch/x86/hpet.c
parentde4aa5b6b1e5430ba7460087b2c7e7359cd21a69 (diff)
downloadxen-047ea00c0fa2325bfbe1baeb1e74b90fb3187ddd.tar.gz
xen-047ea00c0fa2325bfbe1baeb1e74b90fb3187ddd.tar.bz2
xen-047ea00c0fa2325bfbe1baeb1e74b90fb3187ddd.zip
fold struct irq_cfg into struct irq_desc
struct irq_cfg really has become an architecture extension to struct irq_desc, and hence it should be treated as such (rather than as IRQ chip specific data, which it was meant to be originally). For a first step, only convert a subset of the uses; subsequent patches (partly to be sent later) will aim at fully eliminating the use of the old structure type. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Diffstat (limited to 'xen/arch/x86/hpet.c')
-rw-r--r--xen/arch/x86/hpet.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c
index 3a2b80181f..b6e7e07faf 100644
--- a/xen/arch/x86/hpet.c
+++ b/xen/arch/x86/hpet.c
@@ -281,7 +281,6 @@ static void hpet_msi_set_affinity(struct irq_desc *desc, const cpumask_t *mask)
{
struct msi_msg msg;
unsigned int dest;
- struct irq_cfg *cfg= desc->chip_data;
dest = set_desc_affinity(desc, mask);
if (dest == BAD_APICID)
@@ -289,7 +288,7 @@ static void hpet_msi_set_affinity(struct irq_desc *desc, const cpumask_t *mask)
hpet_msi_read(desc->action->dev_id, &msg);
msg.data &= ~MSI_DATA_VECTOR_MASK;
- msg.data |= MSI_DATA_VECTOR(cfg->vector);
+ msg.data |= MSI_DATA_VECTOR(desc->arch.vector);
msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
msg.address_lo |= MSI_ADDR_DEST_ID(dest);
hpet_msi_write(desc->action->dev_id, &msg);