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

Merge branch 'linus' into x86/mce3

Browse Source 
Conflicts:
	arch/x86/kernel/cpu/mcheck/mce_64.c
	arch/x86/kernel/irq.c

Merge reason: Resolve the conflicts above.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-06-11 23:31:52 +02:00
parent 62fdac5913 512626a04e
commit 0d5959723e
1275 changed files with 87001 additions and 27373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/apic/nmi.c
View File

@@ -104,7 +104,7 @@ static __init void nmi_cpu_busy(void *data)
}
#endif
static void report_broken_nmi(int cpu, int *prev_nmi_count)
static void report_broken_nmi(int cpu, unsigned int *prev_nmi_count)
{
printk(KERN_CONT "\n");