aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMoyster <oysterized@gmail.com>2017-09-23 03:10:48 +0200
committerMoyster <oysterized@gmail.com>2017-09-23 03:10:48 +0200
commitb8d1e07edc8d57883bf4b6ca70228b5a9e6b98b2 (patch)
treeb9c284cc99fc24d884b4dedc7100e5881a35011f /kernel
parentfa4d1db09a4946ad8ba42514687c6b8a3603d623 (diff)
misc: replace __FUNCTION__ by __function__
result of : git grep -l '__FUNCTION__' | xargs sed -i 's/__FUNCTION__/__func__/g'
Diffstat (limited to 'kernel')
-rw-r--r--kernel/debug/kdb/kdb_support.c2
-rw-r--r--kernel/trace/ring_buffer.c2
-rw-r--r--kernel/trace/trace.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/kernel/debug/kdb/kdb_support.c b/kernel/debug/kdb/kdb_support.c
index aaf6ad383..d1252566f 100644
--- a/kernel/debug/kdb/kdb_support.c
+++ b/kernel/debug/kdb/kdb_support.c
@@ -715,7 +715,7 @@ void init_debug_alloc_pool_aligned(void)
{
debug_alloc_pool_aligned = extmem_malloc_page_align(SIZEOF_DEBUG_ALLOC_POOL_ALIGNED);
if(debug_alloc_pool_aligned == NULL) {
- pr_warning("%s[%s] ext memory alloc failed!!!\n", __FILE__, __FUNCTION__);
+ pr_warning("%s[%s] ext memory alloc failed!!!\n", __FILE__, __func__);
debug_alloc_pool = (char *)vmalloc(SIZEOF_DEBUG_ALLOC_POOL_ALIGNED);
}
else {
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 62e48a3e1..5842570ac 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1154,7 +1154,7 @@ static int __rb_allocate_pages(long nr_pages, struct list_head *pages, int cpu)
#ifdef CONFIG_MTK_EXTMEM
bpage->page = extmem_malloc_page_align(PAGE_SIZE);
if(bpage->page == NULL) {
- pr_err("%s[%s] ext memory alloc failed!!!\n", __FILE__, __FUNCTION__);
+ pr_err("%s[%s] ext memory alloc failed!!!\n", __FILE__, __func__);
goto free_pages;
}
#else
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index b7ecb31ac..054764aa8 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1304,12 +1304,12 @@ static void trace_init_cmdlines(void)
#ifdef CONFIG_MTK_EXTMEM
map_pid_to_cmdline = (unsigned *) extmem_malloc_page_align(SIZEOF_MAP_PID_TO_CMDLINE);
if(map_pid_to_cmdline == NULL) {
- pr_err("%s[%s] ext memory alloc failed!!!\n", __FILE__, __FUNCTION__);
+ pr_err("%s[%s] ext memory alloc failed!!!\n", __FILE__, __func__);
map_pid_to_cmdline = (unsigned *)vmalloc(SIZEOF_MAP_PID_TO_CMDLINE);
}
map_cmdline_to_pid = (unsigned *) extmem_malloc_page_align(SIZEOF_MAP_CMDLINE_TO_PID);
if(map_pid_to_cmdline == NULL) {
- pr_warning("%s[%s] ext memory alloc failed!!!\n", __FILE__, __FUNCTION__);
+ pr_warning("%s[%s] ext memory alloc failed!!!\n", __FILE__, __func__);
map_cmdline_to_pid = (unsigned *)vmalloc(SIZEOF_MAP_CMDLINE_TO_PID);
}
memset(map_pid_to_cmdline, NO_CMDLINE_MAP, SIZEOF_MAP_PID_TO_CMDLINE);