diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-11 03:41:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-11 03:41:37 -0400 |
| commit | 92254d31444aad272155f7963e65910c402703dd (patch) | |
| tree | 8e454ebe60cbac9a71b1771d4e471cfe54826963 /include/linux/aio.h | |
| parent | 707ecec1dc80d54163356a25d145c62083e7be60 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into x86/mce
Merge Linux 3.5-rc6 before merging more code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/aio.h')
| -rw-r--r-- | include/linux/aio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/aio.h b/include/linux/aio.h index 2314ad8b3c9c..b1a520ec8b59 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h | |||
| @@ -140,6 +140,7 @@ struct kiocb { | |||
| 140 | (x)->ki_dtor = NULL; \ | 140 | (x)->ki_dtor = NULL; \ |
| 141 | (x)->ki_obj.tsk = tsk; \ | 141 | (x)->ki_obj.tsk = tsk; \ |
| 142 | (x)->ki_user_data = 0; \ | 142 | (x)->ki_user_data = 0; \ |
| 143 | (x)->private = NULL; \ | ||
| 143 | } while (0) | 144 | } while (0) |
| 144 | 145 | ||
| 145 | #define AIO_RING_MAGIC 0xa10a10a1 | 146 | #define AIO_RING_MAGIC 0xa10a10a1 |