diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /drivers/pci/msi.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'drivers/pci/msi.c')
| -rw-r--r-- | drivers/pci/msi.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 44f15ff70c1d..baba2eb5367d 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
| @@ -103,14 +103,12 @@ static void msix_set_enable(struct pci_dev *dev, int enable) | |||
| 103 | } | 103 | } |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | /* | ||
| 107 | * Essentially, this is ((1 << (1 << x)) - 1), but without the | ||
| 108 | * undefinedness of a << 32. | ||
| 109 | */ | ||
| 110 | static inline __attribute_const__ u32 msi_mask(unsigned x) | 106 | static inline __attribute_const__ u32 msi_mask(unsigned x) |
| 111 | { | 107 | { |
| 112 | static const u32 mask[] = { 1, 2, 4, 0xf, 0xff, 0xffff, 0xffffffff }; | 108 | /* Don't shift by >= width of type */ |
| 113 | return mask[x]; | 109 | if (x >= 5) |
| 110 | return 0xffffffff; | ||
| 111 | return (1 << (1 << x)) - 1; | ||
| 114 | } | 112 | } |
| 115 | 113 | ||
| 116 | static void msix_flush_writes(struct irq_desc *desc) | 114 | static void msix_flush_writes(struct irq_desc *desc) |