Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel/kexec.c: convert printk to pr_foo()

Browse source 
+ some pr_warning -> pr_warn and checkpatch warning fixes

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Fabian Frederick 2014-06-06 14:37:09 -07:00 committed by Linus Torvalds
parent f06e5153f4
commit e1bebcf41e
1 changed files with 32 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
kernel/kexec.c
View file

@ -257,13 +257,13 @@ static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry,
image->control_code_page = kimage_alloc_control_pages(image, image->control_code_page = kimage_alloc_control_pages(image,
get_order(KEXEC_CONTROL_PAGE_SIZE)); get_order(KEXEC_CONTROL_PAGE_SIZE));
if (!image->control_code_page) { if (!image->control_code_page) {
printk(KERN_ERR "Could not allocate control_code_buffer\n"); pr_err("Could not allocate control_code_buffer\n");
goto out_free; goto out_free;
} }
image->swap_page = kimage_alloc_control_pages(image, 0); image->swap_page = kimage_alloc_control_pages(image, 0);
if (!image->swap_page) { if (!image->swap_page) {
printk(KERN_ERR "Could not allocate swap buffer\n"); pr_err("Could not allocate swap buffer\n");
goto out_free; goto out_free;
} }
@ -332,7 +332,7 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry,
image->control_code_page = kimage_alloc_control_pages(image, image->control_code_page = kimage_alloc_control_pages(image,
get_order(KEXEC_CONTROL_PAGE_SIZE)); get_order(KEXEC_CONTROL_PAGE_SIZE));
if (!image->control_code_page) { if (!image->control_code_page) {
printk(KERN_ERR "Could not allocate control_code_buffer\n"); pr_err("Could not allocate control_code_buffer\n");
goto out_free; goto out_free;
} }
@ -621,8 +621,8 @@ static void kimage_terminate(struct kimage *image)
#define for_each_kimage_entry(image, ptr, entry) \ #define for_each_kimage_entry(image, ptr, entry) \
for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \ for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \
ptr = (entry & IND_INDIRECTION)? \ ptr = (entry & IND_INDIRECTION) ? \
phys_to_virt((entry & PAGE_MASK)): ptr +1) phys_to_virt((entry & PAGE_MASK)) : ptr + 1)
static void kimage_free_entry(kimage_entry_t entry) static void kimage_free_entry(kimage_entry_t entry)
{ {
@ -650,8 +650,7 @@ static void kimage_free(struct kimage *image)
* done with it. * done with it.
*/ */
ind = entry; ind = entry;
} } else if (entry & IND_SOURCE)
else if (entry & IND_SOURCE)
kimage_free_entry(entry); kimage_free_entry(entry);
} }
/* Free the final indirection page */ /* Free the final indirection page */
@ -774,8 +773,7 @@ static struct page *kimage_alloc_page(struct kimage *image,
addr = old_addr; addr = old_addr;
page = old_page; page = old_page;
break; break;
} } else {
else {
/* Place the page on the destination list I /* Place the page on the destination list I
* will use it later. * will use it later.
*/ */
@ -1059,7 +1057,7 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
return -EINVAL; return -EINVAL;
ksegments = compat_alloc_user_space(nr_segments * sizeof(out)); ksegments = compat_alloc_user_space(nr_segments * sizeof(out));
for (i=0; i < nr_segments; i++) { for (i = 0; i < nr_segments; i++) {
result = copy_from_user(&in, &segments[i], sizeof(in)); result = copy_from_user(&in, &segments[i], sizeof(in));
if (result) if (result)
return -EFAULT; return -EFAULT;
@ -1214,7 +1212,7 @@ void crash_save_cpu(struct pt_regs *regs, int cpu)
* squirrelled away. ELF notes happen to provide * squirrelled away. ELF notes happen to provide
* all of that, so there is no need to invent something new. * all of that, so there is no need to invent something new.
*/ */
buf = (u32*)per_cpu_ptr(crash_notes, cpu); buf = (u32 *)per_cpu_ptr(crash_notes, cpu);
if (!buf) if (!buf)
return; return;
memset(&prstatus, 0, sizeof(prstatus)); memset(&prstatus, 0, sizeof(prstatus));
@ -1230,8 +1228,7 @@ static int __init crash_notes_memory_init(void)
/* Allocate memory for saving cpu registers. */ /* Allocate memory for saving cpu registers. */
crash_notes = alloc_percpu(note_buf_t); crash_notes = alloc_percpu(note_buf_t);
if (!crash_notes) { if (!crash_notes) {
printk("Kexec: Memory allocation for saving cpu register" pr_warn("Kexec: Memory allocation for saving cpu register states failed\n");
" states failed\n");
return -ENOMEM; return -ENOMEM;
} }
return 0; return 0;
@ -1267,12 +1264,12 @@ static int __init parse_crashkernel_mem(char *cmdline,
/* get the start of the range */ /* get the start of the range */
start = memparse(cur, &tmp); start = memparse(cur, &tmp);
if (cur == tmp) { if (cur == tmp) {
pr_warning("crashkernel: Memory value expected\n"); pr_warn("crashkernel: Memory value expected\n");
return -EINVAL; return -EINVAL;
} }
cur = tmp; cur = tmp;
if (*cur != '-') { if (*cur != '-') {
pr_warning("crashkernel: '-' expected\n"); pr_warn("crashkernel: '-' expected\n");
return -EINVAL; return -EINVAL;
} }
cur++; cur++;
@ -1281,31 +1278,30 @@ static int __init parse_crashkernel_mem(char *cmdline,
if (*cur != ':') { if (*cur != ':') {
end = memparse(cur, &tmp); end = memparse(cur, &tmp);
if (cur == tmp) { if (cur == tmp) {
pr_warning("crashkernel: Memory " pr_warn("crashkernel: Memory value expected\n");
"value expected\n");
return -EINVAL; return -EINVAL;
} }
cur = tmp; cur = tmp;
if (end <= start) { if (end <= start) {
pr_warning("crashkernel: end <= start\n"); pr_warn("crashkernel: end <= start\n");
return -EINVAL; return -EINVAL;
} }
} }
if (*cur != ':') { if (*cur != ':') {
pr_warning("crashkernel: ':' expected\n"); pr_warn("crashkernel: ':' expected\n");
return -EINVAL; return -EINVAL;
} }
cur++; cur++;
size = memparse(cur, &tmp); size = memparse(cur, &tmp);
if (cur == tmp) { if (cur == tmp) {
pr_warning("Memory value expected\n"); pr_warn("Memory value expected\n");
return -EINVAL; return -EINVAL;
} }
cur = tmp; cur = tmp;
if (size >= system_ram) { if (size >= system_ram) {
pr_warning("crashkernel: invalid size\n"); pr_warn("crashkernel: invalid size\n");
return -EINVAL; return -EINVAL;
} }
@ -1323,8 +1319,7 @@ static int __init parse_crashkernel_mem(char *cmdline,
cur++; cur++;
*crash_base = memparse(cur, &tmp); *crash_base = memparse(cur, &tmp);
if (cur == tmp) { if (cur == tmp) {
pr_warning("Memory value expected " pr_warn("Memory value expected after '@'\n");
"after '@'\n");
return -EINVAL; return -EINVAL;
} }
} }
@ -1348,14 +1343,14 @@ static int __init parse_crashkernel_simple(char *cmdline,
*crash_size = memparse(cmdline, &cur); *crash_size = memparse(cmdline, &cur);
if (cmdline == cur) { if (cmdline == cur) {
pr_warning("crashkernel: memory value expected\n"); pr_warn("crashkernel: memory value expected\n");
return -EINVAL; return -EINVAL;
} }
if (*cur == '@') if (*cur == '@')
*crash_base = memparse(cur+1, &cur); *crash_base = memparse(cur+1, &cur);
else if (*cur != ' ' && *cur != '\0') { else if (*cur != ' ' && *cur != '\0') {
pr_warning("crashkernel: unrecognized char\n"); pr_warn("crashkernel: unrecognized char\n");
return -EINVAL; return -EINVAL;
} }
@ -1691,7 +1686,7 @@ int kernel_kexec(void)
* CPU hotplug again; so re-enable it here. * CPU hotplug again; so re-enable it here.
*/ */
cpu_hotplug_enable(); cpu_hotplug_enable();
printk(KERN_EMERG "Starting new kernel\n"); pr_emerg("Starting new kernel\n");
machine_shutdown(); machine_shutdown();
} }