This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-arm / signal.h

diff --git a/include/asm-arm/signal.h b/include/asm-arm/signal.h
index b033e5f..6d623e2 100644 (file)
--- a/include/asm-arm/signal.h
+++ b/include/asm-arm/signal.h
@@ -133,11 +133,7 @@ typedef unsigned long sigset_t;
 #define SIG_SETMASK        2   /* for setting the signal mask */
 
 /* Type of a signal handler.  */
-typedef void __signalfn_t(int);
-typedef __signalfn_t __user *__sighandler_t;
-
-typedef void __restorefn_t(void);
-typedef __restorefn_t __user *__sigrestore_t;
+typedef void (*__sighandler_t)(int);
 
 #define SIG_DFL        ((__sighandler_t)0)     /* default signal handling */
 #define SIG_IGN        ((__sighandler_t)1)     /* ignore signal */
@@ -148,13 +144,13 @@ struct old_sigaction {
        __sighandler_t sa_handler;
        old_sigset_t sa_mask;
        unsigned long sa_flags;
-       __sigrestore_t sa_restorer;
+       void (*sa_restorer)(void);
 };
 
 struct sigaction {
        __sighandler_t sa_handler;
        unsigned long sa_flags;
-       __sigrestore_t sa_restorer;
+       void (*sa_restorer)(void);
        sigset_t sa_mask;               /* mask last for extensibility */
 };
 
@@ -181,7 +177,7 @@ struct sigaction {
 #endif /* __KERNEL__ */
 
 typedef struct sigaltstack {
-       void __user *ss_sp;
+       void *ss_sp;
        int ss_flags;
        size_t ss_size;
 } stack_t;