Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / uncached.c

diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index b631cf86ed445b60d4417b2ad37f8cfec506744d..fcd2bad0286fc943b77a3c274a4beb4eca269540 100644 (file)
--- a/arch/ia64/kernel/uncached.c
+++ b/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);