diff options
Diffstat (limited to 'arch/um/include/kern_util.h')
-rw-r--r-- | arch/um/include/kern_util.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h index 578156db3039..9d3110f41ddb 100644 --- a/arch/um/include/kern_util.h +++ b/arch/um/include/kern_util.h | |||
@@ -10,7 +10,7 @@ | |||
10 | #include "sysdep/faultinfo.h" | 10 | #include "sysdep/faultinfo.h" |
11 | #include "uml-config.h" | 11 | #include "uml-config.h" |
12 | 12 | ||
13 | typedef void (*kern_hndl)(int, union uml_pt_regs *); | 13 | typedef void (*kern_hndl)(int, struct uml_pt_regs *); |
14 | 14 | ||
15 | struct kern_handlers { | 15 | struct kern_handlers { |
16 | kern_hndl relay_signal; | 16 | kern_hndl relay_signal; |
@@ -41,7 +41,7 @@ extern unsigned long alloc_stack(int order, int atomic); | |||
41 | extern int do_signal(void); | 41 | extern int do_signal(void); |
42 | extern int is_stack_fault(unsigned long sp); | 42 | extern int is_stack_fault(unsigned long sp); |
43 | extern unsigned long segv(struct faultinfo fi, unsigned long ip, | 43 | extern unsigned long segv(struct faultinfo fi, unsigned long ip, |
44 | int is_user, union uml_pt_regs *regs); | 44 | int is_user, struct uml_pt_regs *regs); |
45 | extern int handle_page_fault(unsigned long address, unsigned long ip, | 45 | extern int handle_page_fault(unsigned long address, unsigned long ip, |
46 | int is_write, int is_user, int *code_out); | 46 | int is_write, int is_user, int *code_out); |
47 | extern void syscall_ready(void); | 47 | extern void syscall_ready(void); |
@@ -54,7 +54,7 @@ extern int need_finish_fork(void); | |||
54 | extern void free_stack(unsigned long stack, int order); | 54 | extern void free_stack(unsigned long stack, int order); |
55 | extern void add_input_request(int op, void (*proc)(int), void *arg); | 55 | extern void add_input_request(int op, void (*proc)(int), void *arg); |
56 | extern char *current_cmd(void); | 56 | extern char *current_cmd(void); |
57 | extern void timer_handler(int sig, union uml_pt_regs *regs); | 57 | extern void timer_handler(int sig, struct uml_pt_regs *regs); |
58 | extern int set_signals(int enable); | 58 | extern int set_signals(int enable); |
59 | extern int pid_to_processor_id(int pid); | 59 | extern int pid_to_processor_id(int pid); |
60 | extern void deliver_signals(void *t); | 60 | extern void deliver_signals(void *t); |
@@ -64,9 +64,9 @@ extern void finish_fork(void); | |||
64 | extern void paging_init(void); | 64 | extern void paging_init(void); |
65 | extern void init_flush_vm(void); | 65 | extern void init_flush_vm(void); |
66 | extern void *syscall_sp(void *t); | 66 | extern void *syscall_sp(void *t); |
67 | extern void syscall_trace(union uml_pt_regs *regs, int entryexit); | 67 | extern void syscall_trace(struct uml_pt_regs *regs, int entryexit); |
68 | extern int hz(void); | 68 | extern int hz(void); |
69 | extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs); | 69 | extern unsigned int do_IRQ(int irq, struct uml_pt_regs *regs); |
70 | extern void interrupt_end(void); | 70 | extern void interrupt_end(void); |
71 | extern void initial_thread_cb(void (*proc)(void *), void *arg); | 71 | extern void initial_thread_cb(void (*proc)(void *), void *arg); |
72 | extern int debugger_signal(int status, int pid); | 72 | extern int debugger_signal(int status, int pid); |
@@ -76,9 +76,9 @@ extern int init_ptrace_proxy(int idle_pid, int startup, int stop); | |||
76 | extern int init_parent_proxy(int pid); | 76 | extern int init_parent_proxy(int pid); |
77 | extern int singlestepping(void *t); | 77 | extern int singlestepping(void *t); |
78 | extern void check_stack_overflow(void *ptr); | 78 | extern void check_stack_overflow(void *ptr); |
79 | extern void relay_signal(int sig, union uml_pt_regs *regs); | 79 | extern void relay_signal(int sig, struct uml_pt_regs *regs); |
80 | extern int user_context(unsigned long sp); | 80 | extern int user_context(unsigned long sp); |
81 | extern void timer_irq(union uml_pt_regs *regs); | 81 | extern void timer_irq(struct uml_pt_regs *regs); |
82 | extern void do_uml_exitcalls(void); | 82 | extern void do_uml_exitcalls(void); |
83 | extern int attach_debugger(int idle_pid, int pid, int stop); | 83 | extern int attach_debugger(int idle_pid, int pid, int stop); |
84 | extern int config_gdb(char *str); | 84 | extern int config_gdb(char *str); |
@@ -109,11 +109,9 @@ extern void time_init_kern(void); | |||
109 | 109 | ||
110 | /* Are we disallowed to sleep? Used to choose between GFP_KERNEL and GFP_ATOMIC. */ | 110 | /* Are we disallowed to sleep? Used to choose between GFP_KERNEL and GFP_ATOMIC. */ |
111 | extern int __cant_sleep(void); | 111 | extern int __cant_sleep(void); |
112 | extern void sigio_handler(int sig, union uml_pt_regs *regs); | 112 | extern void sigio_handler(int sig, struct uml_pt_regs *regs); |
113 | 113 | extern void copy_sc(struct uml_pt_regs *regs, void *from); | |
114 | extern void copy_sc(union uml_pt_regs *regs, void *from); | ||
115 | |||
116 | extern unsigned long to_irq_stack(unsigned long *mask_out); | 114 | extern unsigned long to_irq_stack(unsigned long *mask_out); |
117 | unsigned long from_irq_stack(int nested); | 115 | unsigned long from_irq_stack(int nested); |
118 | 116 | extern int start_uml(void); | |
119 | #endif | 117 | #endif |