aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include
diff options
context:
space:
mode:
authorGennady Sharapov <Gennady.V.Sharapov@intel.com>2006-01-18 20:42:41 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 22:20:19 -0500
commit4fef0c10fa174b57a10854b8b4b2b90d155706e0 (patch)
tree02cfcc989114da9a6d46484753937cc0e3a60b52 /arch/um/include
parent12919aa6e015dd85170fc3b1a3e10a5dfd116c72 (diff)
[PATCH] uml: move libc-dependent utility procedures
The serial UML OS-abstraction layer patch (um/kernel dir). This moves all systemcalls from user_util.c file under os-Linux dir Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com> Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/include')
-rw-r--r--arch/um/include/os.h10
-rw-r--r--arch/um/include/user_util.h18
2 files changed, 10 insertions, 18 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index dd72d66cf0ed..7f27dfe0ecac 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -195,6 +195,8 @@ extern unsigned long long os_usecs(void);
195/* tt.c 195/* tt.c
196 * for tt mode only (will be deleted in future...) 196 * for tt mode only (will be deleted in future...)
197 */ 197 */
198extern void stop(void);
199extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
198extern int protect_memory(unsigned long addr, unsigned long len, 200extern int protect_memory(unsigned long addr, unsigned long len,
199 int r, int w, int x, int must_succeed); 201 int r, int w, int x, int must_succeed);
200extern void forward_pending_sigio(int target); 202extern void forward_pending_sigio(int target);
@@ -235,4 +237,12 @@ extern int set_signals(int enable);
235extern void os_fill_handlinfo(struct kern_handlers h); 237extern void os_fill_handlinfo(struct kern_handlers h);
236extern void do_longjmp(void *p, int val); 238extern void do_longjmp(void *p, int val);
237 239
240/* util.c */
241extern void stack_protections(unsigned long address);
242extern void task_protections(unsigned long address);
243extern int raw(int fd);
244extern void setup_machinename(char *machine_out);
245extern void setup_hostinfo(void);
246extern int setjmp_wrapper(void (*proc)(void *, void *), ...);
247
238#endif 248#endif
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index c1dbd77b073f..a6f1f176cf84 100644
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
@@ -44,10 +44,6 @@ extern unsigned long brk_start;
44extern int pty_output_sigio; 44extern int pty_output_sigio;
45extern int pty_close_sigio; 45extern int pty_close_sigio;
46 46
47extern void stop(void);
48extern void stack_protections(unsigned long address);
49extern void task_protections(unsigned long address);
50extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
51extern void *add_signal_handler(int sig, void (*handler)(int)); 47extern void *add_signal_handler(int sig, void (*handler)(int));
52extern int linux_main(int argc, char **argv); 48extern int linux_main(int argc, char **argv);
53extern void set_cmdline(char *cmd); 49extern void set_cmdline(char *cmd);
@@ -55,8 +51,6 @@ extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
55extern int get_pty(void); 51extern int get_pty(void);
56extern void *um_kmalloc(int size); 52extern void *um_kmalloc(int size);
57extern int switcheroo(int fd, int prot, void *from, void *to, int size); 53extern int switcheroo(int fd, int prot, void *from, void *to, int size);
58extern void setup_machinename(char *machine_out);
59extern void setup_hostinfo(void);
60extern void do_exec(int old_pid, int new_pid); 54extern void do_exec(int old_pid, int new_pid);
61extern void tracer_panic(char *msg, ...); 55extern void tracer_panic(char *msg, ...);
62extern int detach(int pid, int sig); 56extern int detach(int pid, int sig);
@@ -70,18 +64,6 @@ extern int cpu_feature(char *what, char *buf, int len);
70extern int arch_handle_signal(int sig, union uml_pt_regs *regs); 64extern int arch_handle_signal(int sig, union uml_pt_regs *regs);
71extern int arch_fixup(unsigned long address, void *sc_ptr); 65extern int arch_fixup(unsigned long address, void *sc_ptr);
72extern void arch_init_thread(void); 66extern void arch_init_thread(void);
73extern int setjmp_wrapper(void (*proc)(void *, void *), ...);
74extern int raw(int fd); 67extern int raw(int fd);
75 68
76#endif 69#endif
77
78/*
79 * Overrides for Emacs so that we follow Linus's tabbing style.
80 * Emacs will notice this stuff at the end of the file and automatically
81 * adjust the settings for this buffer only. This must remain at the end
82 * of the file.
83 * ---------------------------------------------------------------------------
84 * Local variables:
85 * c-file-style: "linux"
86 * End:
87 */