Skip to content

Commit

Permalink
powerpc: Replace __FUNCTION__ with __func__
Browse files Browse the repository at this point in the history
__FUNCTION__ is gcc-specific, use __func__

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Harvey Harrison authored and Paul Mackerras committed Aug 20, 2008
1 parent 542ad5d commit 5df72bf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions arch/powerpc/kernel/lparcfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,10 @@ static ssize_t update_ppp(u64 *entitlement, u8 *weight)
return -EINVAL;

pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
__FUNCTION__, ppp_data.entitlement, ppp_data.weight);
__func__, ppp_data.entitlement, ppp_data.weight);

pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
__FUNCTION__, new_entitled, new_weight);
__func__, new_entitled, new_weight);

retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight);
return retval;
Expand Down Expand Up @@ -556,10 +556,10 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight)
return -EINVAL;

pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
__FUNCTION__, mpp_data.entitled_mem, mpp_data.mem_weight);
__func__, mpp_data.entitled_mem, mpp_data.mem_weight);

pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
__FUNCTION__, new_entitled, new_weight);
__func__, new_entitled, new_weight);

rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight);
return rc;
Expand Down
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/pseries/cmm.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ static long cmm_alloc_pages(long nr)
npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN |
__GFP_NORETRY | __GFP_NOMEMALLOC);
if (!npa) {
pr_info("%s: Can not allocate new page list\n", __FUNCTION__);
pr_info("%s: Can not allocate new page list\n", __func__);
free_page(addr);
break;
}
Expand All @@ -138,7 +138,7 @@ static long cmm_alloc_pages(long nr)
}

if ((rc = plpar_page_set_loaned(__pa(addr)))) {
pr_err("%s: Can not set page to loaned. rc=%ld\n", __FUNCTION__, rc);
pr_err("%s: Can not set page to loaned. rc=%ld\n", __func__, rc);
spin_unlock(&cmm_lock);
free_page(addr);
break;
Expand Down

0 comments on commit 5df72bf

Please sign in to comment.