diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/lparcfg.c | 8 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/cmm.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c index b3eef30b5131..d051e8cbcd03 100644 --- a/arch/powerpc/kernel/lparcfg.c +++ b/arch/powerpc/kernel/lparcfg.c | |||
@@ -510,10 +510,10 @@ static ssize_t update_ppp(u64 *entitlement, u8 *weight) | |||
510 | return -EINVAL; | 510 | return -EINVAL; |
511 | 511 | ||
512 | pr_debug("%s: current_entitled = %lu, current_weight = %u\n", | 512 | pr_debug("%s: current_entitled = %lu, current_weight = %u\n", |
513 | __FUNCTION__, ppp_data.entitlement, ppp_data.weight); | 513 | __func__, ppp_data.entitlement, ppp_data.weight); |
514 | 514 | ||
515 | pr_debug("%s: new_entitled = %lu, new_weight = %u\n", | 515 | pr_debug("%s: new_entitled = %lu, new_weight = %u\n", |
516 | __FUNCTION__, new_entitled, new_weight); | 516 | __func__, new_entitled, new_weight); |
517 | 517 | ||
518 | retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight); | 518 | retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight); |
519 | return retval; | 519 | return retval; |
@@ -556,10 +556,10 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight) | |||
556 | return -EINVAL; | 556 | return -EINVAL; |
557 | 557 | ||
558 | pr_debug("%s: current_entitled = %lu, current_weight = %u\n", | 558 | pr_debug("%s: current_entitled = %lu, current_weight = %u\n", |
559 | __FUNCTION__, mpp_data.entitled_mem, mpp_data.mem_weight); | 559 | __func__, mpp_data.entitled_mem, mpp_data.mem_weight); |
560 | 560 | ||
561 | pr_debug("%s: new_entitled = %lu, new_weight = %u\n", | 561 | pr_debug("%s: new_entitled = %lu, new_weight = %u\n", |
562 | __FUNCTION__, new_entitled, new_weight); | 562 | __func__, new_entitled, new_weight); |
563 | 563 | ||
564 | rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight); | 564 | rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight); |
565 | return rc; | 565 | return rc; |
diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c index 38fe32a7cc70..5cd4d2761620 100644 --- a/arch/powerpc/platforms/pseries/cmm.c +++ b/arch/powerpc/platforms/pseries/cmm.c | |||
@@ -121,7 +121,7 @@ static long cmm_alloc_pages(long nr) | |||
121 | npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN | | 121 | npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN | |
122 | __GFP_NORETRY | __GFP_NOMEMALLOC); | 122 | __GFP_NORETRY | __GFP_NOMEMALLOC); |
123 | if (!npa) { | 123 | if (!npa) { |
124 | pr_info("%s: Can not allocate new page list\n", __FUNCTION__); | 124 | pr_info("%s: Can not allocate new page list\n", __func__); |
125 | free_page(addr); | 125 | free_page(addr); |
126 | break; | 126 | break; |
127 | } | 127 | } |
@@ -138,7 +138,7 @@ static long cmm_alloc_pages(long nr) | |||
138 | } | 138 | } |
139 | 139 | ||
140 | if ((rc = plpar_page_set_loaned(__pa(addr)))) { | 140 | if ((rc = plpar_page_set_loaned(__pa(addr)))) { |
141 | pr_err("%s: Can not set page to loaned. rc=%ld\n", __FUNCTION__, rc); | 141 | pr_err("%s: Can not set page to loaned. rc=%ld\n", __func__, rc); |
142 | spin_unlock(&cmm_lock); | 142 | spin_unlock(&cmm_lock); |
143 | free_page(addr); | 143 | free_page(addr); |
144 | break; | 144 | break; |