diff options
author | John Hawkes <hawkes@sgi.com> | 2006-01-18 23:46:53 -0800 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-01-19 11:18:25 -0800 |
commit | 386d1d50c8eef254653b1015fde06622ef38ba76 (patch) | |
tree | 1ca8afb829cb19bfe42ebdbde0216a3bf8a12b59 /arch | |
parent | 60f1c4443c4d391d8dfbe709f13296067b6c8021 (diff) | |
download | blackbird-op-linux-386d1d50c8eef254653b1015fde06622ef38ba76.tar.gz blackbird-op-linux-386d1d50c8eef254653b1015fde06622ef38ba76.zip |
[IA64] eliminate softlockup warning
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/kernel/uncached.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c index b631cf86ed44..fcd2bad0286f 100644 --- 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); |