Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184605
b: refs/heads/master
c: 0da2b30
h: refs/heads/master
i:
  184603: 3cc615c
v: v3
  • Loading branch information
Frans Pop authored and David S. Miller committed Feb 12, 2010
1 parent 5996ed5 commit ed6b4d3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 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: 1349ea08e8de7b3e09998f33ea4e6c74f3e0db1a
refs/heads/master: 0da2b300b91ddeb9944c3fb4faaf78c1c482c0af
2 changes: 1 addition & 1 deletion trunk/arch/sparc/kernel/leon_kernel.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void __init leon_init_timers(irq_handler_t counter_fn)

if (!(LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config) &
(1<<LEON3_GPTIMER_SEPIRQ))) {
prom_printf("irq timer not configured with seperate irqs \n");
prom_printf("irq timer not configured with separate irqs\n");
BUG();
}

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/sparc/kernel/leon_smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ void __init leon_boot_cpus(void)
int nrcpu = leon_smp_nrcpus();
int me = smp_processor_id();

printk(KERN_INFO "%d:(%d:%d) cpus mpirq at 0x%x \n", (unsigned int)me,
printk(KERN_INFO "%d:(%d:%d) cpus mpirq at 0x%x\n", (unsigned int)me,
(unsigned int)nrcpu, (unsigned int)NR_CPUS,
(unsigned int)&(leon3_irqctrl_regs->mpstatus));

Expand Down Expand Up @@ -226,7 +226,7 @@ int __cpuinit leon_boot_one_cpu(int i)
break;
udelay(200);
}
printk(KERN_INFO "Started CPU %d \n", (unsigned int)i);
printk(KERN_INFO "Started CPU %d\n", (unsigned int)i);

if (!(cpu_callin_map[i])) {
printk(KERN_ERR "Processor %d is stuck.\n", i);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sparc/kernel/sun4d_smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ int __cpuinit smp4d_boot_one_cpu(int i)
smp_penguin_ctable.reg_size = 0;

/* whirrr, whirrr, whirrrrrrrrr... */
SMP_PRINTK(("Starting CPU %d at %p \n", i, entry));
SMP_PRINTK(("Starting CPU %d at %p\n", i, entry));
local_flush_cache_all();
prom_startcpu(cpu_node,
&smp_penguin_ctable, 0, (char *)entry);
Expand Down

0 comments on commit ed6b4d3

Please sign in to comment.