diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:14:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:14:58 -0400 |
| commit | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce (patch) | |
| tree | d4c5eba8cd2abefd7c9f16d089393f0f5999cf63 /include/asm-x86/smp.h | |
| parent | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (diff) | |
| parent | 9340e1ccdf7b9b22a2be7f51cd74e8b5e11961bf (diff) | |
Merge branch 'x86/mpparse' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/setup_64.c
arch/x86/mm/init_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/smp.h')
| -rw-r--r-- | include/asm-x86/smp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index 1ebaa5cd3112..514e52b95cef 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h | |||
| @@ -201,7 +201,6 @@ extern void cpu_exit_clear(void); | |||
| 201 | extern void cpu_uninit(void); | 201 | extern void cpu_uninit(void); |
| 202 | #endif | 202 | #endif |
| 203 | 203 | ||
| 204 | extern void smp_alloc_memory(void); | ||
| 205 | extern void lock_ipi_call_lock(void); | 204 | extern void lock_ipi_call_lock(void); |
| 206 | extern void unlock_ipi_call_lock(void); | 205 | extern void unlock_ipi_call_lock(void); |
| 207 | #endif /* __ASSEMBLY__ */ | 206 | #endif /* __ASSEMBLY__ */ |