powerpc: Cleanup from l64 to ll64 change: arch code
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
committed by
Benjamin Herrenschmidt
parent
fe333321e2
commit
9477e455b4
@@ -470,7 +470,7 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
|
|||||||
if (bus->self) {
|
if (bus->self) {
|
||||||
pr_debug("IO mapping for PCI-PCI bridge %s\n",
|
pr_debug("IO mapping for PCI-PCI bridge %s\n",
|
||||||
pci_name(bus->self));
|
pci_name(bus->self));
|
||||||
pr_debug(" virt=0x%016lx...0x%016lx\n",
|
pr_debug(" virt=0x%016llx...0x%016llx\n",
|
||||||
bus->resource[0]->start + _IO_BASE,
|
bus->resource[0]->start + _IO_BASE,
|
||||||
bus->resource[0]->end + _IO_BASE);
|
bus->resource[0]->end + _IO_BASE);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -502,7 +502,7 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
|
|||||||
hose->io_base_phys - phys_page);
|
hose->io_base_phys - phys_page);
|
||||||
|
|
||||||
pr_debug("IO mapping for PHB %s\n", hose->dn->full_name);
|
pr_debug("IO mapping for PHB %s\n", hose->dn->full_name);
|
||||||
pr_debug(" phys=0x%016lx, virt=0x%p (alloc=0x%p)\n",
|
pr_debug(" phys=0x%016llx, virt=0x%p (alloc=0x%p)\n",
|
||||||
hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);
|
hose->io_base_phys, hose->io_base_virt, hose->io_base_alloc);
|
||||||
pr_debug(" size=0x%016lx (alloc=0x%016lx)\n",
|
pr_debug(" size=0x%016lx (alloc=0x%016lx)\n",
|
||||||
hose->pci_io_size, size_page);
|
hose->pci_io_size, size_page);
|
||||||
@@ -517,7 +517,7 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
|
|||||||
hose->io_resource.start += io_virt_offset;
|
hose->io_resource.start += io_virt_offset;
|
||||||
hose->io_resource.end += io_virt_offset;
|
hose->io_resource.end += io_virt_offset;
|
||||||
|
|
||||||
pr_debug(" hose->io_resource=0x%016lx...0x%016lx\n",
|
pr_debug(" hose->io_resource=0x%016llx...0x%016llx\n",
|
||||||
hose->io_resource.start, hose->io_resource.end);
|
hose->io_resource.start, hose->io_resource.end);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@@ -42,7 +42,7 @@ static ssize_t do_coredump_read(int num, struct spu_context *ctx, void *buffer,
|
|||||||
return spufs_coredump_read[num].read(ctx, buffer, size, off);
|
return spufs_coredump_read[num].read(ctx, buffer, size, off);
|
||||||
|
|
||||||
data = spufs_coredump_read[num].get(ctx);
|
data = spufs_coredump_read[num].get(ctx);
|
||||||
ret = snprintf(buffer, size, "0x%.16lx", data);
|
ret = snprintf(buffer, size, "0x%.16llx", data);
|
||||||
if (ret >= size)
|
if (ret >= size)
|
||||||
return size;
|
return size;
|
||||||
return ++ret; /* count trailing NULL */
|
return ++ret; /* count trailing NULL */
|
||||||
|
@@ -132,7 +132,7 @@ int spufs_handle_class1(struct spu_context *ctx)
|
|||||||
|
|
||||||
spuctx_switch_state(ctx, SPU_UTIL_IOWAIT);
|
spuctx_switch_state(ctx, SPU_UTIL_IOWAIT);
|
||||||
|
|
||||||
pr_debug("ctx %p: ea %016lx, dsisr %016lx state %d\n", ctx, ea,
|
pr_debug("ctx %p: ea %016llx, dsisr %016llx state %d\n", ctx, ea,
|
||||||
dsisr, ctx->state);
|
dsisr, ctx->state);
|
||||||
|
|
||||||
ctx->stats.hash_flt++;
|
ctx->stats.hash_flt++;
|
||||||
|
@@ -1654,7 +1654,7 @@ out:
|
|||||||
|
|
||||||
static int spufs_check_valid_dma(struct mfc_dma_command *cmd)
|
static int spufs_check_valid_dma(struct mfc_dma_command *cmd)
|
||||||
{
|
{
|
||||||
pr_debug("queueing DMA %x %lx %x %x %x\n", cmd->lsa,
|
pr_debug("queueing DMA %x %llx %x %x %x\n", cmd->lsa,
|
||||||
cmd->ea, cmd->size, cmd->tag, cmd->cmd);
|
cmd->ea, cmd->size, cmd->tag, cmd->cmd);
|
||||||
|
|
||||||
switch (cmd->cmd) {
|
switch (cmd->cmd) {
|
||||||
@@ -1671,7 +1671,7 @@ static int spufs_check_valid_dma(struct mfc_dma_command *cmd)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ((cmd->lsa & 0xf) != (cmd->ea &0xf)) {
|
if ((cmd->lsa & 0xf) != (cmd->ea &0xf)) {
|
||||||
pr_debug("invalid DMA alignment, ea %lx lsa %x\n",
|
pr_debug("invalid DMA alignment, ea %llx lsa %x\n",
|
||||||
cmd->ea, cmd->lsa);
|
cmd->ea, cmd->lsa);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
@@ -2633,7 +2633,7 @@ static int spufs_show_ctx(struct seq_file *s, void *private)
|
|||||||
}
|
}
|
||||||
|
|
||||||
seq_printf(s, "%c flgs(%lx) sflgs(%lx) pri(%d) ts(%d) spu(%02d)"
|
seq_printf(s, "%c flgs(%lx) sflgs(%lx) pri(%d) ts(%d) spu(%02d)"
|
||||||
" %c %lx %lx %lx %lx %x %x\n",
|
" %c %llx %llx %llx %llx %x %x\n",
|
||||||
ctx->state == SPU_STATE_SAVED ? 'S' : 'R',
|
ctx->state == SPU_STATE_SAVED ? 'S' : 'R',
|
||||||
ctx->flags,
|
ctx->flags,
|
||||||
ctx->sched_flags,
|
ctx->sched_flags,
|
||||||
|
Reference in New Issue
Block a user