From 147a7423a92bc2f4f2d4f1f18563fd4ff9f28746 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 30 Apr 2008 00:55:07 -0700
Subject: [PATCH] --- yaml --- r: 95295 b: refs/heads/master c:
 d40cee245ff6ad05d3448401d7320be82c1c5af1 h: refs/heads/master i:   95293:
 b9b733134f2a3d9460e1960cd8b966950fbc3d83   95291:
 e9c087878420abe0f39dc445c00f42ca6ba38225   95287:
 11d237ea0948c4d235fa311b2f13871e0407b28b   95279:
 defc5078b6e59ac742e12bfcba5dfff8b64954b6   95263:
 699f46877ab49699ecd82b00fee22d0849b17af8   95231:
 9386f16a900b48ccfbf7eb4fee02dc3edbd9a88c v: v3

---
 [refs]            | 2 +-
 trunk/mm/slab.c   | 4 ++--
 trunk/mm/sparse.c | 4 ++--
 trunk/mm/vmscan.c | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 38769c69778c..2e23930bac86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7853d1f8932c847a8d7b3b38e6baedf77148cfb
+refs/heads/master: d40cee245ff6ad05d3448401d7320be82c1c5af1
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 919a995d1e68..06236e4ddc1b 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -861,7 +861,7 @@ static void cache_estimate(unsigned long gfporder, size_t buffer_size,
 	*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)
@@ -2156,7 +2156,7 @@ kmem_cache_create (const char *name, size_t size, size_t align,
 	 */
 	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 --git a/trunk/mm/sparse.c b/trunk/mm/sparse.c
index dff71f173ae9..d9409ba7a1a1 100644
--- a/trunk/mm/sparse.c
+++ b/trunk/mm/sparse.c
@@ -272,7 +272,7 @@ static unsigned long *__init sparse_early_usemap_alloc(unsigned long pnum)
 	/* 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;
 }
 
@@ -302,7 +302,7 @@ struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)
 		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 --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 12e8627c9747..9a29901ad3b3 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -191,7 +191,7 @@ unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask,
 		shrinker->nr += delta;
 		if (shrinker->nr < 0) {
 			printk(KERN_ERR "%s: nr=%ld\n",
-					__FUNCTION__, shrinker->nr);
+					__func__, shrinker->nr);
 			shrinker->nr = max_pass;
 		}
 
@@ -339,7 +339,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping,
 		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;
 			}
 		}