Commit 482ce192 authored by Mika Kukkonen's avatar Mika Kukkonen Committed by Linus Torvalds

[PATCH] sparse: fix sparse warnings in kernel/power/*

  CHECK   kernel/power/swsusp.c
kernel/power/swsusp.c:320:15: warning: expected lvalue for member dereference
kernel/power/swsusp.c:337:15: warning: expected lvalue for member dereference
kernel/power/swsusp.c:359:14: warning: expected lvalue for member dereference
kernel/power/swsusp.c:925:12: warning: assignment expression in conditional
[...]
  CHECK   kernel/power/pmdisk.c
kernel/power/pmdisk.c:795:12: warning: assignment expression in conditional

Trivial sparse fixes for two files under kernel/power. Patch attached.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 77e5ab66
...@@ -792,7 +792,7 @@ static int __init relocate_pagedir(void) ...@@ -792,7 +792,7 @@ static int __init relocate_pagedir(void)
} }
err = -ENOMEM; err = -ENOMEM;
while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order))) { while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order)) != NULL) {
if (!does_collide_order(old_pagedir, (unsigned long)m, if (!does_collide_order(old_pagedir, (unsigned long)m,
pagedir_order)) { pagedir_order)) {
pm_pagedir_nosave = pm_pagedir_nosave =
......
...@@ -317,7 +317,8 @@ static int write_suspend_image(void) ...@@ -317,7 +317,8 @@ static int write_suspend_image(void)
for (i=0; i<nr_copy_pages; i++) { for (i=0; i<nr_copy_pages; i++) {
if (!(i%100)) if (!(i%100))
printk( "." ); printk( "." );
if (!(entry = get_swap_page()).val) entry = get_swap_page();
if (!entry.val)
panic("\nNot enough swapspace when writing data" ); panic("\nNot enough swapspace when writing data" );
if (swapfile_used[swp_type(entry)] != SWAPFILE_SUSPEND) if (swapfile_used[swp_type(entry)] != SWAPFILE_SUSPEND)
...@@ -334,7 +335,8 @@ static int write_suspend_image(void) ...@@ -334,7 +335,8 @@ static int write_suspend_image(void)
cur = (union diskpage *)((char *) pagedir_nosave)+i; cur = (union diskpage *)((char *) pagedir_nosave)+i;
BUG_ON ((char *) cur != (((char *) pagedir_nosave) + i*PAGE_SIZE)); BUG_ON ((char *) cur != (((char *) pagedir_nosave) + i*PAGE_SIZE));
printk( "." ); printk( "." );
if (!(entry = get_swap_page()).val) { entry = get_swap_page();
if (!entry.val) {
printk(KERN_CRIT "Not enough swapspace when writing pgdir\n" ); printk(KERN_CRIT "Not enough swapspace when writing pgdir\n" );
panic("Don't know how to recover"); panic("Don't know how to recover");
free_page((unsigned long) buffer); free_page((unsigned long) buffer);
...@@ -356,7 +358,8 @@ static int write_suspend_image(void) ...@@ -356,7 +358,8 @@ static int write_suspend_image(void)
BUG_ON (sizeof(struct suspend_header) > PAGE_SIZE-sizeof(swp_entry_t)); BUG_ON (sizeof(struct suspend_header) > PAGE_SIZE-sizeof(swp_entry_t));
BUG_ON (sizeof(union diskpage) != PAGE_SIZE); BUG_ON (sizeof(union diskpage) != PAGE_SIZE);
BUG_ON (sizeof(struct link) != PAGE_SIZE); BUG_ON (sizeof(struct link) != PAGE_SIZE);
if (!(entry = get_swap_page()).val) entry = get_swap_page();
if (!entry.val)
panic( "\nNot enough swapspace when writing header" ); panic( "\nNot enough swapspace when writing header" );
if (swapfile_used[swp_type(entry)] != SWAPFILE_SUSPEND) if (swapfile_used[swp_type(entry)] != SWAPFILE_SUSPEND)
panic("\nNot enough swapspace for header on suspend device" ); panic("\nNot enough swapspace for header on suspend device" );
...@@ -925,7 +928,7 @@ static int relocate_pagedir(void) ...@@ -925,7 +928,7 @@ static int relocate_pagedir(void)
return 0; return 0;
} }
while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order))) { while ((m = (void *) __get_free_pages(GFP_ATOMIC, pagedir_order)) != NULL) {
if (!does_collide_order(old_pagedir, (unsigned long)m, pagedir_order)) if (!does_collide_order(old_pagedir, (unsigned long)m, pagedir_order))
break; break;
eaten_memory = m; eaten_memory = m;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment