Merge branch 'master' into upstream

[linux-2.6] / mm / truncate.c

diff --git a/mm/truncate.c b/mm/truncate.c
index cd3e34b816db99ce0ae7f487098d0dd9b395d0cf..8fde6580657ed15c860d2f6e5bffa77c88965240 100644 (file)
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -35,8 +35,10 @@ void do_invalidatepage(struct page *page, unsigned long offset)
 {
        void (*invalidatepage)(struct page *, unsigned long);
        invalidatepage = page->mapping->a_ops->invalidatepage;
+#ifdef CONFIG_BLOCK
        if (!invalidatepage)
                invalidatepage = block_invalidatepage;
+#endif
        if (invalidatepage)
                (*invalidatepage)(page, offset);
 }