From: Joerg Roedel <jroedel@suse.de>
Date: Mon, 21 Jul 2014 12:27:02 +0200
Subject: PM / Hibernate: Touch Soft Lockup Watchdog in rtree_next_node
Git-commit: 0f7d83e85dbd5bb8032ebed7713edf59670fb074
Patch-mainline: v3.17-rc1
References: bnc#860441

When a memory bitmap is fully populated on a large memory
machine (several TB of RAM) it can take more than a minute
to walk through all bits. This causes the soft lockup
detector on these machine to report warnings.

Avoid this by touching the soft lockup watchdog in the
memory bitmap walking code.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 kernel/power/snapshot.c | 1 +
 1 file changed, 1 insertion(+)

Index: linux-3.0-SLE11-SP3/kernel/power/snapshot.c
===================================================================
--- linux-3.0-SLE11-SP3.orig/kernel/power/snapshot.c
+++ linux-3.0-SLE11-SP3/kernel/power/snapshot.c
@@ -768,6 +768,7 @@ static bool rtree_next_node(struct memor
 	if (&bm->cur.node->list != &bm->cur.zone->leaves) {
 		bm->cur.node_pfn += BM_BITS_PER_BLOCK;
 		bm->cur.node_bit  = 0;
+		touch_softlockup_watchdog();
 		return true;
 	}
 
