summaryrefslogtreecommitdiff
path: root/include/asm-x86/proto.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86/proto.h')
-rw-r--r--include/asm-x86/proto.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 68563c0709ac..6c8b41b03f6d 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -7,8 +7,6 @@
extern void early_idt_handler(void);
-extern void init_memory_mapping(unsigned long start, unsigned long end);
-
extern void system_call(void);
extern void syscall_init(void);
@@ -22,11 +20,15 @@ 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);
-#define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))
-#define round_down(x,y) ((x) & ~((y)-1))
+#define round_up(x, y) (((x) + (y) - 1) & ~((y) - 1))
+#define round_down(x, y) ((x) & ~((y) - 1))
#endif