alpha: remove remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

The change in pci-iommu,c should be safe as arena has not been assigned
when we get to this point.

Some were within #if 0 blocks, have changed them and left the blocks
as they appear to be debugging infrastructure.

A #define FN __FUNCTION__ was removed and occurances of FN were replaced
with __func__ as well.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 63c2073401ee..2525692db0ab 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -755,7 +755,7 @@ smp_call_function_on_cpu (void (*func) (void *info), void *info, int retry,
         if (atomic_read(&data.unstarted_count) > 0) {
                 long start_time = jiffies;
                 printk(KERN_ERR "%s: initial timeout -- trying long wait\n",
-                       __FUNCTION__);
+                       __func__);
                 timeout = jiffies + 30 * HZ;
                 while (atomic_read(&data.unstarted_count) > 0
                        && time_before(jiffies, timeout))
@@ -764,7 +764,7 @@ smp_call_function_on_cpu (void (*func) (void *info), void *info, int retry,
                         long delta = jiffies - start_time;
                         printk(KERN_ERR 
                                "%s: response %ld.%ld seconds into long wait\n",
-                               __FUNCTION__, delta / HZ,
+                               __func__, delta / HZ,
                                (100 * (delta - ((delta / HZ) * HZ))) / HZ);
                 }
         }