lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IA64] Add missing "space" to concatenated strings

Browse Source 
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Joe Perches
2007-11-19 17:47:53 -08:00
committed by Tony Luck
parent 685c7f5d36
commit c2eeb321a8
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/ia64/kernel/kprobes.c
View File

@@ -182,8 +182,8 @@ static int __kprobes unsupported_inst(uint template, uint slot,
qp = kprobe_inst & 0x3f; qp = kprobe_inst & 0x3f;
if (is_cmp_ctype_unc_inst(template, slot, major_opcode, kprobe_inst)) { if (is_cmp_ctype_unc_inst(template, slot, major_opcode, kprobe_inst)) {
if (slot == 1 && qp) { if (slot == 1 && qp) {
printk(KERN_WARNING "Kprobes on cmp unc" printk(KERN_WARNING "Kprobes on cmp unc "
"instruction on slot 1 at <0x%lx>" "instruction on slot 1 at <0x%lx> "
"is not supported\n", addr); "is not supported\n", addr);
return -EINVAL; return -EINVAL;
@@ -221,8 +221,8 @@ static int __kprobes unsupported_inst(uint template, uint slot,
* bit 12 to be equal to 1 * bit 12 to be equal to 1
*/ */
if (slot == 1 && qp) { if (slot == 1 && qp) {
printk(KERN_WARNING "Kprobes on test bit" printk(KERN_WARNING "Kprobes on test bit "
"instruction on slot at <0x%lx>" "instruction on slot at <0x%lx> "
"is not supported\n", addr); "is not supported\n", addr);
return -EINVAL; return -EINVAL;
} }
@@ -242,7 +242,7 @@ static int __kprobes unsupported_inst(uint template, uint slot,
*/ */
int x6=(kprobe_inst >> 27) & 0x3F; int x6=(kprobe_inst >> 27) & 0x3F;
if ((x6 == 0x10) || (x6 == 0x11)) { if ((x6 == 0x10) || (x6 == 0x11)) {
printk(KERN_WARNING "Kprobes on" printk(KERN_WARNING "Kprobes on "
"Indirect Predict is not supported\n"); "Indirect Predict is not supported\n");
return -EINVAL; return -EINVAL;
} }

2
arch/ia64/mm/tlb.c
View File

@@ -180,7 +180,7 @@ ia64_tlb_init (void)
long status; long status;
if ((status = ia64_pal_vm_page_size(&tr_pgbits, &purge.mask)) != 0) { if ((status = ia64_pal_vm_page_size(&tr_pgbits, &purge.mask)) != 0) {
printk(KERN_ERR "PAL_VM_PAGE_SIZE failed with status=%ld;" printk(KERN_ERR "PAL_VM_PAGE_SIZE failed with status=%ld; "
"defaulting to architected purge page-sizes.\n", status); "defaulting to architected purge page-sizes.\n", status);
purge.mask = 0x115557000UL; purge.mask = 0x115557000UL;
} }

2
arch/ia64/sn/kernel/io_common.c
View File

@@ -347,7 +347,7 @@ sn_common_bus_fixup(struct pci_bus *bus,
if (controller->node >= num_online_nodes()) { if (controller->node >= num_online_nodes()) {
struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus); struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u" printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u "
"L_IO=%lx L_MEM=%lx BASE=%lx\n", "L_IO=%lx L_MEM=%lx BASE=%lx\n",
b->bs_asic_type, b->bs_xid, b->bs_persist_busnum, b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
b->bs_legacy_io, b->bs_legacy_mem, b->bs_base); b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);