diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-11 15:16:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-11 15:16:05 +1100 |
| commit | f4042d4f94a4a7014ade3e23e2fe4e5d0459b519 (patch) | |
| tree | 2cf3343ff70a8be022e342501d9336c27e3e3ebf /include/linux/signalfd.h | |
| parent | 075f112256728ada2090369b23ba97fcf117ddd9 (diff) | |
| parent | 8a5d4a327ec1679a0842f53117495b4eaab66aef (diff) | |
Merge remote branch 'hwpoison/hwpoison'
Diffstat (limited to 'include/linux/signalfd.h')
| -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 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]; }; |