diff options
author | David S. Miller <davem@davemloft.net> | 2010-10-07 04:11:17 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-07 04:11:17 +0200 |
commit | 12e94471b2be5ef9b55b10004a3a2cd819490036 (patch) | |
tree | f84ae818687dc7c35bd54f11bfb9717278d28a4e /fs/char_dev.c | |
parent | caif: fix two caif_connect() bugs (diff) | |
parent | Linux 2.6.36-rc7 (diff) | |
download | linux-12e94471b2be5ef9b55b10004a3a2cd819490036.tar.xz linux-12e94471b2be5ef9b55b10004a3a2cd819490036.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/char_dev.c')
-rw-r--r-- | fs/char_dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index f80a4f25123c..143d393881cb 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -40,7 +40,9 @@ struct backing_dev_info directly_mappable_cdev_bdi = { #endif /* permit direct mmap, for read, write or exec */ BDI_CAP_MAP_DIRECT | - BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP), + BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP | + /* no writeback happens */ + BDI_CAP_NO_ACCT_AND_WRITEBACK), }; static struct kobj_map *cdev_map; |