diff options
Diffstat (limited to 'arch/powerpc/kernel/lparcfg.c')
| -rw-r--r-- | arch/powerpc/kernel/lparcfg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c index dcb89a88df46..1ffacc698ffb 100644 --- a/arch/powerpc/kernel/lparcfg.c +++ b/arch/powerpc/kernel/lparcfg.c | |||
| @@ -226,7 +226,7 @@ static void parse_system_parameter_string(struct seq_file *m) | |||
| 226 | unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL); | 226 | unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL); |
| 227 | if (!local_buffer) { | 227 | if (!local_buffer) { |
| 228 | printk(KERN_ERR "%s %s kmalloc failure at line %d \n", | 228 | printk(KERN_ERR "%s %s kmalloc failure at line %d \n", |
| 229 | __FILE__, __FUNCTION__, __LINE__); | 229 | __FILE__, __func__, __LINE__); |
| 230 | return; | 230 | return; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| @@ -243,14 +243,14 @@ static void parse_system_parameter_string(struct seq_file *m) | |||
| 243 | if (call_status != 0) { | 243 | if (call_status != 0) { |
| 244 | printk(KERN_INFO | 244 | printk(KERN_INFO |
| 245 | "%s %s Error calling get-system-parameter (0x%x)\n", | 245 | "%s %s Error calling get-system-parameter (0x%x)\n", |
| 246 | __FILE__, __FUNCTION__, call_status); | 246 | __FILE__, __func__, call_status); |
| 247 | } else { | 247 | } else { |
| 248 | int splpar_strlen; | 248 | int splpar_strlen; |
| 249 | int idx, w_idx; | 249 | int idx, w_idx; |
| 250 | char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL); | 250 | char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL); |
| 251 | if (!workbuffer) { | 251 | if (!workbuffer) { |
| 252 | printk(KERN_ERR "%s %s kmalloc failure at line %d \n", | 252 | printk(KERN_ERR "%s %s kmalloc failure at line %d \n", |
| 253 | __FILE__, __FUNCTION__, __LINE__); | 253 | __FILE__, __func__, __LINE__); |
| 254 | kfree(local_buffer); | 254 | kfree(local_buffer); |
| 255 | return; | 255 | return; |
| 256 | } | 256 | } |
| @@ -484,10 +484,10 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf, | |||
| 484 | current_weight = (resource >> 5 * 8) & 0xFF; | 484 | current_weight = (resource >> 5 * 8) & 0xFF; |
| 485 | 485 | ||
| 486 | pr_debug("%s: current_entitled = %lu, current_weight = %u\n", | 486 | pr_debug("%s: current_entitled = %lu, current_weight = %u\n", |
| 487 | __FUNCTION__, current_entitled, current_weight); | 487 | __func__, current_entitled, current_weight); |
| 488 | 488 | ||
| 489 | pr_debug("%s: new_entitled = %lu, new_weight = %u\n", | 489 | pr_debug("%s: new_entitled = %lu, new_weight = %u\n", |
| 490 | __FUNCTION__, *new_entitled_ptr, *new_weight_ptr); | 490 | __func__, *new_entitled_ptr, *new_weight_ptr); |
| 491 | 491 | ||
| 492 | retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr, | 492 | retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr, |
| 493 | *new_weight_ptr); | 493 | *new_weight_ptr); |
| @@ -502,7 +502,7 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf, | |||
| 502 | retval = -EINVAL; | 502 | retval = -EINVAL; |
| 503 | } else { | 503 | } else { |
| 504 | printk(KERN_WARNING "%s: received unknown hv return code %ld", | 504 | printk(KERN_WARNING "%s: received unknown hv return code %ld", |
| 505 | __FUNCTION__, retval); | 505 | __func__, retval); |
| 506 | retval = -EIO; | 506 | retval = -EIO; |
| 507 | } | 507 | } |
| 508 | 508 | ||
