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 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
pci_fire.c
diff --git
a/arch/sparc/kernel/pci_fire.c
b/arch/sparc/kernel/pci_fire.c
index
43d691b
..
3d70f83
100644
(file)
--- a/
arch/sparc/kernel/pci_fire.c
+++ b/
arch/sparc/kernel/pci_fire.c
@@
-214,11
+214,9
@@
static int pci_fire_msi_setup(struct pci_pbm_info *pbm, unsigned long msiqid,
static int pci_fire_msi_teardown(struct pci_pbm_info *pbm, unsigned long msi)
{
- unsigned long msiqid;
u64 val;
val = upa_readq(pbm->pbm_regs + MSI_MAP(msi));
- msiqid = (val & MSI_MAP_EQNUM);
val &= ~MSI_MAP_VALID;