From: Harvey Harrison <harvey.harrison@gmail.com>

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/slab.c   |    4 ++--
 mm/sparse.c |    4 ++--
 mm/vmscan.c |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff -puN mm/slab.c~mm-remove-remaining-__function__-occurances mm/slab.c
--- a/mm/slab.c~mm-remove-remaining-__function__-occurances
+++ a/mm/slab.c
@@ -862,7 +862,7 @@ static void cache_estimate(unsigned long
 	*left_over = slab_size - nr_objs*buffer_size - mgmt_size;
 }
 
-#define slab_error(cachep, msg) __slab_error(__FUNCTION__, cachep, msg)
+#define slab_error(cachep, msg) __slab_error(__func__, cachep, msg)
 
 static void __slab_error(const char *function, struct kmem_cache *cachep,
 			char *msg)
@@ -2158,7 +2158,7 @@ kmem_cache_create (const char *name, siz
 	 */
 	if (!name || in_interrupt() || (size < BYTES_PER_WORD) ||
 	    size > KMALLOC_MAX_SIZE) {
-		printk(KERN_ERR "%s: Early error in slab %s\n", __FUNCTION__,
+		printk(KERN_ERR "%s: Early error in slab %s\n", __func__,
 				name);
 		BUG();
 	}
diff -puN mm/sparse.c~mm-remove-remaining-__function__-occurances mm/sparse.c
--- a/mm/sparse.c~mm-remove-remaining-__function__-occurances
+++ a/mm/sparse.c
@@ -250,7 +250,7 @@ static unsigned long *__init sparse_earl
 	/* Stupid: suppress gcc warning for SPARSEMEM && !NUMA */
 	nid = 0;
 
-	printk(KERN_WARNING "%s: allocation failed\n", __FUNCTION__);
+	printk(KERN_WARNING "%s: allocation failed\n", __func__);
 	return NULL;
 }
 
@@ -280,7 +280,7 @@ struct page __init *sparse_early_mem_map
 		return map;
 
 	printk(KERN_ERR "%s: sparsemem memory map backing failed "
-			"some memory will not be available.\n", __FUNCTION__);
+			"some memory will not be available.\n", __func__);
 	ms->section_mem_map = 0;
 	return NULL;
 }
diff -puN mm/vmscan.c~mm-remove-remaining-__function__-occurances mm/vmscan.c
--- a/mm/vmscan.c~mm-remove-remaining-__function__-occurances
+++ a/mm/vmscan.c
@@ -198,7 +198,7 @@ unsigned long shrink_slab(unsigned long 
 		shrinker->nr += delta;
 		if (shrinker->nr < 0) {
 			printk(KERN_ERR "%s: nr=%ld\n",
-					__FUNCTION__, shrinker->nr);
+					__func__, shrinker->nr);
 			shrinker->nr = max_pass;
 		}
 
@@ -346,7 +346,7 @@ static pageout_t pageout(struct page *pa
 		if (PagePrivate(page)) {
 			if (try_to_free_buffers(page)) {
 				ClearPageDirty(page);
-				printk("%s: orphaned page\n", __FUNCTION__);
+				printk("%s: orphaned page\n", __func__);
 				return PAGE_CLEAN;
 			}
 		}
_