projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc: Change u64/s64 to a long long integer type
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
powerpc
/
platforms
/
cell
/
iommu.c
diff --git
a/arch/powerpc/platforms/cell/iommu.c
b/arch/powerpc/platforms/cell/iommu.c
index 86db4dd170a0e42d89e26e0f7d20c7f388bf355d..ee5033eddf019de7a31b5ac8c3de1ec25e646d55 100644
(file)
--- a/
arch/powerpc/platforms/cell/iommu.c
+++ b/
arch/powerpc/platforms/cell/iommu.c
@@
-150,8
+150,8
@@
static int cbe_nr_iommus;
static void invalidate_tce_cache(struct cbe_iommu *iommu, unsigned long *pte,
long n_ptes)
{
static void invalidate_tce_cache(struct cbe_iommu *iommu, unsigned long *pte,
long n_ptes)
{
- u
nsigned long
__iomem *reg;
- u
nsigned long
val;
+ u
64
__iomem *reg;
+ u
64
val;
long n;
reg = iommu->xlate_regs + IOC_IOPT_CacheInvd;
long n;
reg = iommu->xlate_regs + IOC_IOPT_CacheInvd;
@@
-855,7
+855,7
@@
static int __init cell_iommu_init_disabled(void)
*/
if (np && size < lmb_end_of_DRAM()) {
printk(KERN_WARNING "iommu: force-enabled, dma window"
*/
if (np && size < lmb_end_of_DRAM()) {
printk(KERN_WARNING "iommu: force-enabled, dma window"
- " (%ldMB) smaller than total memory (%ldMB)\n",
+ " (%ldMB) smaller than total memory (%l
l
dMB)\n",
size >> 20, lmb_end_of_DRAM() >> 20);
return -ENODEV;
}
size >> 20, lmb_end_of_DRAM() >> 20);
return -ENODEV;
}
@@
-985,7
+985,7
@@
static void cell_dma_dev_setup_fixed(struct device *dev)
addr = cell_iommu_get_fixed_address(dev) + dma_iommu_fixed_base;
archdata->dma_data = (void *)addr;
addr = cell_iommu_get_fixed_address(dev) + dma_iommu_fixed_base;
archdata->dma_data = (void *)addr;
- dev_dbg(dev, "iommu: fixed addr = %lx\n", addr);
+ dev_dbg(dev, "iommu: fixed addr = %l
l
x\n", addr);
}
static void insert_16M_pte(unsigned long addr, unsigned long *ptab,
}
static void insert_16M_pte(unsigned long addr, unsigned long *ptab,