aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-30 03:55:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:53 -0400
commitd40cee245ff6ad05d3448401d7320be82c1c5af1 (patch)
tree5467cada898e80d5e43592393b21252312c908fa
parentd7853d1f8932c847a8d7b3b38e6baedf77148cfb (diff)
mm: remove remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/slab.c4
-rw-r--r--mm/sparse.c4
-rw-r--r--mm/vmscan.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 919a995d1e68..06236e4ddc1b 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -861,7 +861,7 @@ static void cache_estimate(unsigned long gfporder, size_t buffer_size,
861 *left_over = slab_size - nr_objs*buffer_size - mgmt_size; 861 *left_over = slab_size - nr_objs*buffer_size - mgmt_size;
862} 862}
863 863
864#define slab_error(cachep, msg) __slab_error(__FUNCTION__, cachep, msg) 864#define slab_error(cachep, msg) __slab_error(__func__, cachep, msg)
865 865
866static void __slab_error(const char *function, struct kmem_cache *cachep, 866static void __slab_error(const char *function, struct kmem_cache *cachep,
867 char *msg) 867 char *msg)
@@ -2156,7 +2156,7 @@ kmem_cache_create (const char *name, size_t size, size_t align,
2156 */ 2156 */
2157 if (!name || in_interrupt() || (size < BYTES_PER_WORD) || 2157 if (!name || in_interrupt() || (size < BYTES_PER_WORD) ||
2158 size > KMALLOC_MAX_SIZE) { 2158 size > KMALLOC_MAX_SIZE) {
2159 printk(KERN_ERR "%s: Early error in slab %s\n", __FUNCTION__, 2159 printk(KERN_ERR "%s: Early error in slab %s\n", __func__,
2160 name); 2160 name);
2161 BUG(); 2161 BUG();
2162 } 2162 }
diff --git a/mm/sparse.c b/mm/sparse.c
index dff71f173ae9..d9409ba7a1a1 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -272,7 +272,7 @@ static unsigned long *__init sparse_early_usemap_alloc(unsigned long pnum)
272 /* Stupid: suppress gcc warning for SPARSEMEM && !NUMA */ 272 /* Stupid: suppress gcc warning for SPARSEMEM && !NUMA */
273 nid = 0; 273 nid = 0;
274 274
275 printk(KERN_WARNING "%s: allocation failed\n", __FUNCTION__); 275 printk(KERN_WARNING "%s: allocation failed\n", __func__);
276 return NULL; 276 return NULL;
277} 277}
278 278
@@ -302,7 +302,7 @@ struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)
302 return map; 302 return map;
303 303
304 printk(KERN_ERR "%s: sparsemem memory map backing failed " 304 printk(KERN_ERR "%s: sparsemem memory map backing failed "
305 "some memory will not be available.\n", __FUNCTION__); 305 "some memory will not be available.\n", __func__);
306 ms->section_mem_map = 0; 306 ms->section_mem_map = 0;
307 return NULL; 307 return NULL;
308} 308}
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 12e8627c9747..9a29901ad3b3 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -191,7 +191,7 @@ unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask,
191 shrinker->nr += delta; 191 shrinker->nr += delta;
192 if (shrinker->nr < 0) { 192 if (shrinker->nr < 0) {
193 printk(KERN_ERR "%s: nr=%ld\n", 193 printk(KERN_ERR "%s: nr=%ld\n",
194 __FUNCTION__, shrinker->nr); 194 __func__, shrinker->nr);
195 shrinker->nr = max_pass; 195 shrinker->nr = max_pass;
196 } 196 }
197 197
@@ -339,7 +339,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping,
339 if (PagePrivate(page)) { 339 if (PagePrivate(page)) {
340 if (try_to_free_buffers(page)) { 340 if (try_to_free_buffers(page)) {
341 ClearPageDirty(page); 341 ClearPageDirty(page);
342 printk("%s: orphaned page\n", __FUNCTION__); 342 printk("%s: orphaned page\n", __func__);
343 return PAGE_CLEAN; 343 return PAGE_CLEAN;
344 } 344 }
345 } 345 }