diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:49:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:49:38 -0500 |
| commit | b1864e9a1afef41709886072c6e6248def0386f4 (patch) | |
| tree | 2fe749209cf860c1dd10efd1bd2ad8df572bd66e /arch/x86/include/asm/proto.h | |
| parent | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 (diff) | |
| parent | 7032e8696726354d6180d8a2d17191f958cd93ae (diff) | |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/apic.c
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/x86/include/asm/proto.h')
| -rw-r--r-- | arch/x86/include/asm/proto.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index d6a22f92ba77..49fb3ecf3bb3 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h | |||
| @@ -18,11 +18,7 @@ extern void syscall32_cpu_init(void); | |||
| 18 | 18 | ||
| 19 | extern void check_efer(void); | 19 | extern void check_efer(void); |
| 20 | 20 | ||
| 21 | #ifdef CONFIG_X86_BIOS_REBOOT | ||
| 22 | extern int reboot_force; | 21 | extern int reboot_force; |
| 23 | #else | ||
| 24 | static const int reboot_force = 0; | ||
| 25 | #endif | ||
| 26 | 22 | ||
| 27 | long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); | 23 | long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); |
| 28 | 24 | ||