diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-05 00:58:26 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-05 00:58:26 (GMT) |
| commit | 327641da8e3e227f42690479182b896fd19486be (patch) | |
| tree | 05fa7f317e854f2da5d46d4c8977486d71bb2b21 /arch/x86/include/asm | |
| parent | 1f4f931501e9270c156d05ee76b7b872de486304 (diff) | |
| parent | ef3892bd63420380d115f755d351d2071f1f805f (diff) | |
| download | linux-fsl-qoriq-327641da8e3e227f42690479182b896fd19486be.tar.xz | |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/x86/include/asm')
| -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 befa20b..656d02e 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -768,7 +768,8 @@ extern int sysenter_setup(void); extern struct desc_ptr early_gdt_descr; extern void cpu_set_gdt(int); -extern void switch_to_new_gdt(void); +extern void switch_to_new_gdt(int); +extern void load_percpu_segment(int); extern void cpu_init(void); static inline unsigned long get_debugctlmsr(void) |