diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-03-24 23:42:45 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-03-24 23:42:45 -0400 |
| commit | e226e34165d6ea827fcbd6fbf4df49090c4d0dbc (patch) | |
| tree | 05d472b77db4e3dd68ea1277e0b966263040dcec /include/linux/sched.h | |
| parent | 5bbcf5e6abe97485748b51ea0713cc3012b4a8f0 (diff) | |
| parent | cafe563591446cf80bfbc2fe3bc72a2e36cf1060 (diff) | |
Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index d35d2b6ddbfb..a8482d063bc3 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1576,6 +1576,10 @@ struct task_struct { | |||
| 1576 | #ifdef CONFIG_UPROBES | 1576 | #ifdef CONFIG_UPROBES |
| 1577 | struct uprobe_task *utask; | 1577 | struct uprobe_task *utask; |
| 1578 | #endif | 1578 | #endif |
| 1579 | #if defined(CONFIG_BCACHE) || defined(CONFIG_BCACHE_MODULE) | ||
| 1580 | unsigned int sequential_io; | ||
| 1581 | unsigned int sequential_io_avg; | ||
| 1582 | #endif | ||
| 1579 | }; | 1583 | }; |
| 1580 | 1584 | ||
| 1581 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ | 1585 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |