diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-06 17:16:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-06 17:16:09 -0700 |
| commit | 47a716cf0ca981b9549ec9815122ada7a0ff707c (patch) | |
| tree | 9b949cce3f111c41478b6bbe404b7fdf525ef45f /arch/x86/kernel | |
| parent | 1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd (diff) | |
| parent | b945d6b2554d550fe95caadc61e521c0ad71fb9c (diff) | |
| download | op-kernel-dev-47a716cf0ca981b9549ec9815122ada7a0ff707c.zip op-kernel-dev-47a716cf0ca981b9549ec9815122ada7a0ff707c.tar.gz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rbtree: Undo augmented trees performance damage and regression
x86, Calgary: Limit the max PHB number to 256
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 0b96b55..078d4ec 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -110,7 +110,7 @@ int use_calgary __read_mostly = 0; * x3950 (PCIE): 8 chassis, 32 PHBs per chassis = 256 * x3950 (PCIX): 8 chassis, 16 PHBs per chassis = 128 */ -#define MAX_PHB_BUS_NUM 384 +#define MAX_PHB_BUS_NUM 256 #define PHBS_PER_CALGARY 4 @@ -1056,8 +1056,6 @@ static int __init calgary_init_one(struct pci_dev *dev) struct iommu_table *tbl; int ret; - BUG_ON(dev->bus->number >= MAX_PHB_BUS_NUM); - bbar = busno_to_bbar(dev->bus->number); ret = calgary_setup_tar(dev, bbar); if (ret) |
