diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 13:04:34 +0800 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 13:04:34 +0800 |
commit | fc600432cd23e35c85de2ff4468d816d6938a112 (patch) | |
tree | c191c51e4458ec31c1d8254f01e23b2e1574b6f4 /fs/logfs/segment.c | |
parent | db61550931957ee6c7dba751662919424b4344f3 (diff) | |
parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) |
Merge tag 'v3.6-rc4' into asoc-omap
Linux 3.6-rc4
Diffstat (limited to 'fs/logfs/segment.c')
-rw-r--r-- | fs/logfs/segment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c index e28d090c98d..038da099179 100644 --- a/fs/logfs/segment.c +++ b/fs/logfs/segment.c @@ -886,7 +886,7 @@ static struct logfs_area *alloc_area(struct super_block *sb) static void map_invalidatepage(struct page *page, unsigned long l) { - BUG(); + return; } static int map_releasepage(struct page *page, gfp_t g) |