From 720249e4759a7bd0ce01ddab3c2a1a2e6e374cc2 Mon Sep 17 00:00:00 2001
From: John Hawkes <hawkes@sgi.com>
Date: Wed, 18 Jan 2006 23:46:53 -0800
Subject: [PATCH] --- yaml --- r: 19019 b: refs/heads/master c:
 386d1d50c8eef254653b1015fde06622ef38ba76 h: refs/heads/master i:   19017:
 7a6af232432bad210a8eef58fd8d7438e888fb3b   19015:
 9d34c47a602808518ede8364cb12b8a211a32863 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/ia64/kernel/uncached.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3d6dbd42ae35..af7435dc4358 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60f1c4443c4d391d8dfbe709f13296067b6c8021
+refs/heads/master: 386d1d50c8eef254653b1015fde06622ef38ba76
diff --git a/trunk/arch/ia64/kernel/uncached.c b/trunk/arch/ia64/kernel/uncached.c
index b631cf86ed44..fcd2bad0286f 100644
--- a/trunk/arch/ia64/kernel/uncached.c
+++ b/trunk/arch/ia64/kernel/uncached.c
@@ -210,6 +210,7 @@ uncached_build_memmap(unsigned long start, unsigned long end, void *arg)
 
 	dprintk(KERN_ERR "uncached_build_memmap(%lx %lx)\n", start, end);
 
+	touch_softlockup_watchdog();
 	memset((char *)start, 0, length);
 
 	node = paddr_to_nid(start - __IA64_UNCACHED_OFFSET);