---

yaml --- r: 19019 b: refs/heads/master c: 386d1d5 h: refs/heads/master i: 19017: 7a6af23 19015: 9d34c47 v: v3
git-mirror · Jan 19, 2006 · 720249e · 720249e
1 parent 0fd4b8b
commit 720249e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);