From 782dcf5c502ce089d13eaa92e1c6c324f751df16 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 22 Oct 2013 17:15:58 +0200 Subject: widen flags parameter for spinlock_irqsave() and friends These issues were detected using the subsequent patch which forces a compilation error if the result from local_irq_save() would be truncated. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser --- xen/common/sched_credit2.c | 7 ++++--- xen/common/trace.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 84e547bad8..4e68375381 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -1480,7 +1480,7 @@ static void * csched_alloc_domdata(const struct scheduler *ops, struct domain *dom) { struct csched_dom *sdom; - int flags; + unsigned long flags; sdom = xzalloc(struct csched_dom); if ( sdom == NULL ) @@ -1524,7 +1524,7 @@ csched_dom_init(const struct scheduler *ops, struct domain *dom) static void csched_free_domdata(const struct scheduler *ops, void *data) { - int flags; + unsigned long flags; struct csched_dom *sdom = data; spin_lock_irqsave(&CSCHED_PRIV(ops)->lock, flags); @@ -1944,7 +1944,8 @@ static void deactivate_runqueue(struct csched_private *prv, int rqi) static void init_pcpu(const struct scheduler *ops, int cpu) { - int rqi, flags; + int rqi; + unsigned long flags; struct csched_private *prv = CSCHED_PRIV(ops); struct csched_runqueue_data *rqd; spinlock_t *old_lock; diff --git a/xen/common/trace.c b/xen/common/trace.c index 63ea0b7ba0..41ddc336e1 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -420,7 +420,7 @@ int tb_control(xen_sysctl_tbuf_op_t *tbc) * hypercall returns, no more records should be placed into the buffers. */ for_each_online_cpu(i) { - int flags; + unsigned long flags; spin_lock_irqsave(&per_cpu(t_lock, i), flags); per_cpu(lost_records, i)=0; spin_unlock_irqrestore(&per_cpu(t_lock, i), flags); -- cgit v1.2.3