Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts:

	include/asm-x86/dma-mapping.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 3 deletions

diff --git a/mm/readahead.c b/mm/readahead.c
index d8723a5f6496..77e8ddf945e9 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -382,9 +382,9 @@ ondemand_readahead(struct address_space *mapping,
         if (hit_readahead_marker) {
                 pgoff_t start;
 
-                read_lock_irq(&mapping->tree_lock);
-                start = radix_tree_next_hole(&mapping->page_tree, offset, max+1);
-                read_unlock_irq(&mapping->tree_lock);
+                rcu_read_lock();
+                start = radix_tree_next_hole(&mapping->page_tree, offset,max+1);
+                rcu_read_unlock();
 
                 if (!start || start - offset > max)
                         return 0;