diff options
author | Paul Mackerras <paulus@samba.org> | 2006-02-28 16:35:24 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 16:35:24 +1100 |
commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
tree | c069f990f86b020a14b50759d0c75475eedde186 /arch/um/include | |
parent | 2cf82c0256b198ae28c465f2c4d7c12c836ea5ea (diff) | |
parent | 56ec6462af9cba56a04439154e5768672d6f390f (diff) | |
download | op-kernel-dev-6749c5507388f3fc3719f57a54b540ee83f6661a.zip op-kernel-dev-6749c5507388f3fc3719f57a54b540ee83f6661a.tar.gz |
Merge ../powerpc-merge
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/init.h | 2 | ||||
-rw-r--r-- | arch/um/include/os.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/um/include/init.h b/arch/um/include/init.h index cbd79a8..d4de7c0 100644 --- a/arch/um/include/init.h +++ b/arch/um/include/init.h @@ -122,7 +122,7 @@ extern struct uml_param __uml_setup_start, __uml_setup_end; #define __exitcall(fn) static exitcall_t __exitcall_##fn __exit_call = fn -#define __init_call __attribute__ ((unused,__section__ (".initcall.init"))) +#define __init_call __attribute_used__ __attribute__ ((__section__ (".initcall.init"))) #endif diff --git a/arch/um/include/os.h b/arch/um/include/os.h index eb1710b..2a1c64d 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -179,8 +179,11 @@ extern void os_stop_process(int pid); extern void os_kill_process(int pid, int reap_child); extern void os_kill_ptraced_process(int pid, int reap_child); extern void os_usr1_process(int pid); +extern long os_ptrace_ldt(long pid, long addr, long data); + extern int os_getpid(void); extern int os_getpgrp(void); + extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int)); extern void init_new_thread_signals(int altstack); extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr); |