xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'x86/asm' into x86/apic, to resolve a conflict

Browse Source 
Conflicts:
	arch/x86/kernel/apic/io_apic.c
	arch/x86/kernel/apic/vector.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2015-05-11 16:05:09 +02:00
parent f5d6a52f51 f21262b8e0
commit 191a66353b
2880 changed files with 105057 additions and 62147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -807,8 +807,6 @@ void common_cpu_up(unsigned int cpu, struct task_struct *idle)
clear_tsk_thread_flag(idle, TIF_FORK);
initial_gs = per_cpu_offset(cpu);
#endif
per_cpu(kernel_stack, cpu) =
(unsigned long)task_stack_page(idle) + THREAD_SIZE;
}
/*