From 48236683c798e3324e86b718640fe9f4a3d5a31d Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 5 Dec 2007 10:43:46 +0000 Subject: [PATCH] netfront accel: spinlock flags are 'unsigned long'. Signed-off-by: Ben Guthro --- drivers/xen/netfront/accel.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/xen/netfront/accel.c b/drivers/xen/netfront/accel.c index 925981d5..534dce9d 100644 --- a/drivers/xen/netfront/accel.c +++ b/drivers/xen/netfront/accel.c @@ -66,7 +66,7 @@ void netif_init_accel(void) void netif_exit_accel(void) { struct netfront_accelerator *accelerator, *tmp; - unsigned flags; + unsigned long flags; spin_lock_irqsave(&accelerators_lock, flags); @@ -115,7 +115,7 @@ static int match_accelerator(const char *frontend, static void add_accelerator_vif(struct netfront_accelerator *accelerator, struct netfront_info *np) { - unsigned flags; + unsigned long flags; /* Need lock to write list */ spin_lock_irqsave(&accelerator->vif_states_lock, flags); @@ -232,7 +232,7 @@ int netfront_load_accelerator(struct netfront_info *np, { struct netfront_accelerator *accelerator; int rc = 0; - unsigned flags; + unsigned long flags; DPRINTK(" %s\n", frontend); @@ -331,7 +331,7 @@ int netfront_accelerator_loaded(int version, const char *frontend, struct netfront_accel_hooks *hooks) { struct netfront_accelerator *accelerator; - unsigned flags; + unsigned long flags; if (version != NETFRONT_ACCEL_VERSION) { if (version > NETFRONT_ACCEL_VERSION) { @@ -394,7 +394,7 @@ void netfront_accelerator_ready(const char *frontend, { struct netfront_accelerator *accelerator; struct netfront_accel_vif_state *accel_vif_state; - unsigned flags, flags1; + unsigned long flags, flags1; DPRINTK("%s %p\n", frontend, dev); @@ -457,7 +457,7 @@ static void accelerator_remove_hooks(struct netfront_accelerator *accelerator) { struct netfront_accel_hooks *hooks; struct netfront_accel_vif_state *vif_state, *tmp; - unsigned flags; + unsigned long flags; /* Mutex is held so don't need vif_states_lock to iterate list */ list_for_each_entry_safe(vif_state, tmp, @@ -491,7 +491,7 @@ static void accelerator_remove_hooks(struct netfront_accelerator *accelerator) void netfront_accelerator_stop(const char *frontend) { struct netfront_accelerator *accelerator; - unsigned flags; + unsigned long flags; mutex_lock(&accelerator_mutex); spin_lock_irqsave(&accelerators_lock, flags); @@ -514,7 +514,7 @@ EXPORT_SYMBOL_GPL(netfront_accelerator_stop); /* Helper for call_remove and do_suspend */ static int do_remove(struct netfront_info *np, struct xenbus_device *dev, - unsigned *lock_flags) + unsigned long *lock_flags) { struct netfront_accelerator *accelerator = np->accelerator; struct netfront_accel_hooks *hooks; @@ -553,7 +553,7 @@ int netfront_accelerator_call_remove(struct netfront_info *np, { struct netfront_accelerator *accelerator; struct netfront_accel_vif_state *tmp_vif_state; - unsigned flags; + unsigned long flags; int rc = 0; mutex_lock(&accelerator_mutex); @@ -588,7 +588,7 @@ int netfront_accelerator_call_remove(struct netfront_info *np, int netfront_accelerator_suspend(struct netfront_info *np, struct xenbus_device *dev) { - unsigned flags; + unsigned long flags; int rc = 0; mutex_lock(&accelerator_mutex); @@ -650,7 +650,7 @@ void netfront_accelerator_resume(struct netfront_info *np, { struct netfront_accel_vif_state *accel_vif_state = NULL; spinlock_t *vif_states_lock; - unsigned flags; + unsigned long flags; mutex_lock(&accelerator_mutex); @@ -693,7 +693,7 @@ int netfront_check_accelerator_queue_ready(struct net_device *dev, struct netfront_accelerator *accelerator; struct netfront_accel_hooks *hooks; int rc = 1; - unsigned flags; + unsigned long flags; accelerator = np->accelerator; @@ -715,7 +715,7 @@ void netfront_accelerator_call_stop_napi_irq(struct netfront_info *np, { struct netfront_accelerator *accelerator; struct netfront_accel_hooks *hooks; - unsigned flags; + unsigned long flags; accelerator = np->accelerator; @@ -735,7 +735,7 @@ int netfront_accelerator_call_get_stats(struct netfront_info *np, { struct netfront_accelerator *accelerator; struct netfront_accel_hooks *hooks; - unsigned flags; + unsigned long flags; int rc = 0; accelerator = np->accelerator; -- 2.39.5