diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:13:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:27 -0400 |
commit | bbb8d343affd21850849fa4d41bf91c7527a3d04 (patch) | |
tree | 8d958286b21228673677668e09ed185602568eee /arch/alpha/kernel/sys_sable.c | |
parent | b901d40c970e6db319fe1f8d84db2b9684b6c9bf (diff) |
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>
Diffstat (limited to 'arch/alpha/kernel/sys_sable.c')
-rw-r--r-- | arch/alpha/kernel/sys_sable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c index 906019cfa681..99a7f19da13a 100644 --- a/arch/alpha/kernel/sys_sable.c +++ b/arch/alpha/kernel/sys_sable.c | |||
@@ -454,7 +454,7 @@ sable_lynx_enable_irq(unsigned int irq) | |||
454 | spin_unlock(&sable_lynx_irq_lock); | 454 | spin_unlock(&sable_lynx_irq_lock); |
455 | #if 0 | 455 | #if 0 |
456 | printk("%s: mask 0x%lx bit 0x%x irq 0x%x\n", | 456 | printk("%s: mask 0x%lx bit 0x%x irq 0x%x\n", |
457 | __FUNCTION__, mask, bit, irq); | 457 | __func__, mask, bit, irq); |
458 | #endif | 458 | #endif |
459 | } | 459 | } |
460 | 460 | ||
@@ -470,7 +470,7 @@ sable_lynx_disable_irq(unsigned int irq) | |||
470 | spin_unlock(&sable_lynx_irq_lock); | 470 | spin_unlock(&sable_lynx_irq_lock); |
471 | #if 0 | 471 | #if 0 |
472 | printk("%s: mask 0x%lx bit 0x%x irq 0x%x\n", | 472 | printk("%s: mask 0x%lx bit 0x%x irq 0x%x\n", |
473 | __FUNCTION__, mask, bit, irq); | 473 | __func__, mask, bit, irq); |
474 | #endif | 474 | #endif |
475 | } | 475 | } |
476 | 476 | ||
@@ -524,7 +524,7 @@ sable_lynx_srm_device_interrupt(unsigned long vector) | |||
524 | irq = sable_lynx_irq_swizzle->mask_to_irq[bit]; | 524 | irq = sable_lynx_irq_swizzle->mask_to_irq[bit]; |
525 | #if 0 | 525 | #if 0 |
526 | printk("%s: vector 0x%lx bit 0x%x irq 0x%x\n", | 526 | printk("%s: vector 0x%lx bit 0x%x irq 0x%x\n", |
527 | __FUNCTION__, vector, bit, irq); | 527 | __func__, vector, bit, irq); |
528 | #endif | 528 | #endif |
529 | handle_irq(irq); | 529 | handle_irq(irq); |
530 | } | 530 | } |