diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/x86/include/asm/proto.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/x86/include/asm/proto.h')
| -rw-r--r-- | arch/x86/include/asm/proto.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index 621f56d7312..4009f6534f5 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h | |||
| @@ -5,18 +5,19 @@ | |||
| 5 | 5 | ||
| 6 | /* misc architecture specific prototypes */ | 6 | /* misc architecture specific prototypes */ |
| 7 | 7 | ||
| 8 | extern void early_idt_handler(void); | 8 | void early_idt_handler(void); |
| 9 | 9 | ||
| 10 | extern void system_call(void); | 10 | void system_call(void); |
| 11 | extern void syscall_init(void); | 11 | void syscall_init(void); |
| 12 | 12 | ||
| 13 | extern void ia32_syscall(void); | 13 | void ia32_syscall(void); |
| 14 | extern void ia32_cstar_target(void); | 14 | void ia32_cstar_target(void); |
| 15 | extern void ia32_sysenter_target(void); | 15 | void ia32_sysenter_target(void); |
| 16 | 16 | ||
| 17 | extern void syscall32_cpu_init(void); | 17 | void syscall32_cpu_init(void); |
| 18 | 18 | ||
| 19 | extern void check_efer(void); | 19 | void x86_configure_nx(void); |
| 20 | void x86_report_nx(void); | ||
| 20 | 21 | ||
| 21 | extern int reboot_force; | 22 | extern int reboot_force; |
| 22 | 23 | ||