vserver 2.0 rc7

[linux-2.6.git] / include / asm-generic / siginfo.h

diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index 3a3f35d..8786e01 100644 (file)
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -3,7 +3,6 @@
 
 #include <linux/compiler.h>
 #include <linux/types.h>
-#include <linux/resource.h>
 
 typedef union sigval {
        int sival_int;
@@ -154,7 +153,6 @@ typedef struct siginfo {
 #define SI_FROMUSER(siptr)     ((siptr)->si_code <= 0)
 #define SI_FROMKERNEL(siptr)   ((siptr)->si_code > 0)
 
-#ifndef HAVE_ARCH_SI_CODES
 /*
  * SIGILL si_codes
  */
@@ -225,8 +223,6 @@ typedef struct siginfo {
 #define POLL_HUP       (__SI_POLL|6)   /* device disconnected */
 #define NSIGPOLL       6
 
-#endif
-
 /*
  * sigevent definitions
  * 
@@ -240,12 +236,17 @@ typedef struct siginfo {
 #define SIGEV_THREAD   2       /* deliver via thread creation */
 #define SIGEV_THREAD_ID 4      /* deliver to thread */
 
-#define SIGEV_MAX_SIZE 64
-#ifndef SIGEV_PAD_SIZE
-#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 3)
+/*
+ * This works because the alignment is ok on all current architectures
+ * but we leave open this being overridden in the future
+ */
+#ifndef __ARCH_SIGEV_PREAMBLE_SIZE
+#define __ARCH_SIGEV_PREAMBLE_SIZE     (sizeof(int) * 2 + sizeof(sigval_t))
 #endif
 
-#ifndef HAVE_ARCH_SIGEVENT_T
+#define SIGEV_MAX_SIZE 64
+#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE - __ARCH_SIGEV_PREAMBLE_SIZE) \
+               / sizeof(int))
 
 typedef struct sigevent {
        sigval_t sigev_value;
@@ -262,8 +263,6 @@ typedef struct sigevent {
        } _sigev_un;
 } sigevent_t;
 
-#endif
-
 #define sigev_notify_function  _sigev_un._sigev_thread._function
 #define sigev_notify_attributes        _sigev_un._sigev_thread._attribute
 #define sigev_notify_thread_id  _sigev_un._tid