diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
| commit | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch) | |
| tree | 57389653c37d001de3a90655cb4172ba29199ce4 /include/asm-i386/processor.h | |
| parent | d344bff9c36db17dc4765215495aaa7212c1eb6c (diff) | |
| parent | 419dd8378dfa32985672ab7927b4bc827f33b332 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-i386/processor.h')
| -rw-r--r-- | include/asm-i386/processor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h index a52d65440429..359f10b54f59 100644 --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h | |||
| @@ -743,6 +743,7 @@ extern void enable_sep_cpu(void); | |||
| 743 | extern int sysenter_setup(void); | 743 | extern int sysenter_setup(void); |
| 744 | 744 | ||
| 745 | extern int init_gdt(int cpu, struct task_struct *idle); | 745 | extern int init_gdt(int cpu, struct task_struct *idle); |
| 746 | extern void cpu_set_gdt(int); | ||
| 746 | extern void secondary_cpu_init(void); | 747 | extern void secondary_cpu_init(void); |
| 747 | 748 | ||
| 748 | #endif /* __ASM_I386_PROCESSOR_H */ | 749 | #endif /* __ASM_I386_PROCESSOR_H */ |