diff options
-rw-r--r-- | arch/powerpc/kernel/isa-bridge.c | 4 | ||||
-rw-r--r-- | arch/powerpc/mm/fault.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/8xx/m8xx_setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/celleb/io-workarounds.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/celleb/scc_epci.c | 2 | ||||
-rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c index f0f49d1be3d5..965bfcc9ad2d 100644 --- a/arch/powerpc/kernel/isa-bridge.c +++ b/arch/powerpc/kernel/isa-bridge.c | |||
@@ -108,7 +108,7 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node, | |||
108 | if (size > 0x10000) | 108 | if (size > 0x10000) |
109 | size = 0x10000; | 109 | size = 0x10000; |
110 | 110 | ||
111 | printk(KERN_ERR "no ISA IO ranges or unexpected isa range," | 111 | printk(KERN_ERR "no ISA IO ranges or unexpected isa range, " |
112 | "mapping 64k\n"); | 112 | "mapping 64k\n"); |
113 | 113 | ||
114 | __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE, | 114 | __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE, |
@@ -116,7 +116,7 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node, | |||
116 | return; | 116 | return; |
117 | 117 | ||
118 | inval_range: | 118 | inval_range: |
119 | printk(KERN_ERR "no ISA IO ranges or unexpected isa range," | 119 | printk(KERN_ERR "no ISA IO ranges or unexpected isa range, " |
120 | "mapping 64k\n"); | 120 | "mapping 64k\n"); |
121 | __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE, | 121 | __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE, |
122 | 0x10000, _PAGE_NO_CACHE|_PAGE_GUARDED); | 122 | 0x10000, _PAGE_NO_CACHE|_PAGE_GUARDED); |
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 8135da06e0a4..10dda224a361 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
@@ -189,7 +189,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, | |||
189 | return SIGSEGV; | 189 | return SIGSEGV; |
190 | /* in_atomic() in user mode is really bad, | 190 | /* in_atomic() in user mode is really bad, |
191 | as is current->mm == NULL. */ | 191 | as is current->mm == NULL. */ |
192 | printk(KERN_EMERG "Page fault in user mode with" | 192 | printk(KERN_EMERG "Page fault in user mode with " |
193 | "in_atomic() = %d mm = %p\n", in_atomic(), mm); | 193 | "in_atomic() = %d mm = %p\n", in_atomic(), mm); |
194 | printk(KERN_EMERG "NIP = %lx MSR = %lx\n", | 194 | printk(KERN_EMERG "NIP = %lx MSR = %lx\n", |
195 | regs->nip, regs->msr); | 195 | regs->nip, regs->msr); |
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c index d35eda80e9e6..ba645c2b63f6 100644 --- a/arch/powerpc/platforms/8xx/m8xx_setup.c +++ b/arch/powerpc/platforms/8xx/m8xx_setup.c | |||
@@ -120,7 +120,7 @@ void __init mpc8xx_calibrate_decr(void) | |||
120 | ppc_tb_freq /= 16; | 120 | ppc_tb_freq /= 16; |
121 | ppc_proc_freq = 50000000; | 121 | ppc_proc_freq = 50000000; |
122 | if (!get_freq("clock-frequency", &ppc_proc_freq)) | 122 | if (!get_freq("clock-frequency", &ppc_proc_freq)) |
123 | printk(KERN_ERR "WARNING: Estimating processor frequency" | 123 | printk(KERN_ERR "WARNING: Estimating processor frequency " |
124 | "(not found)\n"); | 124 | "(not found)\n"); |
125 | 125 | ||
126 | printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq); | 126 | printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq); |
diff --git a/arch/powerpc/platforms/celleb/io-workarounds.c b/arch/powerpc/platforms/celleb/io-workarounds.c index 2b912140bcbb..32b9cecfda15 100644 --- a/arch/powerpc/platforms/celleb/io-workarounds.c +++ b/arch/powerpc/platforms/celleb/io-workarounds.c | |||
@@ -256,7 +256,7 @@ int __init celleb_pci_workaround_init(void) | |||
256 | 256 | ||
257 | celleb_dummy_page_va = kmalloc(PAGE_SIZE, GFP_KERNEL); | 257 | celleb_dummy_page_va = kmalloc(PAGE_SIZE, GFP_KERNEL); |
258 | if (!celleb_dummy_page_va) { | 258 | if (!celleb_dummy_page_va) { |
259 | printk(KERN_ERR "Celleb: dummy read disabled." | 259 | printk(KERN_ERR "Celleb: dummy read disabled. " |
260 | "Alloc celleb_dummy_page_va failed\n"); | 260 | "Alloc celleb_dummy_page_va failed\n"); |
261 | return 1; | 261 | return 1; |
262 | } | 262 | } |
diff --git a/arch/powerpc/platforms/celleb/scc_epci.c b/arch/powerpc/platforms/celleb/scc_epci.c index 9d076426676c..a3c7cfbcb323 100644 --- a/arch/powerpc/platforms/celleb/scc_epci.c +++ b/arch/powerpc/platforms/celleb/scc_epci.c | |||
@@ -95,7 +95,7 @@ void __init epci_workaround_init(struct pci_controller *hose) | |||
95 | private->dummy_page_da = dma_map_single(hose->parent, | 95 | private->dummy_page_da = dma_map_single(hose->parent, |
96 | celleb_dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE); | 96 | celleb_dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE); |
97 | if (private->dummy_page_da == DMA_ERROR_CODE) { | 97 | if (private->dummy_page_da == DMA_ERROR_CODE) { |
98 | printk(KERN_ERR "EPCI: dummy read disabled." | 98 | printk(KERN_ERR "EPCI: dummy read disabled. " |
99 | "Map dummy page failed.\n"); | 99 | "Map dummy page failed.\n"); |
100 | return; | 100 | return; |
101 | } | 101 | } |
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 33df4c347ca7..87e58e09b500 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c | |||
@@ -222,7 +222,7 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary) | |||
222 | hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; | 222 | hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; |
223 | } | 223 | } |
224 | 224 | ||
225 | printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx." | 225 | printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " |
226 | "Firmware bus number: %d->%d\n", | 226 | "Firmware bus number: %d->%d\n", |
227 | (unsigned long long)rsrc.start, hose->first_busno, | 227 | (unsigned long long)rsrc.start, hose->first_busno, |
228 | hose->last_busno); | 228 | hose->last_busno); |