diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-08 09:27:07 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-08 09:27:07 -0800 |
commit | a58f67e70a6cad021ceebd1c8919b898dd5d5de3 (patch) | |
tree | 78cb630cb31a8cbec17463f9acc0f766707c232f /fs/binfmt_elf.c | |
parent | 4c6c826b22da9f6408b6bc6939a92aa0be838488 (diff) | |
parent | 46e446db4fb2cdb2f1bc69d3981fa23738a42835 (diff) | |
download | op-kernel-dev-a58f67e70a6cad021ceebd1c8919b898dd5d5de3.zip op-kernel-dev-a58f67e70a6cad021ceebd1c8919b898dd5d5de3.tar.gz |
Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
* 'dt' of git://github.com/hzhuang1/linux: (6 commits)
Document: devicetree: add OF documents for arch-mmp
ARM: dts: append DTS file of pxa168
ARM: mmp: append OF support on pxa168
ARM: mmp: enable rtc clk in pxa168
i2c: pxa: add OF support
serial: pxa: add OF support
(plus update to v3.3-rc6)
Diffstat (limited to 'fs/binfmt_elf.c')
-rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index bcb884e..07d096c 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1421,7 +1421,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t, for (i = 1; i < view->n; ++i) { const struct user_regset *regset = &view->regsets[i]; do_thread_regset_writeback(t->task, regset); - if (regset->core_note_type && + if (regset->core_note_type && regset->get && (!regset->active || regset->active(t->task, regset))) { int ret; size_t size = regset->n * regset->size; |