git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...
[pandora-kernel.git]
/
arch
/
ia64
/
sn
/
kernel
/
irq.c
diff --git
a/arch/ia64/sn/kernel/irq.c
b/arch/ia64/sn/kernel/irq.c
index
81a1f4e
..
485c42d
100644
(file)
--- a/
arch/ia64/sn/kernel/irq.c
+++ b/
arch/ia64/sn/kernel/irq.c
@@
-112,8
+112,6
@@
static void sn_ack_irq(struct irq_data *data)
irq_move_irq(data);
}
irq_move_irq(data);
}
-static void sn_irq_info_free(struct rcu_head *head);
-
struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,
nasid_t nasid, int slice)
{
struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,
nasid_t nasid, int slice)
{
@@
-177,7
+175,7
@@
struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,
spin_lock(&sn_irq_info_lock);
list_replace_rcu(&sn_irq_info->list, &new_irq_info->list);
spin_unlock(&sn_irq_info_lock);
spin_lock(&sn_irq_info_lock);
list_replace_rcu(&sn_irq_info->list, &new_irq_info->list);
spin_unlock(&sn_irq_info_lock);
-
call_rcu(&sn_irq_info->rcu, sn_irq_info_free
);
+
kfree_rcu(sn_irq_info, rcu
);
finish_up:
finish_up:
@@
-338,14
+336,6
@@
static void unregister_intr_pda(struct sn_irq_info *sn_irq_info)
rcu_read_unlock();
}
rcu_read_unlock();
}
-static void sn_irq_info_free(struct rcu_head *head)
-{
- struct sn_irq_info *sn_irq_info;
-
- sn_irq_info = container_of(head, struct sn_irq_info, rcu);
- kfree(sn_irq_info);
-}
-
void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
{
nasid_t nasid = sn_irq_info->irq_nasid;
void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
{
nasid_t nasid = sn_irq_info->irq_nasid;
@@
-399,7
+389,7
@@
void sn_irq_unfixup(struct pci_dev *pci_dev)
spin_unlock(&sn_irq_info_lock);
if (list_empty(sn_irq_lh[sn_irq_info->irq_irq]))
free_irq_vector(sn_irq_info->irq_irq);
spin_unlock(&sn_irq_info_lock);
if (list_empty(sn_irq_lh[sn_irq_info->irq_irq]))
free_irq_vector(sn_irq_info->irq_irq);
-
call_rcu(&sn_irq_info->rcu, sn_irq_info_free
);
+
kfree_rcu(sn_irq_info, rcu
);
pci_dev_put(pci_dev);
}
pci_dev_put(pci_dev);
}