Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d40cee24 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

mm: remove remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d7853d1f

mm/slab.c

+2 −2
Original line number Diff line number Diff line
@@ -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();

	}

mm/sparse.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

mm/vmscan.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

			}

		}