diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-29 04:42:26 +0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-29 04:42:26 +0400 |
| commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
| tree | 032f067d3af458527d903a7653885404ed82431e /arch/ia64/sn/pci/tioce_provider.c | |
| parent | acc429a517bd11fdcac9bea97d082d26231beb92 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
| download | linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/sn/pci/tioce_provider.c')
| -rw-r--r-- | arch/ia64/sn/pci/tioce_provider.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c index fa073cc4b565..833295624e5d 100644 --- a/arch/ia64/sn/pci/tioce_provider.c +++ b/arch/ia64/sn/pci/tioce_provider.c @@ -682,9 +682,6 @@ tioce_reserve_m32(struct tioce_kernel *ce_kern, u64 base, u64 limit) int ate_index, last_ate, ps; struct tioce *ce_mmr; - if (!TIOCE_M32_ADDR(base)) - return; - ce_mmr = (struct tioce *)ce_kern->ce_common->ce_pcibus.bs_base; ps = ce_kern->ce_ate3240_pagesize; ate_index = ATE_PAGE(base, ps); @@ -693,6 +690,9 @@ tioce_reserve_m32(struct tioce_kernel *ce_kern, u64 base, u64 limit) if (ate_index < 64) ate_index = 64; + if (last_ate >= TIOCE_NUM_M3240_ATES) + last_ate = TIOCE_NUM_M3240_ATES - 1; + while (ate_index <= last_ate) { u64 ate; |