]> err.no Git - linux-2.6/commitdiff
[IA64] eliminate softlockup warning
authorJohn Hawkes <hawkes@sgi.com>
Thu, 19 Jan 2006 07:46:53 +0000 (23:46 -0800)
committerTony Luck <tony.luck@intel.com>
Thu, 19 Jan 2006 19:18:25 +0000 (11:18 -0800)
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/uncached.c

index b631cf86ed445b60d4417b2ad37f8cfec506744d..fcd2bad0286fc943b77a3c274a4beb4eca269540 100644 (file)
@@ -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);