projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
86xx
/
mpc86xx_hpcn.c
diff --git
a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index
3755e61
..
817245b
100644
(file)
--- a/
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@
-102,7
+102,7
@@
mpc86xx_hpcn_setup_arch(void)
#endif
#ifdef CONFIG_SWIOTLB
- if (
memblock_end_of_DRAM(
) > max) {
+ if (
(memblock_end_of_DRAM() - 1
) > max) {
ppc_swiotlb_enable = 1;
set_pci_dma_ops(&swiotlb_dma_ops);
ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;