Merge commit 'v2.6.37-rc1' into for-2.6.37

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h
index b363b916c909..3ff4961da9b5 100644
--- a/include/linux/signalfd.h
+++ b/include/linux/signalfd.h
@@ -33,6 +33,7 @@ struct signalfd_siginfo {
         __u64 ssi_utime;
         __u64 ssi_stime;
         __u64 ssi_addr;
+        __u16 ssi_addr_lsb;
 
         /*
          * Pad strcture to 128 bytes. Remember to update the
@@ -43,7 +44,7 @@ struct signalfd_siginfo {
          * comes out of a read(2) and we really don't want to have
          * a compat on read(2).
          */
-        __u8 __pad[48];
+        __u8 __pad[46];
 };