diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-23 08:02:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-23 08:02:09 +0200 |
| commit | d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6 (patch) | |
| tree | 2aa6702ee7c153d909a820ae9fda14d35877e59e /drivers/char/mem.c | |
| parent | 90edf27fb89241917e91155bfdcc7c8e5a587222 (diff) | |
| parent | c79bd89282136a4516e842fa542d6abf902ddeac (diff) | |
| download | linux-next-d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6.tar.gz | |
Merge branch 'linus' into perf/core
Conflicts:
arch/sparc/kernel/perf_event.c
Merge reason: Resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/mem.c')
| -rw-r--r-- | drivers/char/mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index a398ecdbd758..1f528fad3516 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -788,10 +788,11 @@ static const struct file_operations zero_fops = { /* * capabilities for /dev/zero * - permits private mappings, "copies" are taken of the source of zeros + * - no writeback happens */ static struct backing_dev_info zero_bdi = { .name = "char/mem", - .capabilities = BDI_CAP_MAP_COPY, + .capabilities = BDI_CAP_MAP_COPY | BDI_CAP_NO_ACCT_AND_WRITEBACK, }; static const struct file_operations full_fops = { |