Merge branch 'akpm-current/current'

[karo-tx-linux.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 3256c7e1c43aed014593514a195fdcb32ee01651..d17c5385c38ccbd201c4215c60d526656952cf55 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3601,6 +3601,10 @@ __weak const char *arch_vma_name(struct vm_area_struct *vma)
 
 void __init signals_init(void)
 {
+       /* If this check fails, the __ARCH_SI_PREAMBLE_SIZE value is wrong! */
+       BUILD_BUG_ON(__ARCH_SI_PREAMBLE_SIZE
+               != offsetof(struct siginfo, _sifields._pad));
+
        sigqueue_cachep = KMEM_CACHE(sigqueue, SLAB_PANIC);
 }