Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28672
b: refs/heads/master
c: e884e9c
h: refs/heads/master
v: v3
  • Loading branch information
Olof Johansson authored and Paul Mackerras committed Apr 22, 2006
1 parent 73b9451 commit f0a0b8f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cc98f70557bd08f2eea7b955dd918692a655d72e
refs/heads/master: e884e9c5f28c747ac2c3e1056e1fd655a79e950d
10 changes: 5 additions & 5 deletions trunk/arch/powerpc/kernel/pci_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ static int __init pcibios_init(void)
iSeries_pcibios_init();
#endif

printk("PCI: Probing PCI hardware\n");
printk(KERN_DEBUG "PCI: Probing PCI hardware\n");

/* Scan all of the recorded PCI controllers. */
list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
Expand All @@ -622,14 +622,14 @@ static int __init pcibios_init(void)
/* Cache the location of the ISA bridge (if we have one) */
ppc64_isabridge_dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL);
if (ppc64_isabridge_dev != NULL)
printk("ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));
printk(KERN_DEBUG "ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));

#ifdef CONFIG_PPC_MULTIPLATFORM
/* map in PCI I/O space */
phbs_remap_io();
#endif

printk("PCI: Probing PCI hardware done\n");
printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");

return 0;
}
Expand Down Expand Up @@ -796,7 +796,7 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
else
prot |= _PAGE_GUARDED;

printk("PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp->start,
printk(KERN_DEBUG "PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp->start,
prot);

return __pgprot(prot);
Expand Down Expand Up @@ -1202,7 +1202,7 @@ int remap_bus_range(struct pci_bus *bus)
return 1;
if (start_phys == 0)
return 1;
printk("mapping IO %lx -> %lx, size: %lx\n", start_phys, start_virt, size);
printk(KERN_DEBUG "mapping IO %lx -> %lx, size: %lx\n", start_phys, start_virt, size);
if (__ioremap_explicit(start_phys, start_virt, size,
_PAGE_NO_CACHE | _PAGE_GUARDED))
return 1;
Expand Down

0 comments on commit f0a0b8f

Please sign in to comment.