diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-28 17:21:07 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-01 05:43:09 -0400 |
commit | e48b1b452ff630288c930fd8e0c2d808bc15f7ad (patch) | |
tree | 7ba5f83964a1d965d8b8b6187b39083e1a99dfd2 /arch/powerpc/oprofile/cell/vma_map.c | |
parent | a78bfbfcfaca64e6198f164c43a60afc8a50e2c6 (diff) |
[POWERPC] Replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/oprofile/cell/vma_map.c')
-rw-r--r-- | arch/powerpc/oprofile/cell/vma_map.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/oprofile/cell/vma_map.c b/arch/powerpc/oprofile/cell/vma_map.c index 76ec1d16aef7..5cf53681430a 100644 --- a/arch/powerpc/oprofile/cell/vma_map.c +++ b/arch/powerpc/oprofile/cell/vma_map.c | |||
@@ -72,7 +72,7 @@ vma_map_add(struct vma_to_fileoffset_map *map, unsigned int vma, | |||
72 | kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL); | 72 | kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL); |
73 | if (!new) { | 73 | if (!new) { |
74 | printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n", | 74 | printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n", |
75 | __FUNCTION__, __LINE__); | 75 | __func__, __LINE__); |
76 | vma_map_free(map); | 76 | vma_map_free(map); |
77 | return NULL; | 77 | return NULL; |
78 | } | 78 | } |
@@ -132,19 +132,19 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | |||
132 | if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) { | 132 | if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) { |
133 | printk(KERN_ERR "SPU_PROF: " | 133 | printk(KERN_ERR "SPU_PROF: " |
134 | "%s, line %d: Unexpected e_ident parsing SPU ELF\n", | 134 | "%s, line %d: Unexpected e_ident parsing SPU ELF\n", |
135 | __FUNCTION__, __LINE__); | 135 | __func__, __LINE__); |
136 | goto fail; | 136 | goto fail; |
137 | } | 137 | } |
138 | if (ehdr.e_machine != EM_SPU) { | 138 | if (ehdr.e_machine != EM_SPU) { |
139 | printk(KERN_ERR "SPU_PROF: " | 139 | printk(KERN_ERR "SPU_PROF: " |
140 | "%s, line %d: Unexpected e_machine parsing SPU ELF\n", | 140 | "%s, line %d: Unexpected e_machine parsing SPU ELF\n", |
141 | __FUNCTION__, __LINE__); | 141 | __func__, __LINE__); |
142 | goto fail; | 142 | goto fail; |
143 | } | 143 | } |
144 | if (ehdr.e_type != ET_EXEC) { | 144 | if (ehdr.e_type != ET_EXEC) { |
145 | printk(KERN_ERR "SPU_PROF: " | 145 | printk(KERN_ERR "SPU_PROF: " |
146 | "%s, line %d: Unexpected e_type parsing SPU ELF\n", | 146 | "%s, line %d: Unexpected e_type parsing SPU ELF\n", |
147 | __FUNCTION__, __LINE__); | 147 | __func__, __LINE__); |
148 | goto fail; | 148 | goto fail; |
149 | } | 149 | } |
150 | phdr_start = spu_elf_start + ehdr.e_phoff; | 150 | phdr_start = spu_elf_start + ehdr.e_phoff; |
@@ -235,7 +235,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, | |||
235 | if (overlay_tbl_offset < 0) { | 235 | if (overlay_tbl_offset < 0) { |
236 | printk(KERN_ERR "SPU_PROF: " | 236 | printk(KERN_ERR "SPU_PROF: " |
237 | "%s, line %d: Error finding SPU overlay table\n", | 237 | "%s, line %d: Error finding SPU overlay table\n", |
238 | __FUNCTION__, __LINE__); | 238 | __func__, __LINE__); |
239 | goto fail; | 239 | goto fail; |
240 | } | 240 | } |
241 | ovly_table = spu_elf_start + overlay_tbl_offset; | 241 | ovly_table = spu_elf_start + overlay_tbl_offset; |