mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'generic-ipi' into generic-ipi-for-linus
Conflicts: arch/powerpc/Kconfig arch/s390/kernel/time.c arch/x86/kernel/apic_32.c arch/x86/kernel/cpu/perfctr-watchdog.c arch/x86/kernel/i8259_64.c arch/x86/kernel/ldt.c arch/x86/kernel/nmi_64.c arch/x86/kernel/smpboot.c arch/x86/xen/smp.c include/asm-x86/hw_irq_32.h include/asm-x86/hw_irq_64.h include/asm-x86/mach-default/irq_vectors.h include/asm-x86/mach-voyager/irq_vectors.h include/asm-x86/smp.h kernel/Makefile Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
commit
1a781a777b
125 changed files with 881 additions and 1787 deletions
|
|
@ -31,6 +31,7 @@
|
|||
#include <linux/kernel_stat.h>
|
||||
#include <linux/start_kernel.h>
|
||||
#include <linux/security.h>
|
||||
#include <linux/smp.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/profile.h>
|
||||
#include <linux/rcupdate.h>
|
||||
|
|
@ -779,6 +780,7 @@ static void __init do_pre_smp_initcalls(void)
|
|||
{
|
||||
extern int spawn_ksoftirqd(void);
|
||||
|
||||
init_call_single_data();
|
||||
migration_init();
|
||||
spawn_ksoftirqd();
|
||||
if (!nosoftlockup)
|
||||
|
|
|
|||
Loading…
Reference in a new issue