Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[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 c6d40446c2c4a37a1347b464ecf1b340c5f832d7..fcd2bad0286fc943b77a3c274a4beb4eca269540 100644 (file)
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -53,7 +53,7 @@ static void uncached_ipi_visibility(void *data)
        if ((status != PAL_VISIBILITY_OK) &&
            (status != PAL_VISIBILITY_OK_REMOTE_NEEDED))
                printk(KERN_DEBUG "pal_prefetch_visibility() returns %i on "
-                      "CPU %i\n", status, get_cpu());
+                      "CPU %i\n", status, raw_smp_processor_id());
 }
 
 
@@ -63,7 +63,7 @@ static void uncached_ipi_mc_drain(void *data)
        status = ia64_pal_mc_drain();
        if (status)
                printk(KERN_WARNING "ia64_pal_mc_drain() failed with %i on "
-                      "CPU %i\n", status, get_cpu());
+                      "CPU %i\n", status, raw_smp_processor_id());
 }
 
 
@@ -105,7 +105,7 @@ uncached_get_new_chunk(struct gen_pool *poolp)
        status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL);
 
        dprintk(KERN_INFO "pal_prefetch_visibility() returns %i on cpu %i\n",
-               status, get_cpu());
+               status, raw_smp_processor_id());
 
        if (!status) {
                status = smp_call_function(uncached_ipi_visibility, NULL, 0, 1);
@@ -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);