diff options
author | Ingo Molnar | 2009-02-13 09:49:38 +0100 |
---|---|---|
committer | Ingo Molnar | 2009-02-13 09:49:38 +0100 |
commit | b1864e9a1afef41709886072c6e6248def0386f4 (patch) | |
tree | 2fe749209cf860c1dd10efd1bd2ad8df572bd66e /arch/x86/include/asm/proto.h | |
parent | Merge branch 'linus' into perfcounters/core (diff) | |
parent | Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86... (diff) | |
download | kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.tar.gz kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.tar.xz kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.zip |
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); extern void check_efer(void); -#ifdef CONFIG_X86_BIOS_REBOOT extern int reboot_force; -#else -static const int reboot_force = 0; -#endif long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); |