diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 06:16:59 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 06:16:59 -0500 |
| commit | eca217b36e5d7d4377493d5cedd89105e66a5a72 (patch) | |
| tree | 71f0ecd5225c3033d509b77a23ad7bc576cf0ab6 /arch/x86/include/asm/processor.h | |
| parent | 54a353a0f845c1dad5fc8183872e750d667838ac (diff) | |
| parent | e4d0407185cdbdcfd99fc23bde2e5454bbc46329 (diff) | |
Merge branch 'x86/paravirt' into x86/apic
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 84afa0d4d717..d211f9551998 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h | |||
| @@ -768,7 +768,8 @@ extern int sysenter_setup(void); | |||
| 768 | extern struct desc_ptr early_gdt_descr; | 768 | extern struct desc_ptr early_gdt_descr; |
| 769 | 769 | ||
| 770 | extern void cpu_set_gdt(int); | 770 | extern void cpu_set_gdt(int); |
| 771 | extern void switch_to_new_gdt(void); | 771 | extern void switch_to_new_gdt(int); |
| 772 | extern void load_percpu_segment(int); | ||
| 772 | extern void cpu_init(void); | 773 | extern void cpu_init(void); |
| 773 | 774 | ||
| 774 | static inline unsigned long get_debugctlmsr(void) | 775 | static inline unsigned long get_debugctlmsr(void) |