diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-14 07:18:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-14 07:19:04 -0400 |
| commit | 6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e (patch) | |
| tree | 021cc9f6b477146fcebe6f3be4752abfa2ba18a9 /include/linux/mtd/blktrans.h | |
| parent | 682968e0c425c60f0dde37977e5beb2b12ddc4cc (diff) | |
| parent | a385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (diff) | |
Merge branch 'perf/core' into perf/uprobes
Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/mtd/blktrans.h')
| -rw-r--r-- | include/linux/mtd/blktrans.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mtd/blktrans.h b/include/linux/mtd/blktrans.h index 1bbd9f289245..ed270bd2e4df 100644 --- a/include/linux/mtd/blktrans.h +++ b/include/linux/mtd/blktrans.h | |||
| @@ -47,6 +47,7 @@ struct mtd_blktrans_dev { | |||
| 47 | struct request_queue *rq; | 47 | struct request_queue *rq; |
| 48 | spinlock_t queue_lock; | 48 | spinlock_t queue_lock; |
| 49 | void *priv; | 49 | void *priv; |
| 50 | fmode_t file_mode; | ||
| 50 | }; | 51 | }; |
| 51 | 52 | ||
| 52 | struct mtd_blktrans_ops { | 53 | struct mtd_blktrans_ops { |