diff options
| author | Andi Kleen <ak@linux.intel.com> | 2010-10-22 17:40:07 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2010-10-22 17:40:07 +0200 |
| commit | df27570f43923c246567b074418411c06cf0dce2 (patch) | |
| tree | 1390735b5232b579f6eb0bb9bb25df019d4ce795 /include | |
| parent | d4429f608abde89e8bc1e24b43cd503feb95c496 (diff) | |
| parent | f7cb8b5ffd16edad64ae16ee38c561f98cbcaa3b (diff) | |
| download | kernel_samsung_aries-df27570f43923c246567b074418411c06cf0dce2.zip kernel_samsung_aries-df27570f43923c246567b074418411c06cf0dce2.tar.gz kernel_samsung_aries-df27570f43923c246567b074418411c06cf0dce2.tar.bz2 | |
Merge branch 'hwpoison-fixes-2.6.37' into hwpoison
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/signalfd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h index b363b91..3ff4961 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]; }; |