diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:43:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:43:14 -0700 |
commit | 92f53c6f1e47d92b40b1e9e1662b0056c783b962 (patch) | |
tree | 850cba7afebec402f8db3fa6e9ea5199e858ffd7 /fs | |
parent | ff69c00f0a58383f1f60dd2756e54a857f08d249 (diff) | |
parent | 40044ce0bf2b7e548584d91f108444e83ed5eab3 (diff) | |
download | op-kernel-dev-92f53c6f1e47d92b40b1e9e1662b0056c783b962.zip op-kernel-dev-92f53c6f1e47d92b40b1e9e1662b0056c783b962.tar.gz |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "unexport bio_{,un}map_user"
relay: fix subbuf_splice_actor() adding too many pages
The ps2esdi driver was marked as BROKEN more than two years ago due to being
Diffstat (limited to 'fs')
-rw-r--r-- | fs/bio.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1194,6 +1194,8 @@ EXPORT_SYMBOL(bio_hw_segments); EXPORT_SYMBOL(bio_add_page); EXPORT_SYMBOL(bio_add_pc_page); EXPORT_SYMBOL(bio_get_nr_vecs); +EXPORT_SYMBOL(bio_map_user); +EXPORT_SYMBOL(bio_unmap_user); EXPORT_SYMBOL(bio_map_kern); EXPORT_SYMBOL(bio_pair_release); EXPORT_SYMBOL(bio_split); |