Rev 1888 | Rev 1956 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1888 | Rev 1901 | ||
|---|---|---|---|
| Line 60... | Line 60... | ||
| 60 | #include <arch/debugger.h> |
60 | #include <arch/debugger.h> |
| 61 | #include <proc/thread.h> |
61 | #include <proc/thread.h> |
| 62 | #include <syscall/syscall.h> |
62 | #include <syscall/syscall.h> |
| 63 | #include <console/console.h> |
63 | #include <console/console.h> |
| 64 | 64 | ||
| - | 65 | #ifdef CONFIG_SMP |
|
| - | 66 | #include <arch/smp/apic.h> |
|
| - | 67 | #endif |
|
| - | 68 | ||
| 65 | void arch_pre_mm_init(void) |
69 | void arch_pre_mm_init(void) |
| 66 | { |
70 | { |
| 67 | pm_init(); |
71 | pm_init(); |
| 68 | 72 | ||
| 69 | if (config.cpu_active == 1) { |
73 | if (config.cpu_active == 1) { |
| Line 97... | Line 101... | ||
| 97 | /* Merge all memory zones to 1 big zone */ |
101 | /* Merge all memory zones to 1 big zone */ |
| 98 | zone_merge_all(); |
102 | zone_merge_all(); |
| 99 | } |
103 | } |
| 100 | } |
104 | } |
| 101 | 105 | ||
| - | 106 | void arch_post_cpu_init() |
|
| - | 107 | { |
|
| - | 108 | #ifdef CONFIG_SMP |
|
| - | 109 | if (config.cpu_active > 1) { |
|
| - | 110 | l_apic_init(); |
|
| - | 111 | l_apic_debug(); |
|
| - | 112 | } |
|
| - | 113 | #endif |
|
| - | 114 | } |
|
| - | 115 | ||
| 102 | void arch_pre_smp_init(void) |
116 | void arch_pre_smp_init(void) |
| 103 | { |
117 | { |
| 104 | if (config.cpu_active == 1) { |
118 | if (config.cpu_active == 1) { |
| 105 | memory_print_map(); |
119 | memory_print_map(); |
| 106 | 120 | ||