aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/9p/trans_virtio.c2
-rw-r--r--net/9p/util.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index d23ed60483c3..42adc052b149 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -201,7 +201,7 @@ static void p9_virtio_close(struct p9_trans *trans)
201{ 201{
202 struct virtio_chan *chan = trans->priv; 202 struct virtio_chan *chan = trans->priv;
203 int count; 203 int count;
204 unsigned int flags; 204 unsigned long flags;
205 205
206 spin_lock_irqsave(&chan->lock, flags); 206 spin_lock_irqsave(&chan->lock, flags);
207 p9_idpool_destroy(chan->tagpool); 207 p9_idpool_destroy(chan->tagpool);
diff --git a/net/9p/util.c b/net/9p/util.c
index 4d5646045330..958fc58cd1ff 100644
--- a/net/9p/util.c
+++ b/net/9p/util.c
@@ -88,7 +88,7 @@ int p9_idpool_get(struct p9_idpool *p)
88{ 88{
89 int i = 0; 89 int i = 0;
90 int error; 90 int error;
91 unsigned int flags; 91 unsigned long flags;
92 92
93retry: 93retry:
94 if (idr_pre_get(&p->pool, GFP_KERNEL) == 0) 94 if (idr_pre_get(&p->pool, GFP_KERNEL) == 0)
@@ -120,7 +120,7 @@ EXPORT_SYMBOL(p9_idpool_get);
120 120
121void p9_idpool_put(int id, struct p9_idpool *p) 121void p9_idpool_put(int id, struct p9_idpool *p)
122{ 122{
123 unsigned int flags; 123 unsigned long flags;
124 spin_lock_irqsave(&p->lock, flags); 124 spin_lock_irqsave(&p->lock, flags);
125 idr_remove(&p->pool, id); 125 idr_remove(&p->pool, id);
126 spin_unlock_irqrestore(&p->lock, flags); 126 spin_unlock_irqrestore(&p->lock, flags);