TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cpus4096' into irq/threaded

Browse Source 
Conflicts:
	arch/parisc/kernel/irq.c
	kernel/irq/handle.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2009-03-23 14:50:03 +01:00
parent b3e3b302cf 8c083f081d
commit 80c5520811
533 changed files with 20303 additions and 19208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/tsc.c
View File

@@ -793,7 +793,7 @@ __cpuinit int unsynchronized_tsc(void)
if (!cpu_has_tsc || tsc_unstable)
return 1;
#ifdef CONFIG_X86_SMP
#ifdef CONFIG_SMP
if (apic_is_clustered_box())
return 1;
#endif