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 'bkl-removal' into next
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
pci-calgary_64.c
diff --git
a/arch/x86/kernel/pci-calgary_64.c
b/arch/x86/kernel/pci-calgary_64.c
index
e28ec49
..
6959b5c
100644
(file)
--- a/
arch/x86/kernel/pci-calgary_64.c
+++ b/
arch/x86/kernel/pci-calgary_64.c
@@
-1394,7
+1394,7
@@
void __init detect_calgary(void)
return;
}
return;
}
- specified_table_size = determine_tce_table_size(
end
_pfn * PAGE_SIZE);
+ specified_table_size = determine_tce_table_size(
max
_pfn * PAGE_SIZE);
for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) {
struct calgary_bus_info *info = &bus_info[bus];
for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) {
struct calgary_bus_info *info = &bus_info[bus];
@@
-1459,7
+1459,7
@@
int __init calgary_iommu_init(void)
if (ret) {
printk(KERN_ERR "PCI-DMA: Calgary init failed %d, "
"falling back to no_iommu\n", ret);
if (ret) {
printk(KERN_ERR "PCI-DMA: Calgary init failed %d, "
"falling back to no_iommu\n", ret);
- if (
end
_pfn > MAX_DMA32_PFN)
+ if (
max
_pfn > MAX_DMA32_PFN)
printk(KERN_ERR "WARNING more than 4GB of memory, "
"32bit PCI may malfunction.\n");
return ret;
printk(KERN_ERR "WARNING more than 4GB of memory, "
"32bit PCI may malfunction.\n");
return ret;