summaryrefslogtreecommitdiffstats
path: root/arch/um/include/skas/skas.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-03-31 05:35:56 +0200
committerSteve French <sfrench@us.ibm.com>2006-03-31 05:35:56 +0200
commitd62e54abca1146981fc9f98f85ff398a113a22c2 (patch)
tree870420dbc4c65e716dcef8a802aafdc0ef97a8b4 /arch/um/include/skas/skas.h
parentMerge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 (diff)
downloadlinux-d62e54abca1146981fc9f98f85ff398a113a22c2.tar.xz
linux-d62e54abca1146981fc9f98f85ff398a113a22c2.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/um/include/skas/skas.h')
-rw-r--r--arch/um/include/skas/skas.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/include/skas/skas.h b/arch/um/include/skas/skas.h
index 86357282d681..853b26f148c5 100644
--- a/arch/um/include/skas/skas.h
+++ b/arch/um/include/skas/skas.h
@@ -17,7 +17,6 @@ extern int user_thread(unsigned long stack, int flags);
extern void new_thread_proc(void *stack, void (*handler)(int sig));
extern void new_thread_handler(int sig);
extern void handle_syscall(union uml_pt_regs *regs);
-extern void user_signal(int sig, union uml_pt_regs *regs, int pid);
extern int new_mm(unsigned long stack);
extern void get_skas_faultinfo(int pid, struct faultinfo * fi);
extern long execute_syscall_skas(void *r);