diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-02 07:43:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-02 07:43:53 -0700 |
| commit | 6be9f7b2835fa442f6b892f174dabc4023c0af2e (patch) | |
| tree | 246a949b7f27f9eed2d52ff78751231b392c7420 /include/linux | |
| parent | 8774b7f63be0d1b237bc30d49b6486f7691e2ed4 (diff) | |
| parent | 34e6bbf23c8f43e8713d9bd092680f1660494b4a (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: fix rcu freeing of cfq io contexts
Fix bounce setting for 64-bit
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/iocontext.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h index 1b4ccf25b4d..cac4b364cd4 100644 --- a/include/linux/iocontext.h +++ b/include/linux/iocontext.h @@ -2,6 +2,7 @@ #define IOCONTEXT_H #include <linux/radix-tree.h> +#include <linux/rcupdate.h> /* * This is the per-process anticipatory I/O scheduler state. @@ -54,6 +55,8 @@ struct cfq_io_context { void (*dtor)(struct io_context *); /* destructor */ void (*exit)(struct io_context *); /* called on task exit */ + + struct rcu_head rcu_head; }; /* |