On Thu, 11 Nov 2010 15:46:55 +0800 Sheng Yang <sh...@linux.intel.com> wrote:
> Then we can use it instead of magic number 1. > > Reviewed-by: Hidetoshi Seto <seto.hideto...@jp.fujitsu.com> > Cc: Matthew Wilcox <wi...@linux.intel.com> > Cc: Jesse Barnes <jbar...@virtuousgeek.org> > Cc: linux-...@vger.kernel.org > Signed-off-by: Sheng Yang <sh...@linux.intel.com> > --- > drivers/pci/msi.c | 5 +++-- > include/linux/pci_regs.h | 1 + > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index 69b7be3..095634e 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -158,8 +158,9 @@ static u32 __msix_mask_irq(struct msi_desc *desc, u32 > flag) > u32 mask_bits = desc->masked; > unsigned offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE + > PCI_MSIX_ENTRY_VECTOR_CTRL; > - mask_bits &= ~1; > - mask_bits |= flag; > + mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT; > + if (flag) > + mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT; > writel(mask_bits, desc->mask_base + offset); > > return mask_bits; > diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h > index acfc224..ff51632 100644 > --- a/include/linux/pci_regs.h > +++ b/include/linux/pci_regs.h > @@ -313,6 +313,7 @@ > #define PCI_MSIX_ENTRY_UPPER_ADDR 4 > #define PCI_MSIX_ENTRY_DATA 8 > #define PCI_MSIX_ENTRY_VECTOR_CTRL 12 > +#define PCI_MSIX_ENTRY_CTRL_MASKBIT 1 > > /* CompactPCI Hotswap Register */ > Applied 1/7 and 2/7 to my linux-next tree, thanks. If it's easier to push them both through the kvm tree let me know; you can just add my acked-by in that case. -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
