From: John Hawkes <hawkes@sgi.com>

Fix an unnecessary softlockup watchdog warning in the ia64
uncached_build_memmap() that occurs occasionally at 256p and always at
512p.  The problem occurs at boot time.

Signed-off-by: John Hawkes <hawkes@sgi.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/ia64/kernel/uncached.c |    1 +
 1 files changed, 1 insertion(+)

diff -puN arch/ia64/kernel/uncached.c~ia64-eliminate-softlockup-warning arch/ia64/kernel/uncached.c
--- devel/arch/ia64/kernel/uncached.c~ia64-eliminate-softlockup-warning	2006-01-05 22:35:39.000000000 -0800
+++ devel-akpm/arch/ia64/kernel/uncached.c	2006-01-05 22:35:39.000000000 -0800
@@ -210,6 +210,7 @@ uncached_build_memmap(unsigned long star
 
 	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);
_