[IA64] remove remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Long lines have been kept where they exist, some small spacing changes have been done. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
committed by
Tony Luck
parent
2d9b06c72a
commit
d4ed80841a
@ -28,7 +28,7 @@ extern int die_if_kernel(char *str, struct pt_regs *regs, long err);
|
||||
#undef DEBUG_UNALIGNED_TRAP
|
||||
|
||||
#ifdef DEBUG_UNALIGNED_TRAP
|
||||
# define DPRINT(a...) do { printk("%s %u: ", __FUNCTION__, __LINE__); printk (a); } while (0)
|
||||
# define DPRINT(a...) do { printk("%s %u: ", __func__, __LINE__); printk (a); } while (0)
|
||||
# define DDUMP(str,vp,len) dump(str, vp, len)
|
||||
|
||||
static void
|
||||
@ -674,7 +674,7 @@ emulate_load_updates (update_t type, load_store_t ld, struct pt_regs *regs, unsi
|
||||
* just in case.
|
||||
*/
|
||||
if (ld.x6_op == 1 || ld.x6_op == 3) {
|
||||
printk(KERN_ERR "%s: register update on speculative load, error\n", __FUNCTION__);
|
||||
printk(KERN_ERR "%s: register update on speculative load, error\n", __func__);
|
||||
if (die_if_kernel("unaligned reference on speculative load with register update\n",
|
||||
regs, 30))
|
||||
return;
|
||||
@ -1104,7 +1104,7 @@ emulate_load_floatpair (unsigned long ifa, load_store_t ld, struct pt_regs *regs
|
||||
*/
|
||||
if (ld.x6_op == 1 || ld.x6_op == 3)
|
||||
printk(KERN_ERR "%s: register update on speculative load pair, error\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
|
||||
setreg(ld.r3, ifa, 0, regs);
|
||||
}
|
||||
|
Reference in New Issue
Block a user