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

Merge commit 'v2.6.30-rc1' into perfcounters/core

Browse Source 
Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-04-08 10:35:30 +02:00
parent 6c009ecef8 577c9c456f
commit 5ea472a77f
680 changed files with 66551 additions and 20625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/irq.c
View File

@@ -677,11 +677,13 @@ unsigned int irq_create_mapping(struct irq_host *host,
return NO_IRQ;
}
}
pr_debug("irq: -> obtained virq %d\n", virq);
if (irq_setup_virq(host, virq, hwirq))
return NO_IRQ;
printk(KERN_DEBUG "irq: irq %lu on host %s mapped to virtual irq %u\n",
hwirq, host->of_node ? host->of_node->full_name : "null", virq);
return virq;
}
EXPORT_SYMBOL_GPL(irq_create_mapping);