aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Cooper <andrew.cooper3@citrix.com>2013-10-22 17:15:58 +0200
committerJan Beulich <jbeulich@suse.com>2013-10-22 17:15:58 +0200
commit782dcf5c502ce089d13eaa92e1c6c324f751df16 (patch)
tree897f09eb4a26e3f3c9675ee56824e8aba94db960
parente5fc6434d710894b5fc5a676d7f4c41608ab3ae6 (diff)
downloadxen-782dcf5c502ce089d13eaa92e1c6c324f751df16.tar.gz
xen-782dcf5c502ce089d13eaa92e1c6c324f751df16.tar.bz2
xen-782dcf5c502ce089d13eaa92e1c6c324f751df16.zip
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 <andrew.cooper3@citrix.com> Acked-by: Keir Fraser <keir@xen.org>
-rw-r--r--xen/common/sched_credit2.c7
-rw-r--r--xen/common/trace.c2
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);