diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 01:16:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 01:16:58 -0500 |
| commit | 497992917edf03994088ec8757b8262e1d9f568a (patch) | |
| tree | 7e82975f98d3d3c9f80e10c981601db23eef5bd1 /arch/ia64/kernel/uncached.c | |
| parent | 7e732bfc5570b8f9bb5f155cf36e94b2e7d6bf6a (diff) | |
| parent | 386d1d50c8eef254653b1015fde06622ef38ba76 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
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 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) | |||
| 210 | 210 | ||
| 211 | dprintk(KERN_ERR "uncached_build_memmap(%lx %lx)\n", start, end); | 211 | dprintk(KERN_ERR "uncached_build_memmap(%lx %lx)\n", start, end); |
| 212 | 212 | ||
| 213 | touch_softlockup_watchdog(); | ||
| 213 | memset((char *)start, 0, length); | 214 | memset((char *)start, 0, length); |
| 214 | 215 | ||
| 215 | node = paddr_to_nid(start - __IA64_UNCACHED_OFFSET); | 216 | node = paddr_to_nid(start - __IA64_UNCACHED_OFFSET); |