diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-20 08:59:41 +0000 |
|---|---|---|
| committer | Steven Whitehouse <steve@chygwyn.com> | 2006-01-20 08:59:41 +0000 |
| commit | 044399b2cb6ad2d7f63cfca945268853d7443a4d (patch) | |
| tree | 5f96eb307b0389ac0b919a4744a40862b615e9da /arch/ia64/kernel/uncached.c | |
| parent | 901359256b2666f52a3a7d3f31927677e91b3a2a (diff) | |
| parent | 18a4144028f056b77d6576d4eb284246e9c7ea97 (diff) | |
| download | op-kernel-dev-044399b2cb6ad2d7f63cfca945268853d7443a4d.zip op-kernel-dev-044399b2cb6ad2d7f63cfca945268853d7443a4d.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'arch/ia64/kernel/uncached.c')
| -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 b631cf8..fcd2bad 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); |
