Merge commit 'v2.6.32-rc7' into core/iommu

Merge reason: Add fixes we'll depend on.

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

1 files changed, 1 insertions, 0 deletions

diff --git a/mm/ksm.c b/mm/ksm.c
index bef1af4f77e3..5575f8628fef 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1012,6 +1012,7 @@ static struct rmap_item *unstable_tree_search_insert(struct page *page,
                 struct rmap_item *tree_rmap_item;
                 int ret;
 
+                cond_resched();
                 tree_rmap_item = rb_entry(*new, struct rmap_item, node);
                 page2[0] = get_mergeable_page(tree_rmap_item);
                 if (!page2[0])