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

Merge branch 'x86/urgent' into x86/core

Browse Source 
Conflicts:
	arch/x86/include/asm/fixmap_64.h
Semantic merge:
	arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-03-05 21:48:31 +01:00
parent f254f3909e dd4124a8a0
commit a1413c89ae
43 changed files with 356 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
init/main.c
View File

@ -98,7 +98,7 @@ static inline void mark_rodata_ro(void) { }
extern void tc_init(void);
#endif
enum system_states system_state;
enum system_states system_state __read_mostly;
EXPORT_SYMBOL(system_state);
/*
@ -464,6 +464,7 @@ static noinline void __init_refok rest_init(void)
* at least once to get things moving:
*/
init_idle_bootup_task(current);
rcu_scheduler_starting();
preempt_enable_no_resched();
schedule();
preempt_disable();