projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arkfb: new framebuffer driver for ARK Logic cards
[powerpc.git]
/
include
/
linux
/
blkdev.h
diff --git
a/include/linux/blkdev.h
b/include/linux/blkdev.h
index
36a6eac
..
db5b00a
100644
(file)
--- a/
include/linux/blkdev.h
+++ b/
include/linux/blkdev.h
@@
-82,7
+82,6
@@
struct cfq_io_context {
unsigned long last_end_request;
sector_t last_request_pos;
unsigned long last_end_request;
sector_t last_request_pos;
- unsigned long last_queue;
unsigned long ttime_total;
unsigned long ttime_samples;
unsigned long ttime_total;
unsigned long ttime_samples;
@@
-117,6
+116,7
@@
struct io_context {
struct as_io_context *aic;
struct rb_root cic_root;
struct as_io_context *aic;
struct rb_root cic_root;
+ void *ioc_data;
};
void put_io_context(struct io_context *ioc);
};
void put_io_context(struct io_context *ioc);
@@
-854,7
+854,7
@@
static inline void put_dev_sector(Sector p)
struct work_struct;
int kblockd_schedule_work(struct work_struct *work);
struct work_struct;
int kblockd_schedule_work(struct work_struct *work);
-void kblockd_flush
(void
);
+void kblockd_flush
_work(struct work_struct *work
);
#define MODULE_ALIAS_BLOCKDEV(major,minor) \
MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))
#define MODULE_ALIAS_BLOCKDEV(major,minor) \
MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))